From 2ff1576e52f40fe819f733737c73351dd8896adf Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 27 Dec 2023 17:14:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectRequestMainServiceImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 4a2fd40d..49700d5e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -30,6 +30,7 @@ import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.mysql.inspectJob.InspectJobDetailMapper; @@ -45,6 +46,7 @@ import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.expectout.ExpectoutService; import com.win.module.wms.service.inspectRecord.InspectRecordMainService; import com.win.module.wms.service.itembasic.ItembasicService; +import com.win.module.wms.service.jobsetting.JobsettingService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; @@ -114,6 +116,8 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService private ExpectinService expectinService; @Resource private InspectRecordMainService inspectRecordMainService; + @Resource + private JobsettingService jobsettingService; @Override @Transactional @@ -387,6 +391,18 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService inspectJobMainDO.setConcurrencyStamp(1); String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode()); inspectJobMainDO.setNumber(number); + // 获取任务单据设置 + JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("InspectJob"); + inspectJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); + inspectJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation()); + inspectJobMainDO.setAllowModifyQty(jobsettingDO.getAllowModifyQty()); + inspectJobMainDO.setAllowBiggerQty(jobsettingDO.getAllowBiggerQty()); + inspectJobMainDO.setAllowSmallerQty(jobsettingDO.getAllowSmallerQty()); + inspectJobMainDO.setAllowModifyInventoryStatus(jobsettingDO.getAllowModifyInventoryStatus()); + inspectJobMainDO.setAllowContinuousScanning(jobsettingDO.getAllowContinuousScanning()); + inspectJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete()); + inspectJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber()); + inspectJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach()); //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); inspectJobMainDO.setBusinessType(businesstypeDO.getCode());