Merge branch 'dev' into dev_WMS20260401

# Conflicts: # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java # mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java # mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/facade/IReceiptMaterialDetailService.java # mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java # mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockReceiptOrder/StockReceiptOrderApi.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java # mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml # mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml
2026-04-15 18:48:55 +08:00
parent ad310f2fc2 551c618820
commit 22aef1d84d
79 changed files with 3519 additions and 476 deletions
@@ -81,8 +81,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="completionTime"    column="COMPLETION_TIME"    />
        <result property="orderDate"    column="ORDER_DATE"    />
        <result property="batchNumber"    column="BATCH_NUMBER"    />
+        <result property="billingJson"    column="billing_json"    />
+        <result property="salesmanId"    column="SALESMAN_ID"    />
+        <result property="salesmanName"    column="SALESMAN_NAME"    />
+        <result property="settlementCurrency"    column="SETTLEMENT_CURRENCY"    />
    </resultMap>

+
+    <sql id="selectStockInOrderPo">
+        a.in_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.notice_number, a.in_order_number, a.status,
+        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,
+        -- 计划入库数量：入库明细表 in_material_detail 的 quantity 汇总
    <!-- 计划入库数量：入库明细主行 quantity 汇总（列表 quantity / plan_in_quantity 均以此为准展示） -->
    <sql id="sumPlanInMaterialQuantity">
        (select ifnull(sum(imd.quantity), 0)