wms费用科目修改;

mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="pictureApp"    column="picture_app"    />
+        <result property="billingJson"    column="billing_json"    />
     </resultMap>
 
 
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.platform_code, a.platform_name, a.platform_use_time_id, a.platform_use_start_time, a.platform_use_end_time, a.platform_use_status,
         a.order_type_code, a.order_type_name, a.expect_time, a.warehouse_id, a.warehouse_code, a.warehouse_name,         a.shipper_id,
         a.shipper_name, a.order_number, a.picking_order_number, a.remark, a.task_distribution, a.task_distribution_time, a.create_time, a.create_by, a.create_by_name, a.update_time,
-        a.update_by, a.update_by_name, a.del_flag, a.picture_app
+        a.update_by, a.update_by_name, a.del_flag, a.picture_app,a.billing_json
    </sql>
 
     <sql id="selectHandoverTaskOrderPo1">

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

@@ -80,6 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseDate"    column="WAREHOUSE_DATE"    />
         <result property="completionTime"    column="COMPLETION_TIME"    />
         <result property="orderDate"    column="ORDER_DATE"    />
+        <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>
 
 
@@ -87,7 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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.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 汇总
         (select ifnull(sum(imd.quantity), 0)
            from in_material_detail imd

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

@@ -82,6 +82,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="needDeclareFlag" column="need_declare_flag"/>
         <result property="needTransportFlag" column="need_transport_flag"/>
         <result property="pictureApp" column="picture_app"/>
+        <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>
 
 
@@ -97,7 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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,
         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.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY,
+        a.SALESMAN_ID,a.SALESMAN_NAME
     </sql>
 
 

mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="billingJson"    column="billing_json"    />
     </resultMap>
 
 
@@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.status, a.platform_id, a.platform_code, a.platform_name, a.platform_use_time_id, a.platform_use_start_time, a.platform_use_end_time,
             a.platform_use_status, a.quantity, a.receipt_quantity, a.receipt_material_quantity, a.material_quantity, a.abnormal, a.task_distribution, a.task_distribution_time,
             a.operators_by, a.operators_name, a.remark, a.create_time, a.create_by, a.create_by_name,
-            a.update_time, a.update_by, a.update_by_name, a.del_flag
+            a.update_time, a.update_by, a.update_by_name, a.del_flag, a.billing_json
     </sql>
 
     <sql id="selectStockReceiptOrderPo1">