Merge remote-tracking branch 'origin/dev' into dev

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java

@@ -137,7 +137,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
         purchaseCheckDetails.setBindNum(bindNum + purchaseMacodeInfoList.size());
         purchaseCheckDetails.setUpdateTime(new Date());
         checkDetailsMapper.updateBindByTaskIdTypeId(purchaseCheckDetails);
-        return AjaxResult.success();
+        return AjaxResult.success(new ArrayList<PurchaseMacodeInfo>());
     }
 
 
@@ -286,10 +286,11 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     @Override
     public int modifyManageStatus(MaInputVO maInputVO) {
         Long taskId = maInputVO.getTaskId();
+        String checkResult = maInputVO.getCheckResult();
         List<MaInputRecord> inputRecordList = maInputVO.getInputRecordList();
         for (MaInputRecord maInputRecord : inputRecordList) {
             Long typeId = maInputRecord.getTypeId();
-            String checkResult = maInputRecord.getCheckResult();
+
 
             // 修改机具入库状态
             MaMachine maMachine = new MaMachine();
@@ -303,7 +304,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 // 修改编码管理的入库状态
                 MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId);
                 // 库存添加
-                maType.setNum(String.valueOf(maInputRecord.getInputNum().add(new BigDecimal(Integer.parseInt(maType.getNum())))));
+                maType.setNum(maInputRecord.getInputNum().add(maType.getNum() == null ? new BigDecimal(0):maType.getNum()));
                 purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
 
                 BigDecimal inputNum = checkDetailsMapper.selectInputNUmByTypeId(taskId, typeId);
@@ -319,6 +320,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
             PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo();
             purchaseMacodeInfo.setTaskId(taskId);
             purchaseMacodeInfo.setTypeId(typeId);
+            purchaseMacodeInfo.setMaCode(maInputRecord.getMaCode());
             purchaseMacodeInfo.setStatus("1".equals(checkResult) ? "1" : "0");
             purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo);
             // 新增入库记录

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml

@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPutInListList" resultMap="PurchaseCheckInfoResult">
         select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
-        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code
+        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus
         from purchase_check_info pci
         left join tm_task tk on pci.task_id = tk.task_id
         left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml

@@ -282,5 +282,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     <update id="updateMacodeByType">
         update purchase_macode_info set status = #{status} where task_id = #{taskId} and type_id = #{typeId}
+        and ma_code = #{maCode}
     </update>
 </mapper>