重盘、监盘和bug修复。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java

@@ -78,9 +78,10 @@ public interface CountRequestDetailMapper extends BaseMapperX<CountRequestDetail
      * @param masterId 主表id
      * @return 子表数据
      */
-    default List<CountRequestDetailDO> selectDifferenceList(Long masterId) {
+    default List<CountRequestDetailDO> selectDifferenceList(Long masterId, String requestNumber) {
         QueryWrapper<CountRequestDetailDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("master_id", masterId);
+        queryWrapper.inSql("", "SELECT d1.count_detail_number FROM record_count_detail d1,(SELECT master_id,count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN(SELECT id FROM record_count_main WHERE request_number='" + requestNumber + "')GROUP BY master_id,count_detail_number) d2 WHERE d1.master_id=d2.master_id AND d1.count_detail_number=d2.count_detail_number AND d1.create_time=d2.create_time AND d1.qty!=d1.count_qty");
         return selectList(queryWrapper);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -342,7 +342,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
         if(updateReqVO.getType().equals("1")) {//全部
             detailDOList = countRequestDetailMapper.selectList(updateReqVO.getId());
         } else if(updateReqVO.getType().equals("2")) {//差异
-            detailDOList = countRequestDetailMapper.selectDifferenceList(updateReqVO.getId());
+            detailDOList = countRequestDetailMapper.selectDifferenceList(updateReqVO.getId(), updateReqVO.getNumber());
         } else {//选择
             detailDOList = CountRequestDetailConvert.INSTANCE.convertList04(updateReqVO.getSubList());
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -35,6 +35,7 @@ import com.win.module.wms.enums.job.JobStatusState;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.documentSwitch.SwitchService;
 import com.win.module.wms.service.expectin.ExpectinService;
+import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.putawayRequest.PutawayRequestMainService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
@@ -85,6 +86,8 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
     @Resource
     private TransactionService transactionService;
     @Resource
+    private ExpectoutService expectoutService;
+    @Resource
     private ExpectinService expectinService;
     @Resource
     private BalanceMapper balanceMapper;
@@ -287,6 +290,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
                 BeanUtils.copyProperties(transactionCreateReqVOIn, transactionCreateReqVO);
                 transactionCreateReqVO.setInventoryStatus("SCRAP");
                 transactionCreateReqVO.setQty(inspectJobDetailUpdateReqVO.getCrackQty());
+                transactionCreateReqVO.setLocationCode("HOLD");
                 transactionCreateReqVOList.add(transactionCreateReqVO);
             }
             if (inspectJobDetailUpdateReqVO.getFailedQty() != null && inspectJobDetailUpdateReqVO.getFailedQty().compareTo(BigDecimal.ZERO) > 0) {
@@ -294,6 +298,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
                 BeanUtils.copyProperties(transactionCreateReqVOIn, transactionCreateReqVO);
                 transactionCreateReqVO.setInventoryStatus("NOK");
                 transactionCreateReqVO.setQty(inspectJobDetailUpdateReqVO.getFailedQty());
+                transactionCreateReqVO.setLocationCode("HOLD");
                 transactionCreateReqVOList.add(transactionCreateReqVO);
             }
             //添加库存事务出list
@@ -372,7 +377,9 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             //增加库存事务
             transactionService.createTransaction(transactionCreateReqVOList);
         }
-        //移除预计入
+        //移除预计出
+        expectoutService.deleteExpectoutByJobNumber(inspectJobMainDO.getNumber());
+        //移除预计出
         expectinService.deleteExpectinByJobNumber(inspectJobMainDO.getNumber());
         //上架申请子
         SwitchDO switchDO = switchService.selectSwitchExist("CreatePutawayRequestAfterInspectRecordCreated");
@@ -382,7 +389,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             BeanUtils.copyProperties(inspectRecordMainDO, putawayRequestMainCreateReqVO);
             List<PutawayRequestDetailCreateReqVO> putawayRequestDetailCreateReqVOList = new ArrayList<>();
             for(InspectJobDetailUpdateReqVO inspectJobDetailUpdateReqVO : inspectJobDetailUpdateReqVOList) {
-                if(!inspectJobDetailUpdateReqVO.getToInventoryStatus().equals("OK")) {
+                if(inspectJobDetailUpdateReqVO.getGoodQty().compareTo(BigDecimal.ZERO) <= 0) {
                     continue;
                 }
                 PutawayRequestDetailCreateReqVO putawayRequestDetailCreateReqVO = new PutawayRequestDetailCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -16,6 +16,7 @@ import com.win.module.system.api.dict.DictDataApi;
 import com.win.module.system.api.dict.dto.DictDataRespDTO;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
+import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
 import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
@@ -44,6 +45,7 @@ import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
+import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
@@ -111,6 +113,8 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
     private InspectRecordDetailMapper inspectRecordDetailMapper;
     @Resource
     private ExpectoutService expectoutService;
+    @Resource
+    private ExpectinService expectinService;
 
     @Override
     @Transactional
@@ -394,6 +398,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             return;
         }
         List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
+        List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
         InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO);
         inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
         inspectJobMainDO.setRequestNumber(mainDO.getNumber());
@@ -433,10 +438,22 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             expectoutCreateReqVO.setLocationCode(inspectJobDetailDO.getFromLocationCode());
             expectoutCreateReqVO.setOwnerCode(mainDO.getOwnerCode());
             expectoutCreateReqVOList.add(expectoutCreateReqVO);
+            //预计入
+            ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO();
+            BeanUtils.copyProperties(inspectJobDetailDO, expectinCreateReqVO);
+            expectinCreateReqVO.setId(null);
+            expectinCreateReqVO.setJobNumber(number);
+            expectinCreateReqVO.setBatch(inspectJobMainDO.getBatch());
+            expectinCreateReqVO.setBusinessType(inspectJobMainDO.getBusinessType());
+            expectinCreateReqVO.setLocationCode(inspectJobDetailDO.getFromLocationCode());
+            expectinCreateReqVO.setOwnerCode(mainDO.getOwnerCode());
+            expectinCreateReqVOList.add(expectinCreateReqVO);
         }
         inspectJobDetailMapper.insertBatch(inspectJobDetailDOList);
         //增加预计出
         expectoutService.createExpectout(expectoutCreateReqVOList);
+        //增加预计出
+        expectinService.createExpectin(expectinCreateReqVOList);
         trendsApi.createTrends(inspectJobMainDO.getId(), "purchasereceiptJob", "到货检验申请生成到货检验任务", TrendsTypeEnum.CREATE);
     }