Bug修复

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java

@@ -78,4 +78,7 @@ public interface UnplannedissueRequestMainMapper extends BaseMapperX<Unplannedis
         return selectList(QueryWrapperUtils.structure(conditions));
     }
 
+    default UnplannedissueRequestMainDO queryByNumber(String requestNumber){
+        return selectOne(new LambdaQueryWrapperX<UnplannedissueRequestMainDO>().eq(UnplannedissueRequestMainDO::getNumber,requestNumber));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java

@@ -75,4 +75,7 @@ public interface UnplannedreceiptRequestMainMapper extends BaseMapperX<Unplanned
         return selectList(QueryWrapperUtils.structure(conditions));
     }
 
+    default UnplannedreceiptRequestMainDO queryByNumber(String requestNumber){
+        return selectOne(new LambdaQueryWrapperX<UnplannedreceiptRequestMainDO>().eq(UnplannedreceiptRequestMainDO::getNumber,requestNumber));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java

@@ -20,11 +20,14 @@ import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDeta
 import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobMainDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO;
+import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO;
 import com.win.module.wms.dal.mysql.unplannedissueJob.UnplannedissueJobMainMapper;
 import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordDetailMapper;
 import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordMainMapper;
+import com.win.module.wms.dal.mysql.unplannedissueRequest.UnplannedissueRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.job.JobStatusState;
+import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -76,6 +79,8 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe
     private TransactionService transactionService;
     @Resource
     private ExpectinService expectinService;
+    @Resource
+    private UnplannedissueRequestMainMapper unplannedissueRequestMainMapper;
 
 
     @Override
@@ -311,6 +316,11 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe
         transactionService.createTransaction(transactionCreateReqVOList);
         //移除预计入
         expectinService.deleteExpectinByJobNumber(unplannedissueRecordMainDO.getNumber());
+        String requestNumber = unplannedissueJobMainDO.getRequestNumber();
+        UnplannedissueRequestMainDO unplannedissueRequestMainDO = unplannedissueRequestMainMapper.queryByNumber(requestNumber);
+        unplannedissueRequestMainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());
+        unplannedissueRequestMainMapper.updateById(unplannedissueRequestMainDO);
+
         //变更记录
         trendsApi.createTrends(unplannedissueJobMainDO.getId(), "UnplannedDeliverJob", "执行计划外出库任务", TrendsTypeEnum.UPDATE);
         return number;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java

@@ -20,11 +20,14 @@ import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJob
 import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO;
+import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO;
 import com.win.module.wms.dal.mysql.unplannedreceiptJob.UnplannedreceiptJobMainMapper;
 import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordMainMapper;
+import com.win.module.wms.dal.mysql.unplannedreceiptRequest.UnplannedreceiptRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.job.JobStatusState;
+import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -78,6 +81,8 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa
     private RecordsettingService recordsettingService;
     @Resource
     private UnplannedreceiptRecordDetailMapper unplannedreceiptRecordDetailMapper;
+    @Resource
+    private UnplannedreceiptRequestMainMapper unplannedreceiptRequestMainMapper;
 
 
     @Override
@@ -313,6 +318,11 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa
         transactionService.createTransaction(transactionCreateReqVOList);
         //移除预计入
         expectinService.deleteExpectinByJobNumber(unplannedreceiptJobMainDO.getNumber());
+        //更新请求数据状态
+        String requestNumber = unplannedreceiptJobMainDO.getRequestNumber();
+        UnplannedreceiptRequestMainDO unplannedreceiptRequestMainDO = unplannedreceiptRequestMainMapper.queryByNumber(requestNumber);
+        unplannedreceiptRequestMainDO.setStatus(RequestStatusEnum.COMPLETED.getCode());
+        unplannedreceiptRequestMainMapper.updateById(unplannedreceiptRequestMainDO);
         //变更记录
         trendsApi.createTrends(unplannedreceiptJobMainDO.getId(), "UnplannedReceiptJob", "执行计划外入库任务", TrendsTypeEnum.UPDATE);
         return number;