Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java

@@ -153,6 +153,10 @@ public class ReservationStockInOrder extends BaseVOEntity {
     @Excel(name = "计划数量")
     private BigDecimal quantity;
 
+    @ApiModelProperty("入库数量")
+    @Excel(name = "入库数量")
+    private BigDecimal inQuantity;
+
     @ApiModelProperty("净重 单位：千克")
     @Excel(name = "净重 单位：千克")
     private BigDecimal weightLimit;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java

@@ -154,6 +154,10 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     @Excel(name = "计划数量（原字段）")
     private BigDecimal quantity;
 
+    @ApiModelProperty("入库数量")
+    @Excel(name = "入库数量")
+    private BigDecimal inQuantity;
+
     /**
      * 计划入库数量：取入库单明细中的入库数量汇总
      */

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java

@@ -151,6 +151,10 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @Excel(name = "计划数量")
     private BigDecimal quantity;
 
+    @ApiModelProperty("入库数量")
+    @Excel(name = "入库数量")
+    private BigDecimal inQuantity;
+
     @ApiModelProperty("净重 单位：千克")
     @Excel(name = "净重 单位：千克")
     private BigDecimal weightLimit;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java

@@ -149,6 +149,10 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     @Excel(name = "计划数量")
     private BigDecimal quantity;
 
+    @ApiModelProperty("入库数量")
+    @Excel(name = "入库数量")
+    private BigDecimal inQuantity;
+
     @ApiModelProperty("净重 单位：千克")
     @Excel(name = "净重 单位：千克")
     private BigDecimal weightLimit;

mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml

@@ -92,6 +92,7 @@
         <result property="directorPhone"    column="DIRECTOR_PHONE"    />
         <result property="directorName"    column="DIRECTOR_NAME"    />
         <result property="storageTime"    column="STORAGE_TIME"    />
+        <result property="inQuantity"    column="IN_QUANTITY"    />
     </resultMap>
 
 
@@ -127,7 +128,7 @@
         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.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
-        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME
+        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity
     </sql>
 
     <sql id="joinStockInOrderPo">

mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml

@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <update id="updateOmsOrder">
-        update "NGWL_TEST_OMS".RESERVATION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber}
+        update "NGWL_TEST_OMS".RESERVATION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},in_quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber}
     </update>
     <update id="updateOmsDocument">
         update "NGWL_TEST_OMS".RESERVATION_IN_MATERIAL_DETAIL set INBOUND_ITEMS = #{shelvesQuantity}, TOTAL_NET_WEIGHT= #{totalNetWeight},STORAGE_TIME = CURRENT_TIMESTAMP where MATERIAL_DETAIL_ID = #{omsInMaterialDetail}