From a357aa6c5c399ac1249519681fcd2ef0f7017119 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 25 Dec 2023 15:44:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventorymoveJobMainServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 a06ff277..a508c189 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 @@ -335,13 +335,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(inventorymoveJobMainDO.getBusinessType()); - transactionCreateReqVO.setOwnerCode(inventorymoveRecordDetailDO.getFromOwnerCode()); + transactionCreateReqVO.setOwnerCode(inventorymoveRecordDetailDO.getToOwnerCode()); transactionCreateReqVO.setRecordNumber(inventorymoveRecordMainDO.getNumber()); transactionCreateReqVO.setId(null); - transactionCreateReqVO.setPackingNumber(inventorymoveJobDetailUpdateReqVO.getPackingNumber()); - transactionCreateReqVO.setBatch(inventorymoveJobDetailUpdateReqVO.getBatch()); - transactionCreateReqVO.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getContainerNumber()); - transactionCreateReqVO.setInventoryStatus(inventorymoveJobDetailUpdateReqVO.getInventoryStatus()); + transactionCreateReqVO.setPackingNumber(inventorymoveJobDetailUpdateReqVO.getToPackingNumber()); + transactionCreateReqVO.setBatch(inventorymoveJobDetailUpdateReqVO.getToBatch()); + transactionCreateReqVO.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getToContainerNumber()); + transactionCreateReqVO.setInventoryStatus(inventorymoveJobDetailUpdateReqVO.getToInventoryStatus()); transactionCreateReqVO.setAmount(BigDecimal.ZERO); transactionCreateReqVO.setLocationCode(inventorymoveJobDetailUpdateReqVO.getToLocationCode()); transactionCreateReqVOList.add(transactionCreateReqVO); @@ -376,5 +376,5 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ //变更记录 trendsApi.createTrends(inventorymoveJobMainDO.getId(),inventorymoveJobMainDO.getBusinessType(),"执行了库存转移任务",TrendsTypeEnum.UPDATE); return number; - } + } } From 034c16d0022157ca69aa66d42d9fc0d295456de5 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Mon, 25 Dec 2023 15:45:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupplierdeliverRequestMainServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index f714d542..8edfcaff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -739,7 +739,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailCreateReqVO); purchasereceiptRequestDetailCreateReqVO.setQty(packageDO.getQty()); purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getBatch()); - purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getUom()); + purchasereceiptRequestDetailCreateReqVO.setUom(packageDO.getUom()); purchasereceiptRequestDetailCreateReqVO.setItemCode(packageDO.getItemCode()); purchasereceiptRequestDetailCreateReqVO.setStdPackQty(packageDO.getStdPackQty()); purchasereceiptRequestDetailCreateReqVO.setStdPackUnit(packageDO.getStdPackUnit()); From 7aca591a779c264cfca649b2648a9b7a96062058 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Dec 2023 15:50:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/index/IndexController.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java index 1fe39f71..418d9699 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java @@ -137,10 +137,10 @@ public class IndexController { Long putawayJobCount = putawayJobMainService.getPutawayJobCount();//采购上架未处理任务数 Long inspectJobCount = inspectJobMainService.getInspectJobCount();//检验未处理任务数 Map jobCountMap = new HashMap<>(); - jobCountMap.put("purchasereceiptJobCount", purchasereceiptJobCount); - jobCountMap.put("purchasereturnJobCount", purchasereturnJobCount); - jobCountMap.put("putawayJobCount", putawayJobCount); - jobCountMap.put("inspectJobCount", inspectJobCount); + jobCountMap.put("采购收货任务", purchasereceiptJobCount); + jobCountMap.put("采购退货任务", purchasereturnJobCount); + jobCountMap.put("制品上架任务", putawayJobCount); + jobCountMap.put("检验任务", inspectJobCount); return jobCountMap; } @@ -166,13 +166,13 @@ public class IndexController { Long productscrapJobCount = productscrapJobMainService.getProductscrapJobCount();//制品报废任务未处理任务数 Long repleinshJobCount = repleinshJobMainService.getRepleinshJobCount();//补料任务未处理任务数 Map jobCountMap = new HashMap<>(); - jobCountMap.put("issueJobCount", issueJobCount); - jobCountMap.put("productionreceiptJobCount", productionreceiptJobCount); - jobCountMap.put("productionreturnJobCount", productionreturnJobCount); - jobCountMap.put("productputawayJobCount", productputawayJobCount); - jobCountMap.put("productreceiptJobCount", productreceiptJobCount); - jobCountMap.put("productscrapJobCount", productscrapJobCount); - jobCountMap.put("repleinshJobCount", repleinshJobCount); + jobCountMap.put("发料任务", issueJobCount); + jobCountMap.put("生产收料任务", productionreceiptJobCount); + jobCountMap.put("生产退料", productionreturnJobCount); + jobCountMap.put("制品上架任务", productputawayJobCount); + jobCountMap.put("制品收货任务", productreceiptJobCount); + jobCountMap.put("制品报废任务", productscrapJobCount); + jobCountMap.put("补料任务", repleinshJobCount); return jobCountMap; }