From c703c339fc95030dc957e464aef84393cd118c68 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Tue, 21 Apr 2026 13:21:41 +0800 Subject: [PATCH] =?UTF-8?q?oms=E5=85=A5=E5=BA=93=E5=8D=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=88=B0wms=E5=A2=9E=E5=8A=A0oms=E4=B8=BB=E9=94=AEid?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mhd/system/api/domain/InMaterialDetail.java | 4 ++++ .../main/java/com/mhd/system/api/domain/StockInOrder.java | 4 ++++ .../service/ReservationStockInOrderDomainService.java | 2 ++ mhd_wms/sql/pdaSql.sql | 6 +++++- .../domain/inMaterialDetail/entity/InMaterialDetail.java | 4 ++++ .../mhd/wms/domain/stockInOrder/entity/StockInOrder.java | 5 +++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java index 637531269..4861cef26 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java @@ -364,4 +364,8 @@ public class InMaterialDetail extends BaseVOEntity { @ApiModelProperty("lot编号") @Excel(name = "lot编号") private String lotNo; + + @ApiModelProperty("oms入库单详情id") + @Excel(name = "oms入库单详情id") + private String omsInMaterialDetail; } \ No newline at end of file diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java index e3abbb12d..f022e8c30 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java @@ -352,4 +352,8 @@ public class StockInOrder extends BaseVOEntity { @ApiModelProperty("订单状态") @Excel(name = "订单状态") private String orderStatus; + + @ApiModelProperty("oms入库单id") + @Excel(name = "oms入库单id") + private String omsStockInOrderId; } \ No newline at end of file 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 281a79092..1891fcb5f 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 @@ -451,6 +451,7 @@ public class ReservationStockInOrderDomainService { ReservationStockInOrder byId = stockInOrderService.getById(inOrderId); StockInOrder stockInOrder = new StockInOrder(); BeanUtils.copyProperties(byId, stockInOrder,"inOrderId"); + stockInOrder.setOmsStockInOrderId(String.valueOf(byId.getInOrderId())); wmsServiceFeign.omsInOrderAdd(stockInOrder); String inOrderNumber = stockInOrder.getInOrderNumber(); List materialDetailList = materialDetailService.list(new QueryWrapper().lambda().eq(ReservationInMaterialDetail::getInOrderNumber, inOrderNumber)); @@ -458,6 +459,7 @@ public class ReservationStockInOrderDomainService { for (ReservationInMaterialDetail reservationInMaterialDetail : materialDetailList) { InMaterialDetail inMaterialDetail = new InMaterialDetail(); BeanUtils.copyProperties(reservationInMaterialDetail, inMaterialDetail,"materialDetailId"); + inMaterialDetail.setOmsInMaterialDetail(String.valueOf(reservationInMaterialDetail.getMaterialDetailId())); inMaterialDetailList.add(inMaterialDetail); } wmsServiceFeign.omsInOrderAddDetail(inMaterialDetailList); diff --git a/mhd_wms/sql/pdaSql.sql b/mhd_wms/sql/pdaSql.sql index 78646ff15..f06795cd2 100644 --- a/mhd_wms/sql/pdaSql.sql +++ b/mhd_wms/sql/pdaSql.sql @@ -33,4 +33,8 @@ ALTER TABLE RECEIPT_MATERIAL_DETAIL ADD COPY_DETAILS VARCHAR; ALTER TABLE SHELF_MATERIAL_DETAIL ADD PALLET_NUMBER VARCHAR; ALTER TABLE SHELF_MATERIAL_DETAIL ADD COPY_BATCH VARCHAR; ALTER TABLE SHELF_MATERIAL_DETAIL ADD COPY_QUANTITY VARCHAR; -ALTER TABLE SHELF_MATERIAL_DETAIL ADD COPY_DETAILS VARCHAR; \ No newline at end of file +ALTER TABLE SHELF_MATERIAL_DETAIL ADD COPY_DETAILS VARCHAR; + + +ALTER TABLE NGWL_TEST_WMS.IN_MATERIAL_DETAIL ADD OMS_IN_MATERIAL_DETAIL varchar(100) NULL; +ALTER TABLE NGWL_TEST_WMS.STOCK_IN_ORDER ADD OMS_STOCK_IN_ORDER_ID varchar(100) NULL; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java index 4cac84fa0..9e7bde3dc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java @@ -364,4 +364,8 @@ public class InMaterialDetail extends BaseVOEntity { @ApiModelProperty("lot编号") @Excel(name = "lot编号") private String lotNo; + + @ApiModelProperty("oms入库单详情id") + @Excel(name = "oms入库单详情id") + private String omsInMaterialDetail; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java index 52fb4b9cb..b6b086a4f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java @@ -360,4 +360,9 @@ public class StockInOrder extends BaseVOEntity { private String salesmanId; @ApiModelProperty("业务员名称") private String salesmanName; + + + @ApiModelProperty("oms入库单id") + @Excel(name = "oms入库单id") + private String omsStockInOrderId; } \ No newline at end of file