wms上入库存入收货oms入库单id

mhd_wms/sql/pdaSql.sql

@@ -38,3 +38,4 @@ 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;
+ALTER TABLE NGWL_TEST_WMS.RECEIPT_MATERIAL_DETAIL ADD OMS_STOCK_IN_ORDER_ID varchar(100) NULL;

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java

@@ -410,4 +410,7 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
     @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/inMaterialDetail/repository/todo/InMaterialDetailDO.java

@@ -372,4 +372,8 @@ public class InMaterialDetailDO extends StockInOrderBaseDO {
     @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/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java

@@ -354,4 +354,8 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
 
     @ApiModelProperty("是否抄码：1-是 2-否（与物料主数据同源，PDA/PC 透传）")
     private Integer copyCode;
+
+    @ApiModelProperty("oms入库单id")
+    @Excel(name = "oms入库单id")
+    private String omsStockInOrderId;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java

@@ -422,4 +422,8 @@ public class StockInOrderPO extends BaseVOEntity {
     @ApiModelProperty("仓位名称")
     private String storageLocationName;
 
+    @ApiModelProperty("oms入库单id")
+    @Excel(name = "oms入库单id")
+    private String omsStockInOrderId;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java

@@ -391,4 +391,7 @@ public class StockInOrderDO extends BaseVOEntity {
     private String salesmanId;
     @ApiModelProperty("业务员名称")
     private String salesmanName;
+    @ApiModelProperty("oms入库单id")
+    @Excel(name = "oms入库单id")
+    private String omsStockInOrderId;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/entity/StockReceiptOrder.java

@@ -132,6 +132,9 @@ public class StockReceiptOrder extends BaseVOEntity {
     @ApiModelProperty(name = "费用参数json")
     private String billingJson;
 
+    @ApiModelProperty("oms入库单id")
+    @Excel(name = "oms入库单id")
+    private String omsStockInOrderId;
 
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java

@@ -188,4 +188,8 @@ public class StockReceiptOrderDO extends StockInOrderBaseDO {
 
     @ApiModelProperty(name = "费用参数json")
     private String billingJson;
+
+    @ApiModelProperty("oms入库单id")
+    @Excel(name = "oms入库单id")
+    private String omsStockInOrderId;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -388,4 +388,8 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
     private String salesmanId;
     @ApiModelProperty("业务员名称")
     private String salesmanName;
+
+    @ApiModelProperty("oms入库单id")
+    @Excel(name = "oms入库单id")
+    private String omsStockInOrderId;
 }

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unitCode"    column="unit_code"    />
         <result property="packName"    column="pack_name"    />
         <result property="storageLocationName"    column="storage_location_name"    />
+        <result property="omsStockInOrderId"    column="stock_in_order"    />
     </resultMap>
 
     <sql id="selectStockInOrderPo">
@@ -127,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER,
         a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO,
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
-        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE
+        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order
     </sql>
 
     <sql id="joinStockInOrderPo">