Merge remote-tracking branch 'origin/master'

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

@@ -425,6 +425,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countJobMainDO.setWarehouseCode(locationDO.getWarehouseCode());
             countJobMainDO.setRequestDueTime(mainDO.getDueTime());
             countJobMainDO.setRequestNumber(mainDO.getNumber());
+            countJobMainDO.setRequestDueTime(mainDO.getDueTime());
             countJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete());
             countJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());
             countJobMainDO.setAllowModifyQty(jobsettingDO.getAllowModifyQty());

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

@@ -386,6 +386,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
         InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO);
         inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
         inspectJobMainDO.setRequestNumber(mainDO.getNumber());
+        inspectJobMainDO.setRequestDueTime(mainDO.getDueTime());
         inspectJobMainDO.setWarehouseCode(mainDO.getFromWarehouseCode());
         inspectJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
         inspectJobMainDO.setConcurrencyStamp(1);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@@ -493,6 +493,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
                 if(i % count == 0) {
                     purchasereceiptJobMainCreateReqVO = PurchasereceiptJobMainConvert.INSTANCE.convert(mainDO);
                     purchasereceiptJobMainCreateReqVO.setRequestNumber(mainDO.getNumber());
+                    purchasereceiptJobMainCreateReqVO.setRequestDueTime(mainDO.getDueTime());
                     purchasereceiptJobMainCreateReqVO.setAutoComplete(jobsettingDO.getAutoComplete());
                     purchasereceiptJobMainCreateReqVO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());
                     purchasereceiptJobMainCreateReqVO.setAllowModifyQty(jobsettingDO.getAllowModifyQty());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@@ -382,6 +382,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         }
         PurchasereturnJobMainDO purchasereturnJobMainDO = PurchasereturnJobMainConvert.INSTANCE.convert(mainDO);
         purchasereturnJobMainDO.setRequestNumber(mainDO.getNumber());
+        purchasereturnJobMainDO.setRequestDueTime(mainDO.getDueTime());
         purchasereturnJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_JOB.getCode());
         purchasereturnJobMainDO.setNumber(number);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@@ -341,6 +341,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_JOB.getCode());
         putawayJobMainDO.setNumber(number);
         putawayJobMainDO.setRequestNumber(mainDO.getNumber());
+        putawayJobMainDO.setRequestDueTime(mainDO.getDueTime());
         JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("PurchasePutawayJob");
         putawayJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete());
         putawayJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());