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; } 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; - } + } } 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());