From 88f0e9a0a19021acd945d0dfbc5167f1c889a7e0 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 18 Dec 2023 11:28:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countJob/CountJobMainServiceImpl.java | 18 ++------- .../CountRequestMainServiceImpl.java | 24 ++---------- .../inspectJob/InspectJobMainServiceImpl.java | 37 ++++--------------- .../InspectRequestMainServiceImpl.java | 12 +----- .../PurchasereceiptJobMainServiceImpl.java | 30 +++------------ ...PurchasereceiptRequestMainServiceImpl.java | 12 +----- .../PurchasereturnJobMainServiceImpl.java | 12 +----- .../PurchasereturnRequestMainServiceImpl.java | 16 ++------ .../putawayJob/PutawayJobMainServiceImpl.java | 12 +----- .../PutawayRequestMainServiceImpl.java | 12 +----- 10 files changed, 33 insertions(+), 152 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index 8925c6ae..cd28ba21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -195,11 +195,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord"); countRecordMainDO.setBusinessType(businesstypeDO.getCode()); - countRecordMainDO.setId(null); - countRecordMainDO.setCreator(null); - countRecordMainDO.setCreateTime(null); - countRecordMainDO.setUpdater(null); - countRecordMainDO.setUpdateTime(null); + countRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countRecordMainMapper.insert(countRecordMainDO); CountRequestMainDO countRequestMainDO = countRequestMainMapper.selectByNumber(countJobMainDO.getRequestNumber()); List countJobDetailUpdateReqVOList = countJobMainUpdateReqVO.getSubList(); @@ -215,11 +211,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { countRecordDetailDO.setMasterId(countRecordMainDO.getId()); countRecordDetailDO.setNumber(number); countRecordDetailDO.setJobDetailId(String.valueOf(countJobDetailUpdateReqVO.getId())); - countRecordDetailDO.setId(null); - countRecordDetailDO.setCreator(null); - countRecordDetailDO.setCreateTime(null); - countRecordDetailDO.setUpdater(null); - countRecordDetailDO.setUpdateTime(null); + countRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countRecordDetailDOList.add(countRecordDetailDO); //新增任务子数据，回写到申请子表中 if(countJobDetailUpdateReqVO.getId() == 0) { @@ -227,11 +219,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { BeanUtils.copyProperties(countJobDetailUpdateReqVO, countRequestDetailDO); countRequestDetailDO.setMasterId(countRequestMainDO.getId()); countRequestDetailDO.setNumber(countRequestMainDO.getNumber()); - countRequestDetailDO.setId(null); - countRequestDetailDO.setCreator(null); - countRequestDetailDO.setCreateTime(null); - countRequestDetailDO.setUpdater(null); - countRequestDetailDO.setUpdateTime(null); + countRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countRequestDetailDOList.add(countRequestDetailDO); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 8a7e2aa2..75723d08 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -418,11 +418,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); countJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); countJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); - countJobMainDO.setId(null); - countJobMainDO.setCreateTime(null); - countJobMainDO.setCreator(null); - countJobMainDO.setUpdateTime(null); - countJobMainDO.setUpdater(null); + countJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode()); countJobMainDO.setNumber(number); countJobMainMapper.insert(countJobMainDO); @@ -434,11 +430,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { CountJobDetailDO countJobDetailDO = CountJobDetailConvert.INSTANCE.convert(countRequestDetailDO); countJobDetailDO.setNumber(number); countJobDetailDO.setMasterId(countJobMainDO.getId()); - countJobDetailDO.setId(null); - countJobDetailDO.setCreateTime(null); - countJobDetailDO.setCreator(null); - countJobDetailDO.setUpdateTime(null); - countJobDetailDO.setUpdater(null); + countJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countJobDetailDOList.add(countJobDetailDO); } } @@ -467,11 +459,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countadjustRequestDetailDO.setAdjustQty(countRecordDetailDO.getQty().subtract(countRecordDetailDO.getCountQty())); //调整数量的绝对值 countadjustRequestDetailDO.setQty(countadjustRequestDetailDO.getAdjustQty().abs()); - countadjustRequestDetailDO.setId(null); - countadjustRequestDetailDO.setCreator(null); - countadjustRequestDetailDO.setCreateTime(null); - countadjustRequestDetailDO.setUpdater(null); - countadjustRequestDetailDO.setUpdateTime(null); + countadjustRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); countadjustRequestDetailDOList.add(countadjustRequestDetailDO); } int result = 0; @@ -490,11 +478,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countadjustRequestMainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); countadjustRequestMainDO.setCountRequestNumber(countRequestMainDO.getNumber()); countadjustRequestMainDO.setStatus(RequestStatusEnum.NEW.getCode()); - countadjustRequestMainDO.setId(null); - countadjustRequestMainDO.setCreator(null); - countadjustRequestMainDO.setCreateTime(null); - countadjustRequestMainDO.setUpdater(null); - countadjustRequestMainDO.setUpdateTime(null); + countadjustRequestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); result = countadjustRequestMainMapper.insert(countadjustRequestMainDO); for(CountadjustRequestDetailDO countadjustRequestDetailDO : countadjustRequestDetailDOList) { countadjustRequestDetailDO.setMasterId(countadjustRequestMainDO.getId()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index becea038..bcaadad8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -224,11 +224,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { inspectRecordMainDO.setNumber(number); inspectRecordMainDO.setJobNumber(inspectJobMainDO.getNumber()); inspectRecordMainDO.setFromWarehouseCode(inspectJobMainDO.getWarehouseCode()); - inspectRecordMainDO.setId(null); - inspectRecordMainDO.setCreator(null); - inspectRecordMainDO.setCreateTime(null); - inspectRecordMainDO.setUpdater(null); - inspectRecordMainDO.setUpdateTime(null); + inspectRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRecordMainMapper.insert(inspectRecordMainDO); BigDecimal goodQty = BigDecimal.ZERO; BigDecimal failedQty = BigDecimal.ZERO; @@ -250,11 +246,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { inspectRecordDetailDO.setMasterId(inspectRecordMainDO.getId()); inspectRecordDetailDO.setNumber(number); inspectRecordDetailDO.setJobDetailId(String.valueOf(inspectJobDetailUpdateReqVO.getId())); - inspectRecordDetailDO.setId(null); - inspectRecordDetailDO.setCreator(null); - inspectRecordDetailDO.setCreateTime(null); - inspectRecordDetailDO.setUpdater(null); - inspectRecordDetailDO.setUpdateTime(null); + inspectRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRecordDetailDOList.add(inspectRecordDetailDO); //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(inspectJobDetailUpdateReqVO.getPackingNumber(), inspectJobMainUpdateReqVO.getItemCode(), inspectJobMainUpdateReqVO.getBatch(), inspectJobDetailUpdateReqVO.getInventoryStatus(), inspectJobDetailUpdateReqVO.getFromLocationCode()); @@ -357,18 +349,10 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { requestMainDO.setInspectType("FULL"); requestMainDO.setSampleMethod("QTY"); requestMainDO.setStatus(RequestStatusEnum.NEW.getCode()); - requestMainDO.setId(null); - requestMainDO.setCreator(null); - requestMainDO.setCreateTime(null); - requestMainDO.setUpdater(null); - requestMainDO.setUpdateTime(null); + requestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRequestMainMapper.insert(requestMainDO); for(InspectRequestDetailDO inspectRequestDetailDO : requestDetailDOList) { - inspectRequestDetailDO.setId(null); - inspectRequestDetailDO.setCreator(null); - inspectRequestDetailDO.setCreateTime(null); - inspectRequestDetailDO.setUpdater(null); - inspectRequestDetailDO.setUpdateTime(null); + inspectRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectRequestDetailDO.setMasterId(requestMainDO.getId()); inspectRequestDetailDO.setNumber(requestNumber); } @@ -394,25 +378,18 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { } PutawayRequestDetailCreateReqVO putawayRequestDetailCreateReqVO = new PutawayRequestDetailCreateReqVO(); BeanUtils.copyProperties(inspectJobDetailUpdateReqVO, putawayRequestDetailCreateReqVO); + putawayRequestDetailCreateReqVO.setQty(inspectJobDetailUpdateReqVO.getGoodQty()); putawayRequestDetailCreateReqVO.setBatch(inspectRecordMainDO.getBatch()); putawayRequestDetailCreateReqVO.setPoNumber(inspectRecordMainDO.getPoNumber()); putawayRequestDetailCreateReqVO.setPoLine(inspectRecordMainDO.getPoLine()); putawayRequestDetailCreateReqVO.setItemCode(inspectRecordMainDO.getItemCode()); putawayRequestDetailCreateReqVO.setItemName(inspectRecordMainDO.getItemCode()); putawayRequestDetailCreateReqVO.setInventoryStatus("OK"); - putawayRequestDetailCreateReqVO.setId(null); - putawayRequestDetailCreateReqVO.setCreateTime(null); - putawayRequestDetailCreateReqVO.setCreator(null); - putawayRequestDetailCreateReqVO.setUpdateTime(null); - putawayRequestDetailCreateReqVO.setUpdater(null); + putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO); } putawayRequestMainCreateReqVO.setToWarehouseCode(inspectRecordMainDO.getFromWarehouseCode()); - putawayRequestMainCreateReqVO.setId(null); - putawayRequestMainCreateReqVO.setCreateTime(null); - putawayRequestMainCreateReqVO.setCreator(null); - putawayRequestMainCreateReqVO.setUpdateTime(null); - putawayRequestMainCreateReqVO.setUpdater(null); + putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList); if(!putawayRequestDetailCreateReqVOList.isEmpty()) { putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO); 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 824f49a4..b57a15ae 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 @@ -403,11 +403,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); inspectJobMainDO.setRequestNumber(mainDO.getNumber()); inspectJobMainDO.setWarehouseCode(mainDO.getFromWarehouseCode()); - inspectJobMainDO.setId(null); - inspectJobMainDO.setCreator(null); - inspectJobMainDO.setCreateTime(null); - inspectJobMainDO.setUpdater(null); - inspectJobMainDO.setUpdateTime(null); + inspectJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode()); inspectJobMainDO.setNumber(number); //增加业务类型 @@ -422,11 +418,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO); inspectJobDetailDO.setNumber(number); inspectJobDetailDO.setMasterId(inspectJobMainDO.getId()); - inspectJobDetailDO.setId(null); - inspectJobDetailDO.setCreator(null); - inspectJobDetailDO.setCreateTime(null); - inspectJobDetailDO.setUpdater(null); - inspectJobDetailDO.setUpdateTime(null); + inspectJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); inspectJobDetailDOList.add(inspectJobDetailDO); //预计出 ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 606ddc7b..75a8e535 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -263,11 +263,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchasereceiptRecordMainDO.setActiveDate(LocalDateTime.now()); purchasereceiptRecordMainDO.setDueTime(purchasereceiptJobMainDO.getRequestDueTime()); purchasereceiptRecordMainDO.setAvailable("TRUE"); - purchasereceiptRecordMainDO.setId(null); - purchasereceiptRecordMainDO.setCreateTime(null); - purchasereceiptRecordMainDO.setCreator(null); - purchasereceiptRecordMainDO.setUpdateTime(null); - purchasereceiptRecordMainDO.setUpdater(null); + purchasereceiptRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMainDO); List purchasereceiptJobDetailUpdateReqVOList = purchasereceiptJobMainUpdateReqVO.getSubList(); //收货记录子 @@ -311,11 +307,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode()); purchasereceiptRecordDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice()); purchasereceiptRecordDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchasereceiptRecordDetailDO.getQty())); - purchasereceiptRecordDetailDO.setId(null); - purchasereceiptRecordDetailDO.setCreateTime(null); - purchasereceiptRecordDetailDO.setCreator(null); - purchasereceiptRecordDetailDO.setUpdateTime(null); - purchasereceiptRecordDetailDO.setUpdater(null); + purchasereceiptRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereceiptRecordDetailDOList.add(purchasereceiptRecordDetailDO); BigDecimal poQty = poQtyMap.get(purchasereceiptRecordDetailDO.getPoNumber() + "_" + purchasereceiptRecordDetailDO.getPoLine() + "_" + purchasereceiptRecordDetailDO.getItemCode()); if(poQty == null) { @@ -363,11 +355,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode()); purchaseshortageDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice()); purchaseshortageDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchaseshortageDetailDO.getQty())); - purchaseshortageDetailDO.setId(null); - purchaseshortageDetailDO.setCreateTime(null); - purchaseshortageDetailDO.setCreator(null); - purchaseshortageDetailDO.setUpdateTime(null); - purchaseshortageDetailDO.setUpdater(null); + purchaseshortageDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchaseshortageDetailDOList.add(purchaseshortageDetailDO); } } @@ -479,18 +467,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain putawayRequestDetailCreateReqVO.setBatch(purchasereceiptRecordDetailDO.getToBatch()); putawayRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getToLocationCode()); putawayRequestDetailCreateReqVO.setInventoryStatus("OK"); - putawayRequestDetailCreateReqVO.setId(null); - putawayRequestDetailCreateReqVO.setCreateTime(null); - putawayRequestDetailCreateReqVO.setCreator(null); - putawayRequestDetailCreateReqVO.setUpdateTime(null); - putawayRequestDetailCreateReqVO.setUpdater(null); + putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO); } - putawayRequestMainCreateReqVO.setId(null); - putawayRequestMainCreateReqVO.setCreateTime(null); - putawayRequestMainCreateReqVO.setCreator(null); - putawayRequestMainCreateReqVO.setUpdateTime(null); - putawayRequestMainCreateReqVO.setUpdater(null); + putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList); putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index 009ce73e..850afdf9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -514,11 +514,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq purchasereceiptJobMainDO.setStatus(JobStatusEnum.PENDING.getCode()); String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_JOB.getCode()); purchasereceiptJobMainDO.setNumber(number); - purchasereceiptJobMainDO.setId(null); - purchasereceiptJobMainDO.setCreateTime(null); - purchasereceiptJobMainDO.setCreator(null); - purchasereceiptJobMainDO.setUpdateTime(null); - purchasereceiptJobMainDO.setUpdater(null); + purchasereceiptJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob"); purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode()); @@ -530,11 +526,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq PurchasereceiptJobDetailDO purchasereceiptJobDetailDO = PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetailCreateReqVO); purchasereceiptJobDetailDO.setNumber(number); purchasereceiptJobDetailDO.setMasterId(purchasereceiptJobMainDO.getId()); - purchasereceiptJobDetailDO.setId(null); - purchasereceiptJobDetailDO.setCreateTime(null); - purchasereceiptJobDetailDO.setCreator(null); - purchasereceiptJobDetailDO.setUpdateTime(null); - purchasereceiptJobDetailDO.setUpdater(null); + purchasereceiptJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereceiptJobDetailDOList.add(purchasereceiptJobDetailDO); //预计入 ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 120659d7..4e41bed2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -230,11 +230,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RETURN_RECORD.getCode()); purchasereturnRecordMainDO.setNumber(number); purchasereturnRecordMainDO.setJobNumber(purchasereturnJobMainDO.getNumber()); - purchasereturnRecordMainDO.setId(null); - purchasereturnRecordMainDO.setCreateTime(null); - purchasereturnRecordMainDO.setCreator(null); - purchasereturnRecordMainDO.setUpdateTime(null); - purchasereturnRecordMainDO.setUpdater(null); + purchasereturnRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnRecordMainMapper.insert(purchasereturnRecordMainDO); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); List purchasereturnJobDetailUpdateReqVOList = purchasereturnJobMainUpdateReqVO.getSubList(); @@ -257,11 +253,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe purchasereturnRecordDetailDO.setToBatch(purchasereturnJobDetailUpdateReqVO.getToBatch()); purchasereturnRecordDetailDO.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus()); purchasereturnRecordDetailDO.setToLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode()); - purchasereturnRecordDetailDO.setId(null); - purchasereturnRecordDetailDO.setCreateTime(null); - purchasereturnRecordDetailDO.setCreator(null); - purchasereturnRecordDetailDO.setUpdateTime(null); - purchasereturnRecordDetailDO.setUpdater(null); + purchasereturnRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnRecordDetailDOList.add(purchasereturnRecordDetailDO); //更新采购订单明细的退货数量 purchaseMainService.updateOrderPurchaseReturnQty(purchasereturnRecordDetailDO.getPoNumber(), purchasereturnRecordDetailDO.getPoLine(), purchasereturnRecordDetailDO.getItemCode(), purchasereturnRecordDetailDO.getQty()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 8c21dbc2..9e728df4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -120,7 +120,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque mainDO.setNumber(number); purchasereturnRequestMainMapper.insert(mainDO); for (PurchasereturnRequestDetailDO detailDO : subDOList) { - detailDO.setId(null); + detailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); } @@ -373,11 +373,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque purchasereturnJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber()); purchasereturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach()); purchasereturnJobMainDO.setRequestTime(mainDO.getRequestTime()); - purchasereturnJobMainDO.setId(null); - purchasereturnJobMainDO.setCreateTime(null); - purchasereturnJobMainDO.setCreator(null); - purchasereturnJobMainDO.setUpdateTime(null); - purchasereturnJobMainDO.setUpdater(null); + purchasereturnJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); purchasereturnJobMainDO.setBusinessType(businesstypeDO.getCode()); purchasereturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); @@ -389,11 +385,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO); purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode()); purchasereturnJobDetailDO.setNumber(number); - purchasereturnJobDetailDO.setId(null); - purchasereturnJobDetailDO.setCreateTime(null); - purchasereturnJobDetailDO.setCreator(null); - purchasereturnJobDetailDO.setUpdateTime(null); - purchasereturnJobDetailDO.setUpdater(null); + purchasereturnJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnJobDetailDO.setMasterId(purchasereturnJobMainDO.getId()); purchasereturnJobDetailDO.setFromLocationCode(purchasereturnRequestDetailDO.getFromLocationCode()); purchasereturnJobDetailDO.setToOwnerCode(purchasereturnRequestDetailDO.getToOwnerCode()); @@ -450,7 +442,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque requestsettingAndBusinesstypeSet(mainDO); //子表校验 for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : subDOList) { - purchasereturnRequestDetailDO.setId(null); + purchasereturnRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); validatorDetailMethod(purchasereturnRequestDetailDO, mainDO); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index 14222001..de92567d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -193,11 +193,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_RECORD.getCode()); putawayRecordMainDO.setNumber(number); putawayRecordMainDO.setJobNumber(putawayJobMainDO.getNumber()); - putawayRecordMainDO.setId(null); - putawayRecordMainDO.setCreator(null); - putawayRecordMainDO.setCreateTime(null); - putawayRecordMainDO.setUpdater(null); - putawayRecordMainDO.setUpdateTime(null); + putawayRecordMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRecordMainMapper.insert(putawayRecordMainDO); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob"); //库存事务 @@ -218,11 +214,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { putawayRecordDetailDO.setFromBatch(putawayJobDetailUpdateReqVO.getBatch()); putawayRecordDetailDO.setToBatch(putawayJobDetailUpdateReqVO.getToBatch()); putawayRecordDetailDO.setInventoryStatus(putawayJobDetailUpdateReqVO.getToInventoryStatus()); - putawayRecordDetailDO.setId(null); - putawayRecordDetailDO.setCreator(null); - putawayRecordDetailDO.setCreateTime(null); - putawayRecordDetailDO.setUpdater(null); - putawayRecordDetailDO.setUpdateTime(null); + putawayRecordDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayRecordDetailDOList.add(putawayRecordDetailDO); //添加库存事务入list TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index af3cbb3b..8f5bee32 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -359,11 +359,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService putawayJobMainDO.setBusinessType(businesstypeDO.getCode()); putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); - putawayJobMainDO.setId(null); - putawayJobMainDO.setCreateTime(null); - putawayJobMainDO.setCreator(null); - putawayJobMainDO.setUpdateTime(null); - putawayJobMainDO.setUpdater(null); + putawayJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayJobMainMapper.insert(putawayJobMainDO); List putawayJobDetailDOList = new ArrayList<>(); for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) { @@ -373,11 +369,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService putawayJobDetailDO.setToLocationCode(locationDO.getCode()); putawayJobDetailDO.setNumber(number); putawayJobDetailDO.setMasterId(putawayJobMainDO.getId()); - putawayJobDetailDO.setId(null); - putawayJobDetailDO.setCreateTime(null); - putawayJobDetailDO.setCreator(null); - putawayJobDetailDO.setUpdateTime(null); - putawayJobDetailDO.setUpdater(null); + putawayJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); putawayJobDetailDOList.add(putawayJobDetailDO); //预计出 ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO(); From 21bfcf933cd2ba68e071e4c0c33666948f59cd55 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 18 Dec 2023 11:48:37 +0800 Subject: [PATCH 2/8] =?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 --- .../service/countRequest/CountRequestMainServiceImpl.java | 2 +- win-server/src/main/resources/application.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 75723d08..1ea99745 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -445,7 +445,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { @Transactional public int generateCountadjustRequest(Long countRecordMainId) { CountRequestMainDO countRequestMainDO = countRequestMainMapper.selectById(countRecordMainId); - if("2".equals(countRequestMainDO.getCountAdjustStatus())) { + if(!"2".equals(countRequestMainDO.getCountAdjustStatus())) { throw new ServiceException(COUNTADJUST_REQUEST_EXISTS); } List countRecordDetailDOList = countRecordDetailMapper.getDifferenceList(countRequestMainDO.getNumber()); diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index 895fdb38..ec334674 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -68,6 +68,10 @@ flowable: # MyBatis Plus 的配置项 mybatis-plus: + # 对应的 XML 文件位置 + mapper-locations: classpath*:mapper/**/*Mapper.xml + # 实体扫描，多个package用逗号或者分号分隔 + type-aliases-package: ${win.info.base-package}.module.*.dal.dataobject configuration: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl @@ -82,7 +86,6 @@ mybatis-plus: logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) banner: false # 关闭控制台的 Banner 打印 - type-aliases-package: ${win.info.base-package}.module.*.dal.dataobject encryptor: password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 From 73fb454284cd75d219582d8f826488abde9ca36a Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 18 Dec 2023 11:50:18 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7/=E4=BB=BB=E5=8A=A1/=E8=AE=B0=E5=BD=95=20=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=88=9B=E5=BB=BA=E8=80=85?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventorymoveJobDetailController.java | 8 ++++- .../InventorymoveJobMainController.java | 28 +++++++++------- .../vo/InventorymoveJobDetailExcelVO.java | 2 +- .../vo/InventorymoveJobMainExcelVO.java | 19 ++++++----- .../InventorymoveRecordDetailController.java | 8 ++++- .../InventorymoveRecordMainController.java | 33 +++++++++---------- .../vo/InventorymoveRecordDetailExcelVO.java | 6 ++-- .../InventorymoveRecordDetailExportReqVO.java | 2 ++ .../InventorymoveRecordDetailPageReqVO.java | 2 ++ .../vo/InventorymoveRecordMainExcelVO.java | 12 +++---- .../InventorymoveRequestMainController.java | 6 ++-- .../InventorymoveJobMainConvert.java | 2 +- .../InventorymoveRecordMainConvert.java | 3 +- .../InventorymoveJobDetailDO.java | 1 + .../InventorymoveRecordDetailDO.java | 1 + .../InventorymoveRecordMainDO.java | 5 --- .../InventorymoveRecordDetailMapper.java | 2 ++ .../InventorymoveRecordMainMapper.java | 3 -- .../InventorymoveJobMainServiceImpl.java | 16 +++++++-- .../InventorymoveRequestMainServiceImpl.java | 1 - 20 files changed, 94 insertions(+), 66 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java index 9777ad0f..8a8098ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java @@ -3,6 +3,7 @@ package com.win.module.wms.controller.inventorymoveJob; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -88,7 +89,12 @@ public class InventorymoveJobDetailController { @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')") public CommonResult> getInventorymoveJobDetailPage(@Valid InventorymoveJobDetailPageReqVO pageVO) { PageResult pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO); - return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveJobDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得库存转移任务子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index 5f604aa5..d8cf1436 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java @@ -107,9 +107,9 @@ public class InventorymoveJobMainController { PageResult result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveJobMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -122,9 +122,9 @@ public class InventorymoveJobMainController { PageResult result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveJobMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -154,16 +154,17 @@ public class InventorymoveJobMainController { } private List getExcelVo(List list, Map mapDropDown) { - String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS); - mapDropDown.put(8, requestStatus); + String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(2, trueFalse); + String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.JOB_STATUS); + mapDropDown.put(6, requestStatus); String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); - mapDropDown.put(12, locationType); - mapDropDown.put(15, locationType); - String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); - mapDropDown.put(27, inventoryStatus); - mapDropDown.put(33, inventoryStatus); + mapDropDown.put(17, locationType); + mapDropDown.put(18, locationType); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(42, uom); + String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); + mapDropDown.put(49, inventoryStatus); List resultList = new ArrayList<>(); // 导出 for(InventorymoveJobMainDO mainDO : list) { @@ -172,8 +173,13 @@ public class InventorymoveJobMainController { InventorymoveJobMainExcelVO vo = InventorymoveJobMainConvert.INSTANCE.convert(mainDO, detailDO); vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname()); - vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname()); - vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname()); + if(!"".equals(mainDO.getAcceptUserId()) && mainDO.getAcceptUserId() != null){ + vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname()); + + } + if(!"".equals(mainDO.getCompleteUserId()) && mainDO.getCompleteUserId() != null){ + vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname()); + } vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname()); resultList.add(vo); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java index bff001ed..5a496b35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java @@ -48,7 +48,7 @@ public class InventorymoveJobDetailExcelVO { private String remark; @ExcelProperty("创建时间") - private LocalDateTime createtime; + private LocalDateTime createTime; @ExcelProperty("创建者Id") private String creator; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java index 7db34fc0..feb44fe7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java @@ -28,6 +28,9 @@ import com.win.framework.excel.core.convert.DictConvert; public class InventorymoveJobMainExcelVO { //主表数据 + @ExcelProperty("单据号") + private String number; + @ExcelProperty("申请单号") private String requestNumber; @@ -61,9 +64,10 @@ public class InventorymoveJobMainExcelVO { @ExcelProperty("最后更新者Id") private String updater; - @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String jobStageStatus; + //TODO 该字段为弃用字段后续再进行整体清理 +// @ExcelProperty(value = "状态", converter = DictConvert.class) +// @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 +// private String jobStageStatus; @ExcelProperty("优先级") private Integer priority; @@ -96,9 +100,6 @@ public class InventorymoveJobMainExcelVO { @DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String toLocationTypes; - @ExcelProperty("单据号") - private String number; - @ExcelProperty("业务类型") private String businessType; @@ -111,9 +112,9 @@ public class InventorymoveJobMainExcelVO { @ExcelProperty("创建者id") private String creator; - - @ExcelProperty("创建者用户名") - private String creatorName; + //TODO 该字段为弃用字段后续再进行整体清理 +// @ExcelProperty("创建者用户名") +// private String creatorName; @ExcelProperty("到仓库代码") private String toWarehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java index e138ae9e..26005b2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java @@ -91,7 +91,13 @@ public class InventorymoveRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')") public CommonResult> getInventorymoveRecordDetailPage(@Valid InventorymoveRecordDetailPageReqVO pageVO) { PageResult pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailPage(pageVO); - return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java index 5fa1a8a7..33e69a60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java @@ -107,8 +107,8 @@ public class InventorymoveRecordMainController { PageResult result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRecordMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); } return success(result); } @@ -121,8 +121,8 @@ public class InventorymoveRecordMainController { PageResult result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRecordMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); } return success(result); } @@ -134,17 +134,14 @@ public class InventorymoveRecordMainController { HttpServletResponse response) throws IOException { List list = inventorymoveRecordMainService.getInventorymoveRecordMainList(exportReqVO); // 导出 Excel - List datas = InventorymoveRecordMainConvert.INSTANCE.convertList02(list); - for(InventorymoveRecordMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "库存转移记录主.xls", "数据", InventorymoveRecordMainExcelVO.class, datas); + //组装vo + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "库存转移申请.xlsx", "库存转移申请数据", InventorymoveRecordMainExcelVO.class, resultList, mapDropDown); } @GetMapping("/export-excel-senior") - @Operation(summary = "导出库存转移申请 Excel") + @Operation(summary = "导出库存转移记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:export')") @OperateLog(type = EXPORT) public void exportInventorymoveRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { @@ -158,27 +155,27 @@ public class InventorymoveRecordMainController { private List getExcelVo(List list, Map mapDropDown) { String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(3, trueFalse); - mapDropDown.put(23, trueFalse); + mapDropDown.put(22, trueFalse); String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); mapDropDown.put(11, interfaceType); - mapDropDown.put(48, interfaceType); + mapDropDown.put(46, interfaceType); String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); - mapDropDown.put(18, locationType); - mapDropDown.put(21, locationType); + mapDropDown.put(17, locationType); + mapDropDown.put(20, locationType); String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS); - mapDropDown.put(32, inventoryStatus); - mapDropDown.put(40, inventoryStatus); + mapDropDown.put(31, inventoryStatus); + mapDropDown.put(39, inventoryStatus); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); - mapDropDown.put(46, uom); + mapDropDown.put(45, uom); List resultList = new ArrayList<>(); // 导出 for(InventorymoveRecordMainDO mainDO : list) { List subList = inventorymoveRecordDetailService.selectList(mainDO.getId()); for(InventorymoveRecordDetailDO detailDO : subList) { InventorymoveRecordMainExcelVO vo = InventorymoveRecordMainConvert.INSTANCE.convert(mainDO, detailDO); + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname()); vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); resultList.add(vo); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java index ba471a31..b0d0fd94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java @@ -90,9 +90,9 @@ public class InventorymoveRecordDetailExcelVO { @ExcelProperty(value = "计量单位", converter = DictConvert.class) @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String uom; - - @ExcelProperty("代码") - private String code; + //TODO 弃用字段后续统一清理 +// @ExcelProperty("代码") +// private String code; @ExcelProperty(value = "接口类型", converter = DictConvert.class) @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java index 0d990af3..28f2a071 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java @@ -109,4 +109,6 @@ public class InventorymoveRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java index 073e0eb2..16c8c503 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java @@ -111,4 +111,6 @@ public class InventorymoveRecordDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主表ID") + private String masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java index b2e5a129..0a29b9e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java @@ -66,9 +66,9 @@ public class InventorymoveRecordMainExcelVO { @ExcelProperty(value = "接口类型", converter = DictConvert.class) @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String interfaceType; - - @ExcelProperty("代码") - private String code; +//TODO 弃用字段后续统一清理 +// @ExcelProperty("代码") +// private String code; @ExcelProperty("业务类型") private String businessType; @@ -178,9 +178,9 @@ public class InventorymoveRecordMainExcelVO { @ExcelProperty(value = "计量单位", converter = DictConvert.class) @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String uom; - - @ExcelProperty("代码") - private String codeDetail; +//TODO 弃用字段后续统一清理 +// @ExcelProperty("代码") +// private String codeDetail; @ExcelProperty(value = "接口类型", converter = DictConvert.class) @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java index 3dabd578..550e3378 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java @@ -102,9 +102,9 @@ public class InventorymoveRequestMainController { PageResult result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRequestMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -117,9 +117,9 @@ public class InventorymoveRequestMainController { PageResult result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult); for(InventorymoveRequestMainRespVO vo : result.getList()) { //后端创建个字段作为前端展示的虚拟字段 + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); } return success(result); } @@ -165,11 +165,11 @@ public class InventorymoveRequestMainController { List subList = inventorymoveRequestDetailService.selectList(mainDO.getId()); for(InventorymoveRequestDetailDO detailDO : subList) { InventorymoveRequestMainExcelVO vo = InventorymoveRequestMainConvert.INSTANCE.convert(mainDO, detailDO); + vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname()); vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname()); vo.setUpdaterDetail(userApi.getUser(Long.valueOf(detailDO.getUpdater())).getNickname()); - vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName()); resultList.add(vo); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java index 14b3683b..b824f50c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java @@ -44,10 +44,10 @@ public interface InventorymoveJobMainConvert { @Mapping(source = "mainDO.remark", target = "remark"), @Mapping(source = "mainDO.createTime", target = "createTime"), @Mapping(source = "mainDO.creator", target = "creator"), - @Mapping(source = "mainDO.creatorName", target = "creatorName"), @Mapping(source = "mainDO.updateTime", target = "updateTime"), @Mapping(source = "mainDO.updater", target = "updater"), @Mapping(source = "detailDO.creator", target = "creatorDetail"), + @Mapping(source = "detailDO.createTime", target = "createTimeDetail"), }) InventorymoveJobMainExcelVO convert(InventorymoveJobMainDO mainDO, InventorymoveJobDetailDO detailDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java index e0e1152b..3279a352 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java @@ -42,7 +42,8 @@ public interface InventorymoveRecordMainConvert { @Mapping(source = "mainDO.createTime", target = "createTime"), @Mapping(source = "mainDO.creator", target = "creator"), @Mapping(source = "mainDO.interfaceType", target = "interfaceType"), - @Mapping(source = "mainDO.code", target = "code"), + @Mapping(source = "detailDO.interfaceType", target = "interfaceTypeDetail"), + @Mapping(source = "detailDO.createTime", target = "createTimeDetail"), }) InventorymoveRecordMainExcelVO convert(InventorymoveRecordMainDO mainDO, InventorymoveRecordDetailDO detailDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java index 75dbbcbb..6611f6f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.inventorymoveJob; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java index 23a4ff93..b286bbd9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.inventorymoveRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java index c583a420..769baffc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java @@ -146,9 +146,4 @@ public class InventorymoveRecordMainDO extends BaseDO { * 是否可用 */ private String available; - /** - * 主表id - */ - private String masterId; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java index ddd45259..aecf28b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java @@ -23,6 +23,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX selectPage(InventorymoveRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) @@ -61,6 +62,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX selectList(InventorymoveRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) .eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java index 169653ff..563cc42c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java @@ -10,7 +10,6 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; -import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; import org.apache.ibatis.annotations.Mapper; /** @@ -24,7 +23,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX selectPage(InventorymoveRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) - .eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation()) .eqIfPresent(InventorymoveRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType()) @@ -55,7 +53,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX selectList(InventorymoveRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index e7da0d6e..31294698 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -18,6 +18,7 @@ import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetail import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobDetailMapper; @@ -27,6 +28,7 @@ import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.expectout.ExpectoutService; +import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.recordsetting.RecordsettingService; import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; @@ -87,6 +89,8 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ private ExpectinService expectinService; @Resource private TransactionService transactionService; + @Resource + private LocationService locationService; @Override public Long createInventorymoveJobMain(InventorymoveJobMainCreateReqVO createReqVO) { @@ -244,12 +248,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ inventorymoveJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId())); inventorymoveJobMainDO.setCompleteUserName(userRespDTO.getNickname()); //更新任务表状态 - int result = inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO); + inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO); //创建客户收货记录主表 InventorymoveRecordMainDO inventorymoveRecordMainDO = new InventorymoveRecordMainDO(); BeanUtils.copyProperties(inventorymoveJobMainDO, inventorymoveRecordMainDO); inventorymoveRecordMainDO.setJobNumber(inventorymoveJobMainDO.getNumber()); inventorymoveRecordMainDO.setId(null); + inventorymoveRecordMainDO.setCreateTime(null); inventorymoveRecordMainDO.setAvailable("TRUE"); inventorymoveRecordMainDO.setExecuteTime(LocalDateTime.now()); inventorymoveRecordMainDO.setActiveDate(LocalDateTime.now()); @@ -295,7 +300,7 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ inventorymoveRecordDetailDO.setJobDetailId(DetailUpdateItem.getId().toString()); inventorymoveRecordDetailDO.setId(null); inventorymoveRecordDetailDO.setCreator(null); - inventorymoveRecordDetailDO.setCreateTime(null); + inventorymoveRecordDetailDO.setCreateTime(LocalDateTime.now()); inventorymoveRecordDetailDO.setUpdater(null); inventorymoveRecordDetailDO.setUpdateTime(null); inventorymoveRecordDetailDO.setNumber(inventorymoveRecordMainDO.getNumber()); @@ -306,12 +311,19 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ inventorymoveRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber")==null?"":recordLstItem.get("toContainerNumber")); inventorymoveRecordDetailDO.setToBatch(recordLstItem.get("toBatch")==null?"":recordLstItem.get("toBatch")); inventorymoveRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode")); + LocationDO toLocationDO = locationService.selectLocation(recordLstItem.get("toLocationCode")); + inventorymoveRecordDetailDO.setToAreaCode(toLocationDO.getAreaCode()); + inventorymoveRecordDetailDO.setToLocationGroupCode(toLocationDO.getLocationGroupCode()); + LocationDO fromLocationDO = locationService.selectLocation(inventorymoveRecordDetailDO.getFromLocationCode()); + inventorymoveRecordDetailDO.setFromAreaCode(fromLocationDO.getAreaCode()); + inventorymoveRecordDetailDO.setFromLocationGroupCode(fromLocationDO.getLocationGroupCode()); inventorymoveRecordDetailDO.setToInventoryStatus(recordLstItem.get("toInventoryStatus")); inventorymoveRecordDetailDO.setFromPackingNumber(DetailUpdateItem.getPackingNumber()); inventorymoveRecordDetailDO.setFromContainerNumber(DetailUpdateItem.getContainerNumber()); inventorymoveRecordDetailDO.setFromAreaCode(inventorymoveJobMainDO.getFromAreaCodes()); inventorymoveRecordDetailDO.setToAreaCode(inventorymoveJobMainDO.getToAreaCodes()); inventorymoveRecordDetailDO.setFromBatch(DetailUpdateItem.getBatch()); + inventorymoveRecordDetailDO.setInterfaceType(inventorymoveRecordMainDO.getInterfaceType()); inventorymoveRecordDetailDO.setFromInventoryStatus(DetailUpdateItem.getInventoryStatus()); inventorymoveRecordDetailDOList.add(inventorymoveRecordDetailDO); //添加库存事务list diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index 08fca917..c6530318 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -87,7 +87,6 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest private InventorymoveJobDetailMapper inventorymoveJobDetailMapper; @Resource private Validator validator; - @Resource private ItembasicService itembasicService; @Resource From f4289b7f5700f021e5e2d9decab0a821b26725c1 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 18 Dec 2023 12:59:06 +0800 Subject: [PATCH 4/8] =?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 --- .../resources/mapper/countRecord/CountRecordDetailMapper.xml | 2 +- win-server/src/main/resources/application.yaml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml index c04beac3..01174c38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml @@ -12,7 +12,7 @@ - SELECT d1.* 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} diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index ec334674..895fdb38 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -68,10 +68,6 @@ flowable: # MyBatis Plus 的配置项 mybatis-plus: - # 对应的 XML 文件位置 - mapper-locations: classpath*:mapper/**/*Mapper.xml - # 实体扫描，多个package用逗号或者分号分隔 - type-aliases-package: ${win.info.base-package}.module.*.dal.dataobject configuration: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl @@ -86,6 +82,7 @@ mybatis-plus: logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) banner: false # 关闭控制台的 Banner 打印 + type-aliases-package: ${win.info.base-package}.module.*.dal.dataobject encryptor: password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 From 42eefd1dd4489071547b79f0ad74c2ea911926e4 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 18 Dec 2023 13:24:59 +0800 Subject: [PATCH 5/8] =?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 --- .../mapper/countRecord/CountRecordDetailMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml index 01174c38..3c721a79 100644 --- a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml @@ -3,7 +3,7 @@ - SELECT COUNT(1) 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} @@ -12,8 +12,8 @@ - + SELECT * 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 From 4dd6d575d6b5675b49c78d72edf3933e4071e3de Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 18 Dec 2023 13:48:57 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=96=B0=E5=A2=9E=E4=B8=8EBom=E6=8B=86?= =?UTF-8?q?=E8=A7=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductscrapRecordDetailExportReqVO.java | 3 + .../vo/ProductscrapRecordDetailPageReqVO.java | 3 + .../ProductscrapRequestMainController.java | 10 ++ .../vo/ProductscrapRequestDetailBaseVO.java | 8 +- .../vo/ProductscrapRequestMainBaseVO.java | 3 + .../ProductscrapRequestMainExportReqVO.java | 8 ++ .../vo/ProductscrapRequestMainPageReqVO.java | 9 ++ .../ProductscrapRecordDetailDO.java | 2 +- .../ProductscrapRecordDetailMapper.java | 2 + .../ProductscrapRequestMainMapper.java | 13 ++- .../ProductscrapRequestDetailService.java | 15 ++- .../ProductscrapRequestDetailServiceImpl.java | 87 ++++++++++++++++- .../ProductscrapRequestMainService.java | 7 ++ .../ProductscrapRequestMainServiceImpl.java | 96 ++++++------------- .../RawscrapRequestDetailService.java | 12 ++- .../RawscrapRequestDetailServiceImpl.java | 34 +++++++ 16 files changed, 227 insertions(+), 85 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java index ba102d63..9859a389 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java @@ -91,4 +91,7 @@ public class ProductscrapRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主键ID") + private Long masterID; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java index 9ea34847..0ab66b9f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java @@ -93,4 +93,7 @@ public class ProductscrapRecordDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主键ID") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java index 67139814..3851f7dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java @@ -9,6 +9,7 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbUpdateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.*; import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestMainConvert; import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO; @@ -225,4 +226,13 @@ public class ProductscrapRequestMainController { return success(pageResult); } + @PostMapping("/updateBom") + @Operation(summary = "更新制品报废申请二级子表") + @PreAuthorize("@ss.hasPermission('wms:productscrap-request-main:update')") + public CommonResult updateProductscrapDetailRequestBom(@RequestParam("id") Long id, @RequestBody List updateReqVOList) { + productscrapRequestMainService.updateProductscrapDetailRequestBom(id, updateReqVOList); + return success(true); + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java index 4114caa5..9f2ed901 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java @@ -25,22 +25,18 @@ public class ProductscrapRequestDetailBaseVO { private String fromOwnerCode; @Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "包装号不能为空") private String packingNumber; @Schema(description = "器具号") private String containerNumber; @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "批次不能为空") private String batch; @Schema(description = "从库位代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "从库位代码不能为空") private String fromLocationCode; @Schema(description = "库存状态", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "库存状态不能为空") private String inventoryStatus; @Schema(description = "原因") @@ -57,7 +53,6 @@ public class ProductscrapRequestDetailBaseVO { private String remark; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建时间不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; @@ -97,4 +92,7 @@ public class ProductscrapRequestDetailBaseVO { @Schema(description = "工序代码") private String processCode; + + @Schema(description = "主键ID") + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainBaseVO.java index 519cba55..8e064c92 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainBaseVO.java @@ -94,4 +94,7 @@ public class ProductscrapRequestMainBaseVO { @Schema(description = "班次", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "班次不能为空") private String shift; + + @Schema(description = "主键ID") + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainExportReqVO.java index 83deb862..1f5c350d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainExportReqVO.java @@ -71,4 +71,12 @@ public class ProductscrapRequestMainExportReqVO { @Schema(description = "直接生成记录") private String directCreateRecord; + @Schema(description = "车间代码") + private String workshopCode; + + @Schema(description = "班组") + private String team; + + @Schema(description = "班次") + private String shift; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainPageReqVO.java index cb39f965..eed3750b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainPageReqVO.java @@ -73,4 +73,13 @@ public class ProductscrapRequestMainPageReqVO extends PageParam { @Schema(description = "直接生成记录") private String directCreateRecord; + @Schema(description = "车间代码") + private String workshopCode; + + @Schema(description = "班组") + private String team; + + @Schema(description = "班次") + private String shift; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java index fee55db3..c1198f13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java @@ -115,7 +115,7 @@ public class ProductscrapRecordDetailDO extends BaseDO { /** * 主表ID */ - private String masterId; + private Long masterId; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java index 4be7aba7..5f886fd5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java @@ -47,6 +47,7 @@ public interface ProductscrapRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { @@ -79,6 +80,7 @@ public interface ProductscrapRecordDetailMapper extends BaseMapperX getProductscrapRequestDetailList(ProductscrapRequestDetailExportReqVO exportReqVO); + /** + * 校验子表数据 + * @param detailCreateReqVO + * @param businesstypeDO + * @param productscrapRequestMainDO + */ + void validateDetailMethod(ProductscrapRequestDetailBaseVO detailCreateReqVO, BusinesstypeDO businesstypeDO, ProductscrapRequestMainDO productscrapRequestMainDO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java index f6858c46..f4c3b9df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java @@ -1,10 +1,22 @@ package com.win.module.wms.service.productscrapRequest; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailCreateReqVO; -import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO; -import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO; -import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailUpdateReqVO; +import com.win.module.wms.controller.productscrapRequest.vo.*; +import com.win.module.wms.convert.productscrapRequest.RawscrapRequestDetailConvert; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; +import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO; +import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO; +import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; +import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; +import com.win.module.wms.dal.mysql.productscrapRequest.ProductscrapRequestMainMapper; +import com.win.module.wms.service.itembasic.ItembasicService; +import com.win.module.wms.service.productionline.ProductionlineService; +import com.win.module.wms.service.requestsetting.RequestsettingService; +import com.win.module.wms.service.workstation.WorkstationService; +import com.win.module.wms.util.JobUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,11 +43,28 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest @Resource private ProductscrapRequestDetailMapper productscrapRequestDetailMapper; + @Resource + private ProductscrapRequestMainMapper productscrapRequestMainMapper; + @Resource + private ProductionlineService productionlineService; + @Resource + private ItembasicService itembasicService; + @Resource + private WorkstationService workstationService; + @Resource + private JobUtils jobUtils; + @Resource + private RequestsettingService requestsettingService; @Override public Long createProductscrapRequestDetail(ProductscrapRequestDetailCreateReqVO createReqVO) { - // 插入 + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ProductScrapRequest"); + ProductscrapRequestMainDO productscrapRequestMainDO = productscrapRequestMainMapper.selectById(createReqVO.getMasterId()); + // 校验数据 + this.validateDetailMethod(createReqVO,businesstypeDO,productscrapRequestMainDO); ProductscrapRequestDetailDO productscrapRequestDetail = ProductscrapRequestDetailConvert.INSTANCE.convert(createReqVO); + productscrapRequestDetail.setMasterId(createReqVO.getMasterId()); + productscrapRequestDetail.setNumber(productscrapRequestMainDO.getNumber()); productscrapRequestDetailMapper.insert(productscrapRequestDetail); // 返回 return productscrapRequestDetail.getId(); @@ -45,8 +74,14 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest public void updateProductscrapRequestDetail(ProductscrapRequestDetailUpdateReqVO updateReqVO) { // 校验存在 validateProductscrapRequestDetailExists(updateReqVO.getId()); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ProductScrapRequest"); + ProductscrapRequestMainDO productscrapRequestMainDO = productscrapRequestMainMapper.selectById(updateReqVO.getMasterId()); + // 校验数据 + this.validateDetailMethod(updateReqVO,businesstypeDO,productscrapRequestMainDO); // 更新 ProductscrapRequestDetailDO updateObj = ProductscrapRequestDetailConvert.INSTANCE.convert(updateReqVO); + updateObj.setMasterId(updateReqVO.getMasterId()); + updateObj.setNumber(productscrapRequestMainDO.getNumber()); productscrapRequestDetailMapper.updateById(updateObj); } @@ -57,10 +92,12 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest // 删除 productscrapRequestDetailMapper.deleteById(id); } + @Override public PageResult getProductscrapRequestDetailSenior(CustomConditions conditions) { return productscrapRequestDetailMapper.selectSenior(conditions); } + private void validateProductscrapRequestDetailExists(Long id) { if (productscrapRequestDetailMapper.selectById(id) == null) { throw exception(PRODUCTSCRAP_REQUEST_DETAIL_NOT_EXISTS); @@ -87,4 +124,44 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest return productscrapRequestDetailMapper.selectList(exportReqVO); } + @Override + public void validateDetailMethod(ProductscrapRequestDetailBaseVO detailCreateReqVO, BusinesstypeDO businesstypeDO, ProductscrapRequestMainDO productscrapRequestMainDO) { + // 校验--生产线基本信息 + ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailCreateReqVO.getProductionLineCode()); + detailCreateReqVO.setFromLocationCode(productionlineDO.getRawLocationCode()); + // 校验--物品基本信息 BQ——>QI + ItembasicDO itembasic = validatorItembasic(detailCreateReqVO.getItemCode()); + detailCreateReqVO.setItemDesc1(itembasic.getDesc1()); + detailCreateReqVO.setItemDesc2(itembasic.getDesc2()); + detailCreateReqVO.setItemName(itembasic.getName()); + detailCreateReqVO.setProjectCode(itembasic.getProject()); + detailCreateReqVO.setUom(itembasic.getUom()); + // 校验--工位基础信息 + if(StringUtils.isNotEmpty(detailCreateReqVO.getWorkStationCode())){ + WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailCreateReqVO.getWorkStationCode(), productscrapRequestMainDO.getWorkshopCode(), detailCreateReqVO.getProductionLineCode()); + detailCreateReqVO.setFromLocationCode(workstationDO.getRawLocationCode()); + } + // 校验--uom + // validatorUom(detailCreateReqVO.getUom(), itembasic.getUom()); + // 校验--物品类型 DBT---DBT2---IT1 + jobUtils.ifInType(itembasic.getType(), businesstypeDO); + // 校验--来源库位 DBT——>DBT2——>LO + jobUtils.ifInToLocationType(detailCreateReqVO.getFromLocationCode(), businesstypeDO); + // 校验--库存状态 DBT——>DBT2——>ISO + // jobUtils.ifOutInventoryStatuses(detailCreateReqVO.getInventoryStatus(), businesstypeDO); + // 校验--库存余额 TB——>TB1 +// List business = validatorbusinessbasic(detailCreateReqVO.getInventoryStatus()); +// List balance = validatorbalance(detailCreateReqVO.getItemCode(), detailCreateReqVO.getPackingNumber(),detailCreateReqVO.getBatch(), detailCreateReqVO.getFromLocationCode(), business); +// BalanceDO balanceDO = balance.get(0); +// productscrapRequestMainDO.setFromWarehouseCode(balanceDO.getWarehouseCode()); +// productscrapRequestMainDO.setDueTime(balanceDO.getExpireDate()); +// detailCreateReqVO.setFromLocationCode(balanceDO.getLocationCode()); +// // 校验 报废数量【qty】不能大于库存数量【banlance.qty】 +// validatorQty(detailCreateReqVO.getQty(), balanceDO.getQty()); + } + + private ItembasicDO validatorItembasic(String itemCode) { + return itembasicService.selectItembasic(itemCode); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java index cc606c0d..746dfcfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java @@ -136,4 +136,11 @@ public interface ProductscrapRequestMainService { * @return 分页列表数据 */ PageResult getBomInfoPage(ProductscrapRequestDetailPageReqVO pageVO); + + /** + * 更新BOM拆解二级子表数据 + * @param id 一级子表的ID + * @param updateReqVOList 二级子表列表数据 + */ + void updateProductscrapDetailRequestBom(Long id, List updateReqVOList); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java index 7b0f2d04..1a4e705d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.productscrapRequest; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; @@ -28,7 +29,6 @@ import com.win.module.wms.convert.productscrapRequest.RawscrapRequestDetailConve import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; -import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordDetailDO; import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordMainDO; import com.win.module.wms.dal.dataobject.productscrapRecord.RawscrapRecordDetailDO; @@ -39,7 +39,6 @@ import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.module.wms.dal.dataobject.team.TeamDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; -import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.mysql.productscrapRecord.ProductscrapRecordDetailMapper; import com.win.module.wms.dal.mysql.productscrapRecord.ProductscrapRecordMainMapper; import com.win.module.wms.dal.mysql.productscrapRecord.RawscrapRecordDetailMapper; @@ -49,14 +48,12 @@ import com.win.module.wms.dal.mysql.productscrapRequest.RawscrapRequestDetailMap import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; import com.win.module.wms.service.itembasic.ItembasicService; -import com.win.module.wms.service.productionline.ProductionlineService; import com.win.module.wms.service.recordsetting.RecordsettingService; import com.win.module.wms.service.requestsetting.RequestsettingService; import com.win.module.wms.service.shift.ShiftService; import com.win.module.wms.service.team.TeamService; import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.service.workshop.WorkshopService; -import com.win.module.wms.service.workstation.WorkstationService; import com.win.module.wms.util.JobUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -123,9 +120,9 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa @Resource private ShiftService shiftService; @Resource - private ProductionlineService productionlineService; + private ProductscrapRequestDetailService productscrapRequestDetailService; @Resource - private WorkstationService workstationService; + private RawscrapRequestDetailService rawscrapRequestDetailService; @Override public Long createProductscrapRequestMain(ProductscrapRequestMainCreateReqVO createReqVO) { @@ -216,7 +213,8 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa // 子表校验 List subList = createReqVO.getSubList(); for(ProductscrapRequestDetailCreateReqVO detailCreateReqVO:subList){ - validateDetailMethod(detailCreateReqVO, businesstypeDO,mainBo); + // 子表数据校验 + productscrapRequestDetailService.validateDetailMethod(detailCreateReqVO, businesstypeDO,mainBo); } String number = serialNumberApi.generateCode(RuleCodeEnum.PRODUCT_SCRAP_REQUEST.getCode()); mainBo.setNumber(number); @@ -233,7 +231,7 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa rawscrapRequestDetailDO.setMasterId(detailDO.getId()); rawscrapRequestDetailDO.setNumber(detailDO.getNumber()); // 校验--二级子表数据 - validateDetailbBom(rawscrapRequestDetailDO,detailDO,mainBo); + rawscrapRequestDetailService.validateDetailbBom(rawscrapRequestDetailDO,detailDO,mainBo); rawscrapRequestDetailDO.setId(null); childList.add(rawscrapRequestDetailDO); } @@ -242,62 +240,6 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa return mainBo; } - private void validateDetailbBom(RawscrapRequestDetailDO rawscrapRequestDetailDO, ProductscrapRequestDetailDO detailDO, ProductscrapRequestMainDO mainBo) { - // 校验--物品基本信息 - ItembasicDO itembasicDO = itembasicService.selectItembasic(rawscrapRequestDetailDO.getItemCode()); - // 赋值物品Item相关信息 - rawscrapRequestDetailDO.setItemDesc1(itembasicDO.getDesc1()); - rawscrapRequestDetailDO.setItemDesc2(itembasicDO.getDesc2()); - rawscrapRequestDetailDO.setItemName(itembasicDO.getName()); - rawscrapRequestDetailDO.setProjectCode(itembasicDO.getProject()); - // 校验库存余额 - List inventoryStatus = new ArrayList<>(); - inventoryStatus.add("OK"); // 查询合格的边料库存余额 - List list = jobUtils.selectlocationReturnManagementAccuracy(rawscrapRequestDetailDO.getItemCode(),null,null,detailDO.getFromLocationCode(),inventoryStatus); - BalanceDO balanceDO = list.get(0); // 去第一条库存余额 - rawscrapRequestDetailDO.setInventoryStatus(balanceDO.getInventoryStatus()); - rawscrapRequestDetailDO.setBatch(balanceDO.getBatch()); - rawscrapRequestDetailDO.setPackingNumber(balanceDO.getPackingNumber()); - rawscrapRequestDetailDO.setFromLocationCode(balanceDO.getLocationCode()); - rawscrapRequestDetailDO.setCreateTime(LocalDateTime.now()); - rawscrapRequestDetailDO.setCreator(null); - } - - private void validateDetailMethod(ProductscrapRequestDetailBaseVO detailCreateReqVO, BusinesstypeDO businesstypeDO, ProductscrapRequestMainDO productscrapRequestMainDO) { - // 校验--生产线基本信息 - ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailCreateReqVO.getProductionLineCode()); - detailCreateReqVO.setFromLocationCode(productionlineDO.getRawLocationCode()); - // 校验--物品基本信息 BQ——>QI - ItembasicDO itembasic = validatorItembasic(detailCreateReqVO.getItemCode()); - detailCreateReqVO.setItemDesc1(itembasic.getDesc1()); - detailCreateReqVO.setItemDesc2(itembasic.getDesc2()); - detailCreateReqVO.setItemName(itembasic.getName()); - detailCreateReqVO.setProjectCode(itembasic.getProject()); - detailCreateReqVO.setUom(itembasic.getUom()); - // 校验--工位基础信息 - if(StringUtils.isNotEmpty(detailCreateReqVO.getWorkStationCode())){ - WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailCreateReqVO.getWorkStationCode(), productscrapRequestMainDO.getWorkshopCode(), detailCreateReqVO.getProductionLineCode()); - detailCreateReqVO.setFromLocationCode(workstationDO.getRawLocationCode()); - } - // 校验--uom - // validatorUom(detailCreateReqVO.getUom(), itembasic.getUom()); - // 校验--物品类型 DBT---DBT2---IT1 - jobUtils.ifInType(itembasic.getType(), businesstypeDO); - // 校验--来源库位 DBT——>DBT2——>LO - jobUtils.ifInToLocationType(detailCreateReqVO.getFromLocationCode(), businesstypeDO); - // 校验--库存状态 DBT——>DBT2——>ISO - // jobUtils.ifOutInventoryStatuses(detailCreateReqVO.getInventoryStatus(), businesstypeDO); - // 校验--库存余额 TB——>TB1 -// List business = validatorbusinessbasic(detailCreateReqVO.getInventoryStatus()); -// List balance = validatorbalance(detailCreateReqVO.getItemCode(), detailCreateReqVO.getPackingNumber(),detailCreateReqVO.getBatch(), detailCreateReqVO.getFromLocationCode(), business); -// BalanceDO balanceDO = balance.get(0); -// productscrapRequestMainDO.setFromWarehouseCode(balanceDO.getWarehouseCode()); -// productscrapRequestMainDO.setDueTime(balanceDO.getExpireDate()); -// detailCreateReqVO.setFromLocationCode(balanceDO.getLocationCode()); -// // 校验 报废数量【qty】不能大于库存数量【banlance.qty】 -// validatorQty(detailCreateReqVO.getQty(), balanceDO.getQty()); - } - private ProductscrapRequestMainDO validateMainMethod(ProductscrapRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) { ProductscrapRequestMainDO productscrapRequestMainDO = ProductscrapRequestMainConvert.INSTANCE.convert(baseVO); RequestStatusState requestStatusState = new RequestStatusState(); @@ -376,7 +318,8 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa List subList = updateReqVO.getSubList(); if(subList!=null) { for (ProductscrapRequestDetailUpdateReqVO detailUpdateReqVO : subList) { - validateDetailMethod(detailUpdateReqVO, businesstypeDO, productputawayRequestMainDO); + // 子表数据校验 + productscrapRequestDetailService.validateDetailMethod(detailUpdateReqVO, businesstypeDO, productputawayRequestMainDO); } List subDOList = ProductscrapRequestDetailConvert.INSTANCE.convertList05(subList); productscrapRequestDetailMapper.updateBatch(subDOList); @@ -731,5 +674,28 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa PageResult pageResult = new PageResult(myPage.getRecords(),myPage.getTotal()); return pageResult; } + + @Transactional + @Override + public void updateProductscrapDetailRequestBom(Long id, List updateReqVOList) { + // 删除之前的数据 + LambdaQueryWrapper requestDetailDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + requestDetailDOLambdaQueryWrapper.eq(RawscrapRequestDetailDO::getMasterId,id); + rawscrapRequestDetailMapper.delete(requestDetailDOLambdaQueryWrapper); + // 查询子表数据 + ProductscrapRequestDetailDO productscrapRequestDetailDO = productscrapRequestDetailMapper.selectById(id); + ProductscrapRequestMainDO productscrapRequestMainDO = productscrapRequestMainMapper.selectById(productscrapRequestDetailDO.getMasterId()); + List childList = new ArrayList<>(); + for(RawscrapRequestDetailUpdateReqVO rawscrapRequestDetailUpdateReqVO:updateReqVOList){ + RawscrapRequestDetailDO rawscrapRequestDetailDO = RawscrapRequestDetailConvert.INSTANCE.convert(rawscrapRequestDetailUpdateReqVO); + rawscrapRequestDetailDO.setMasterId(productscrapRequestDetailDO.getId()); + rawscrapRequestDetailDO.setNumber(productscrapRequestDetailDO.getNumber()); + // 校验--二级子表数据 + rawscrapRequestDetailService.validateDetailbBom(rawscrapRequestDetailDO,productscrapRequestDetailDO,productscrapRequestMainDO); + rawscrapRequestDetailDO.setId(null); + childList.add(rawscrapRequestDetailDO); + } + rawscrapRequestDetailMapper.insertBatch(childList); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailService.java index eafec8eb..6d4401dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailService.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.productscrapRequest; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productscrapRequest.vo.*; +import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO; +import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO; import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO; import javax.validation.Valid; @@ -77,5 +79,13 @@ public interface RawscrapRequestDetailService { * @param updatePart 是否支持更新 * @return 导入结果 */ - public List importRawscrapRequestDetailList(List datas, Integer mode, boolean updatePart); + List importRawscrapRequestDetailList(List datas, Integer mode, boolean updatePart); + + /** + * 校验子表数据 + * @param rawscrapRequestDetailDO 请求数据 + * @param detailDO 一级子表 + * @param mainBo 主表 + */ + void validateDetailbBom(RawscrapRequestDetailDO rawscrapRequestDetailDO, ProductscrapRequestDetailDO detailDO, ProductscrapRequestMainDO mainBo); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java index 4edcfc70..3b7b1374 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java @@ -4,12 +4,19 @@ import cn.hutool.core.collection.CollUtil; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productscrapRequest.vo.*; import com.win.module.wms.convert.productscrapRequest.RawscrapRequestDetailConvert; +import com.win.module.wms.dal.dataobject.balance.BalanceDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO; +import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO; import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO; import com.win.module.wms.dal.mysql.productscrapRequest.RawscrapRequestDetailMapper; +import com.win.module.wms.service.itembasic.ItembasicService; +import com.win.module.wms.util.JobUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -29,6 +36,10 @@ public class RawscrapRequestDetailServiceImpl implements RawscrapRequestDetailSe @Resource private RawscrapRequestDetailMapper rawscrapRequestDetailMapper; + @Resource + private ItembasicService itembasicService; + @Resource + private JobUtils jobUtils; @Override public Long createRawscrapRequestDetail(RawscrapRequestDetailCreateReqVO createReqVO) { @@ -106,4 +117,27 @@ public class RawscrapRequestDetailServiceImpl implements RawscrapRequestDetailSe return errorList; } + + @Override + public void validateDetailbBom(RawscrapRequestDetailDO rawscrapRequestDetailDO, ProductscrapRequestDetailDO detailDO, ProductscrapRequestMainDO mainBo) { + // 校验--物品基本信息 + ItembasicDO itembasicDO = itembasicService.selectItembasic(rawscrapRequestDetailDO.getItemCode()); + // 赋值物品Item相关信息 + rawscrapRequestDetailDO.setItemDesc1(itembasicDO.getDesc1()); + rawscrapRequestDetailDO.setItemDesc2(itembasicDO.getDesc2()); + rawscrapRequestDetailDO.setItemName(itembasicDO.getName()); + rawscrapRequestDetailDO.setProjectCode(itembasicDO.getProject()); + // 校验库存余额 + List inventoryStatus = new ArrayList<>(); + inventoryStatus.add("OK"); // 查询合格的边料库存余额 + List list = jobUtils.selectlocationReturnManagementAccuracy(rawscrapRequestDetailDO.getItemCode(),null,null,detailDO.getFromLocationCode(),inventoryStatus); + BalanceDO balanceDO = list.get(0); // 去第一条库存余额 + rawscrapRequestDetailDO.setInventoryStatus(balanceDO.getInventoryStatus()); + rawscrapRequestDetailDO.setBatch(balanceDO.getBatch()); + rawscrapRequestDetailDO.setPackingNumber(balanceDO.getPackingNumber()); + rawscrapRequestDetailDO.setFromLocationCode(balanceDO.getLocationCode()); + rawscrapRequestDetailDO.setCreateTime(LocalDateTime.now()); + rawscrapRequestDetailDO.setCreator(null); + } + } From 357321d3e35ee729d297b96f5168dd7b6f41b10c Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 18 Dec 2023 13:53:44 +0800 Subject: [PATCH 7/8] =?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 --- .../service/transaction/TransactionServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java index ac74b50c..5888af49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java @@ -12,9 +12,11 @@ import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogCreateReqVO; import com.win.module.wms.convert.transaction.TransactionConvert; import com.win.module.wms.convert.transferlog.TransferlogConvert; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.transaction.TransactionDO; import com.win.module.wms.dal.dataobject.transferlog.TransferlogDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; +import com.win.module.wms.dal.mysql.location.LocationMapper; import com.win.module.wms.dal.mysql.transaction.TransactionMapper; import com.win.module.wms.dal.mysql.transferlog.TransferlogMapper; import com.win.module.wms.service.rule.RuleService; @@ -37,16 +39,14 @@ public class TransactionServiceImpl implements TransactionService { @Resource private TransactionMapper transactionMapper; - @Resource private BalanceMapper balanceMapper; - @Resource private TransferlogMapper transferlogMapper; - + @Resource + private LocationMapper locationMapper; @Resource private RuleService ruleService; - @Resource private SerialNumberApi serialNumberApi; @@ -62,6 +62,10 @@ public class TransactionServiceImpl implements TransactionService { result += transactionMapper.insert(transactionDO); BalanceCreateReqVO balanceCreateReqVO = new BalanceCreateReqVO(); BeanUtils.copyProperties(createReqVO, balanceCreateReqVO); + LocationDO locationDO = locationMapper.selectByCode(balanceCreateReqVO.getLocationCode()); + balanceCreateReqVO.setWarehouseCode(locationDO.getWarehouseCode()); + balanceCreateReqVO.setAreaCode(locationDO.getAreaCode()); + balanceCreateReqVO.setLocationGroupCode(locationDO.getLocationGroupCode()); balanceCreateReqVO.setLastTransNumber(number); RuleRespVO ruleRespVO = ruleService.warehouseStorage(createReqVO.getLocationCode()); balanceMapper.updateBalanceQty(balanceCreateReqVO, ruleRespVO, createReqVO.getInventoryAction()); From 303953e536f919bcda09d1e747ecfefb1a02d5f0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 18 Dec 2023 13:55:00 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=9B=91=E7=9B=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/countRequest/CountRequestMainServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 1ea99745..52af467a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -485,6 +485,8 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countadjustRequestDetailDO.setNumber(adjustNumber); } countadjustRequestDetailMapper.insertBatch(countadjustRequestDetailDOList); + countRequestMainDO.setCountAdjustStatus("3"); + countRequestMainMapper.updateById(countRequestMainDO); trendsApi.createTrends(countadjustRequestMainDO.getId(), "countadjustRequest", "生成了盘点调整申请", TrendsTypeEnum.CREATE); } return result;