oms入库单同步到wms增加oms主键id信息

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;
 }

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;
 }

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<ReservationInMaterialDetail> materialDetailList = materialDetailService.list(new QueryWrapper<ReservationInMaterialDetail>().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);

mhd_wms/sql/pdaSql.sql

@@ -34,3 +34,7 @@ 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;
+
+
+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;

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;
 }

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;
 }