Merge branch 'dev_WMS20260401' into dev

2026-04-22 18:42:51 +08:00
parent 23e9af4e11 798e95521a
commit 724ae6c774
23 changed files with 1872 additions and 59 deletions
@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="directorName"    column="DIRECTOR_NAME"    />
        <result property="reservationOrderSource"    column="RESERVATION_ORDER_SOURCE"    />
        <result property="outboundTime"    column="OUTBOUND_TIME"    />
+        <result property="businessOrderNo"    column="BUSINESS_ORDER_NO"    />
    </resultMap>


@@ -111,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
        a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,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.tms_order_number,
-        a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME
+        a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.BUSINESS_ORDER_NO
    </sql>