diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 6393aa1ff..8f1aff425 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -44,6 +44,8 @@ + + @@ -299,7 +301,7 @@ a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city, a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,a.start_site_code, a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address, - a.send_postcode, a.send_pcd, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, + a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method, a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code, a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone, @@ -400,7 +402,7 @@ a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city, a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company, a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address, - a.send_postcode, a.send_pcd, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, + a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method, a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code, a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone, @@ -2811,6 +2813,8 @@ send_address, send_postcode, send_pcd, + enterprise_name, + enterprise_tax_id, payment_type, calc_fee_type, cust_no, @@ -2997,6 +3001,8 @@ #{sendAddress}, #{sendPostcode}, #{sendPcd}, + #{enterpriseName}, + #{enterpriseTaxId}, #{paymentType}, #{calcFeeType}, #{custNo}, @@ -3185,6 +3191,8 @@ send_address = #{sendAddress}, send_postcode = #{sendPostcode}, send_pcd = #{sendPcd}, + enterprise_name = #{enterpriseName}, + enterprise_tax_id = #{enterpriseTaxId}, payment_type = #{paymentType}, calc_fee_type = #{calcFeeType}, cust_no = #{custNo}, @@ -3374,6 +3382,8 @@ send_address = #{sendAddress}, send_postcode = #{sendPostcode}, send_pcd = #{sendPcd}, + enterprise_name = #{enterpriseName}, + enterprise_tax_id = #{enterpriseTaxId}, payment_type = #{paymentType}, calc_fee_type = #{calcFeeType}, cust_no = #{custNo},