关务查询;

mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java

@@ -807,10 +807,11 @@ public class PickingOrderApplicationService {
             Map<String, Object> order = new HashMap<>();
             // etpsPreentNo: 入库单号 - 取拣货明细中的入库单号（第一个）
             String inOrderNumber = outMaterialDetailList.get(0).getInOrderNumber();
-            order.put("etpsPreentNo", inOrderNumber != null ? inOrderNumber : "");
+            String orderNumber = pickingOrder.getOrderNumber();
+            order.put("etpsPreentNo", orderNumber != null ? orderNumber : "");
             order.put("inputTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             order.put("mtpckEndprdTypecd", "E"); // 成品（出口）
-            order.put("stockTypecd", "I");
+            order.put("stockTypecd", "E");
 
             // 4. 构建明细列表
             List<Map<String, Object>> qnBillList = new ArrayList<>();

mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java

@@ -2753,6 +2753,7 @@ public class StockShelfOrderApplicationService {
             item.put("stockTypecd", "I");
             item.put("mtpckEndprdTypecd", mtpckEndprdTypecd);
             List<Map<String, Object>> detailItems = new ArrayList<>();
+            int index = 1;
             for (ShelfMaterialDetailPO shelfMaterialDetail : shelfMaterialDetails) {
                 Map<String, Object> detailItem = new HashMap<>();
 
@@ -2764,7 +2765,11 @@ public class StockShelfOrderApplicationService {
                     String[] split = lotNumber.split("-");
                     if (split.length == 2) {
                         detailItem.put("gNo", split[1]);
+                    } else {
+                        detailItem.put("gNo", index++);
                     }
+                } else {
+                    detailItem.put("gNo", index++);
                 }
                 MaterialBaseInfo materialBaseIn = materialBaseInfoMapper.selectById(materialBaseInfoId);
                 if (materialBaseIn != null) {
@@ -2795,10 +2800,10 @@ public class StockShelfOrderApplicationService {
                     if (split.length == 2) {
                         detailItem.put("orderRow", split[1]);
                     } else {
-                        detailItem.put("orderRow", 1);
+                        detailItem.put("orderRow", index++);
                     }
                 } else {
-                    detailItem.put("orderRow", 1);
+                    detailItem.put("orderRow", index++);
                 }
                 //进口核注清单号
                 detailItem.put("bondInvtNo", "BONDINV202603300001");

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

@@ -97,6 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="storageLocationName"    column="storage_location_name"    />
         <result property="omsStockInOrderId"    column="stock_in_order"    />
         <result property="businessOrderNo"    column="business_order_no"    />
+        <result property="pushBy"    column="PUSH_BY"    />
+        <result property="pushByName"    column="PUSH_BY_NAME"    />
+        <result property="pushStatus"    column="PUSH_STATUS"    />
+        <result property="pushTime"    column="PUSH_TIME"    />
     </resultMap>
 
     <sql id="selectStockInOrderPo">
@@ -104,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.audit_status, a.audit_remark, a.audit_by, a.audit_by_name, a.audit_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_code,
         a.shipper_name, a.order_type_code, a.order_type_name, a.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number,
         a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,a.billing_json,a.SETTLEMENT_CURRENCY,
-        a.SALESMAN_ID,a.SALESMAN_NAME,a.PICTURE_URL,
+        a.SALESMAN_ID,a.SALESMAN_NAME,a.PICTURE_URL,a.PUSH_TIME,a.PUSH_BY,a.PUSH_BY_NAME,a.PUSH_STATUS,
         -- 计划入库数量：入库明细表 in_material_detail 的 quantity 汇总
         (select ifnull(sum(imd.quantity), 0)
            from in_material_detail imd

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -96,6 +96,10 @@
         <result property="businessOrderNo" column="business_order_no"/>
         <result property="returnQuantity" column="RETURN_QUANTITY"/>
         <result property="trainNo" column="train_no"/>
+        <result property="pushBy"    column="PUSH_BY"    />
+        <result property="pushByName"    column="PUSH_BY_NAME"    />
+        <result property="pushStatus"    column="PUSH_STATUS"    />
+        <result property="pushTime"    column="PUSH_TIME"    />
     </resultMap>
 
 
@@ -110,7 +114,7 @@
         a.allocation_quantity, a.already_allocation_quantity, a.picking_quantity, a.check_quantity, a.cancel_order, a.cancel_remark, a.cancel_by, a.cancel_by_name,
         a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.check_status,
         a.check_task_distribution, a.check_task_distribution_time, a.check_operators_by, a.check_operators_name, a.mobilize_code,
-        a.remark, a.create_time, a.create_by, a.create_by_name,a.train_no,
+        a.remark, a.create_time, a.create_by, a.create_by_name,a.train_no,a.PUSH_TIME,a.PUSH_BY,a.PUSH_BY_NAME,a.PUSH_STATUS,
         a.update_time, a.update_by, a.update_by_name, a.del_flag, a.over_stock_id, a.over_stock_status, a.over_stock_type,a."TO",
         a.CONTACT_PERSON,a.VEHICLE_MODEL_PLATE,a.ENTRUST_NO,a.TEL,a.DRIVER_SIGN,a.FAX,a.DECLARE_CUSTOMS,a.MANUFACTURER,
         a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,