wms费用科目修改;

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