Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java

@@ -234,11 +234,13 @@ public class PartArrivedServiceImpl implements IPartArrivedService
             }
             if(!CollectionUtils.isEmpty(partTypeCheckDetails)) {
                 BigDecimal purchaseNum = new BigDecimal(0);
+                BigDecimal inputNum = new BigDecimal(0);
                 BigDecimal purchasePrice = new BigDecimal(0);
                 BigDecimal purchaseTaxPrice = new BigDecimal(0);
                 String partName = "";
                 for (int j = 0; j < partTypeCheckDetails.size(); j++) {
                     purchaseNum = purchaseNum.add(partTypeCheckDetails.get(j).getPurchaseNum());
+                    inputNum = inputNum.add(partTypeCheckDetails.get(j).getInputNum());
                     purchasePrice = purchasePrice.add(partTypeCheckDetails.get(j).getPurchasePrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum()));
                     purchaseTaxPrice = purchaseTaxPrice.add(partTypeCheckDetails.get(j).getPurchaseTaxPrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum()));
                     partName = partName + partTypeCheckDetails.get(j).getMaTypeName();
@@ -246,6 +248,7 @@ public class PartArrivedServiceImpl implements IPartArrivedService
                         partName += ",";
                     }
                 }
+                partTypeCheckInfos.get(i).setInputMaNumber(inputNum);
                 partTypeCheckInfos.get(i).setPurchaseMaNumber(purchaseNum);
                 partTypeCheckInfos.get(i).setPurchasePrice(purchasePrice);
                 partTypeCheckInfos.get(i).setPurchaseTaxPrice(purchaseTaxPrice);
@@ -387,8 +390,8 @@ public class PartArrivedServiceImpl implements IPartArrivedService
         if (!CollectionUtils.isEmpty(partTypeCheckDto.getPartTypeCheckDetailsList())) {
             partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(Objects::isNull);
             partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(o -> Objects.isNull(o.getStatus()));
-            partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(o ->
+//            partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(o ->
-                    !Objects.equals(o.getStatus(), 0));
+//                    !Objects.equals(o.getStatus(), 0));
         }
         try {
             Long[] ids = new Long[partTypeCheckDto.getPartTypeCheckDetailsList().size()];

bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml

@@ -123,16 +123,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 <![CDATA[and DATE_FORMAT( ppi.arrival_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
             </if>
+        and t.task_status!=12
         </where>
         order by ppi.create_time desc
     </select>
 
     <select id="selectPartTypeCheckDetailsList" resultType="com.bonus.material.part.domain.PartTypeCheckDetails">
-        select part_id as partId,mpt.pa_name as maTypeName,purchase_price as purchasePrice,purchase_tax_price as purchaseTaxPrice,
+        select part_id                  as partId,
-               purchase_num as purchaseNum,ppd.status as status
+               mpt.pa_name              as maTypeName,
+               purchase_price           as purchasePrice,
+               purchase_tax_price       as purchaseTaxPrice,
+               purchase_num             as purchaseNum,
+               ppd.status               as status,
+               IFNULL(ppd.input_num, 0) as inputNum
         from purchase_part_details ppd
-        left join ma_part_type mpt on ppd.part_id = mpt.pa_id and mpt.del_flag = 0
+                 left join ma_part_type mpt on ppd.part_id = mpt.pa_id and mpt.del_flag = 0
-        where ppd.task_id = #{taskId} and ppd.del_flag = 0
+        where ppd.task_id = #{taskId}
+          and ppd.del_flag = 0
     </select>
 
     <select id="selectPartTypeCheckDetailsListByQueryDto" resultType="com.bonus.material.part.domain.PartTypeCheckDetails">
@@ -153,6 +160,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="productionTime != null">
             and  date_format(ppd.production_time,'%y%m%d') = date_format(#{productionTime},'%y%m%d')
         </if>
+        <if test="keyWord != null and keyWord!=''">
+            and (
+            mpt.pa_name like concat('%', #{keyWord}, '%') or
+            mpt3.pa_name like concat('%', #{keyWord}, '%') or
+            mpt2.pa_name like concat('%', #{keyWord}, '%')
+            )
+        </if>
     </select>
     <select id="selectPartTypeCheckInfoById" resultType="com.bonus.material.part.domain.PartTypeCheckInfo">
         select