库龄 多卷号查询

src/main/java/com/th/demo/mapping/ware/DistributionDetailMapper.java

@@ -21,4 +21,6 @@ public interface DistributionDetailMapper {
    List<DistributionDetail> selectByFid(String distributionId);
 
     int updateCancelFlagById(Map<String,Object> map);
+
+    int updateCancelFlagByStoreId(String distributionId,String storeId);
 }

src/main/java/com/th/demo/mapping/ware/OutRecordMapper.java

@@ -23,7 +23,7 @@ public interface OutRecordMapper {
                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
     List<OutRecord>  selectExpt(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
-                            String ordNo, String fkComponyName,String contractNo);
+                            String ordNo, String fkComponyName,String contractNo,List<String> plateNos);
     List<TotalRecord>  selectTotal(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                                    String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
 

src/main/java/com/th/demo/service/impl/ware/OutRecordServiceImpl.java

@@ -18,6 +18,8 @@ import com.th.demo.tools.JSONTools;
 import com.th.demo.tools.Tools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 
 import java.util.Date;
@@ -40,14 +42,19 @@ public class OutRecordServiceImpl implements OutRecordService {
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                         String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName,
                         String contractNo) {
+        List<String> pltNos = new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
         if(page == -1 && rows == -1){
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName,contractNo);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName,contractNo,pltNos);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else{
             PageHelper.startPage(page, rows);
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo,pltNos);
+
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
 //        result = JSONTools.toString(pageInfo);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -41,6 +41,9 @@ public class OutServiceImpl implements OutService {
     public MaterialMapper materialMapper;
     @Autowired
     public DistributionMapper distributionMapper;
+
+    @Autowired
+    public DistributionDetailMapper distributionDetailMapper;
     @Autowired
     public AccountDetailMapper accountDetailMapper;
     @Autowired
@@ -122,6 +125,8 @@ public class OutServiceImpl implements OutService {
                 distribution.setSumCount(distribution.getSumCount()- store.getCount());
                 num += distributionMapper.updateByPrimaryKey(distribution);
 
+                num += distributionDetailMapper.updateCancelFlagByStoreId(distribution.getId(), store.getId());
+
             }
             result = Tools.moreThanZeroResultJSON(num);
         } else {
@@ -143,6 +148,9 @@ public class OutServiceImpl implements OutService {
                 distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
                 distribution.setSumCount(distribution.getSumCount()- store.getCount());
                 num += distributionMapper.updateByPrimaryKey(distribution);
+
+                num += distributionDetailMapper.updateCancelFlagByStoreId(distribution.getId(), store.getId());
+
             }
             result = Tools.moreThanZeroResultJSON(num);
         }

src/main/resource/mapper/ware/DistributionDetailMapper.xml

@@ -98,6 +98,13 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
+  <update id="updateCancelFlagByStoreId">
+    update t_ware_distribution_detail
+    set cancel_flag = '1'
+    where distribution_id = #{param1,jdbcType=VARCHAR}
+    and store_id = #{param2,jdbcType=VARCHAR}
+  </update>
+
 
   <select id="selectByFid" resultMap="BaseResultMap">
     select

src/main/resource/mapper/ware/OutRecordMapper.xml

@@ -469,14 +469,19 @@
     LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
 
     where t.ware_name  like concat('%',#{param1,jdbcType=VARCHAR},'%')
-    and t.stack_name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+   and t.stack_name like concat('%',#{param2,jdbcType=VARCHAR},'%')
     and t.model like concat('%',#{param3,jdbcType=INTEGER},'%')
     and t.material_name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and t.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
     <if test="param6 != null and param6 != ''" >
       and t.customer_name  = #{param6,jdbcType=VARCHAR}
     </if>
-    and t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    and (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    <if test="param17 != null and param17.size() !=0" >
+      OR t.plate_no IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
     and t.distribution_id = p.id
     and t.plate_no = c.plate_no
@@ -485,7 +490,7 @@
     and t.cancel_flag = '0'
     and ((t.belong_id=#{param11,jdbcType=VARCHAR} and t.ware_name in (
     select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id
-    and  a.user_id = #{param10,jdbcType=VARCHAR}  )
+    and  a.user_id = #{param10,jdbcType=VARCHAR} )
     )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')