From c987ee31d6c3653042f05b3cf57b05f8ff594e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Apr 2026 21:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=20lotno;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReservationStockInOrderDomainService.java | 1 + .../service/ReservationStockOutOrderDomainService.java | 1 + .../InventoryAdjustmentRecordDomainService.java | 10 ++++++++++ .../repository/persistence/MaterialInventoryImpl.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index 0163de4a7..f11155ead 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -519,6 +519,7 @@ public class ReservationStockInOrderDomainService { public Boolean pushInOrder(StockInOrder stockInOrder) { ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); BeanUtils.copyProperties(stockInOrder, reservationStockInOrder); + reservationStockInOrder.setIssueStatus(4); return stockInOrderService.save(reservationStockInOrder); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index 3186509a6..c1fac00e3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -206,6 +206,7 @@ public class ReservationStockOutOrderDomainService { public Boolean pushOutOrder(StockOutOrder stockOutOrder) { ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder(); BeanUtils.copyProperties(stockOutOrder, reservationStockOutOrder); + reservationStockOutOrder.setIssueStatus(4); return stockOutOrderService.save(reservationStockOutOrder); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java index ed4ddf485..5a7c30f6c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java @@ -251,6 +251,7 @@ public class InventoryAdjustmentRecordDomainService { stockInOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); stockInOrder.setStatus(1); stockInOrder.setAuditStatus(1); + stockInOrder.setNeedCustomsDeclaration(0); stockInOrder.setCreateBy(loginUser.getUserid()); stockInOrder.setCreateByName(loginUser.getUserPo().getUserName()); stockInOrder.setCreateTime(new Date()); @@ -258,6 +259,9 @@ public class InventoryAdjustmentRecordDomainService { stockInOrder.setInOrderNumber(OrderSequence.getOrderCode("RK")); stockInOrder.setOrderTypeCode("ku_cun_tiao_zheng"); stockInOrder.setOrderTypeName("库存调整"); + stockInOrder.setDocumentCreator(userPo.getUserId().toString()); + stockInOrder.setDocumentCreatorName(userPo.getUserName()); + stockInOrder.setDocumentDate(new Date()); //货主信息 stockInOrder.setShipperId(materialInventory.getShipperId()); @@ -301,6 +305,7 @@ public class InventoryAdjustmentRecordDomainService { inMaterialDetail.setStorageLocationId(materialInventory.getStorageLocationId()); inMaterialDetail.setStorageLocationCode(materialInventory.getStorageLocationCode()); inMaterialDetail.setStorageLocationName(materialInventory.getStorageLocationName()); + inMaterialDetail.setSingleGrossWeight(materialBaseInfo.getWeightLimit()); omsServiceFeign.pushInOrder(stockInOrder); omsServiceFeign.pushInOrderDetail(inMaterialDetail); } else { @@ -317,6 +322,10 @@ public class InventoryAdjustmentRecordDomainService { stockOutOrder.setOutOrderNumber(OrderSequence.getOrderCode("CK")); stockOutOrder.setOrderTypeCode("ku_cun_tiao_zheng"); stockOutOrder.setOrderTypeName("库存调整"); + stockOutOrder.setDocumentCreator(userPo.getUserId().toString()); + stockOutOrder.setDocumentCreatorName(userPo.getUserName()); + stockOutOrder.setDocumentDate(new Date()); + stockOutOrder.setNeedDeclareFlag("0"); //货主信息 stockOutOrder.setShipperId(materialInventory.getShipperId()); @@ -360,6 +369,7 @@ public class InventoryAdjustmentRecordDomainService { outMaterialDetail.setStorageLocationId(materialInventory.getStorageLocationId()); outMaterialDetail.setStorageLocationCode(materialInventory.getStorageLocationCode()); outMaterialDetail.setStorageLocationName(materialInventory.getStorageLocationName()); + outMaterialDetail.setSingleGrossWeight(materialBaseInfo.getWeightLimit()); omsServiceFeign.pushOutOrder(stockOutOrder); omsServiceFeign.pushOutOrderDetail(outMaterialDetail); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java index 5520127ce..4216cf5d2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java @@ -577,6 +577,10 @@ public class MaterialInventoryImpl extends ServiceImpl