aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-20 18:24:31 +08:00
parent 4207c886f6
commit bb31ab810c
2 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -35,6 +35,7 @@ public class EmisWaybill extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
/* 订单号 */
@ -132,6 +133,8 @@ public class EmisWaybill extends BaseEntity
private String timeType;
/* 计泡比例 */
private String meterType;
/* 取重方式 */
private String carryType;
/* 清关方式 */
private String customsClear;
/* 报关方式 */
@ -205,10 +208,18 @@ public class EmisWaybill extends BaseEntity
private String currency;
/* 结算重量 */
private BigDecimal settlementWeight;
/* 扫描重量 */
private BigDecimal scanWeight;
/* 计费重量 */
private BigDecimal feeWeight;
/* 运费 */
private BigDecimal freight;
/* 实际支付方式 : 现金或月结 */
private String realPaymentType;
/* 实收运费 */
private BigDecimal realFee;
/* 是否特殊报价 */
private String blSpecialQuote;
/* 是否超长 */
private String blOverLong;
/* 是否出账 */
@ -343,6 +354,8 @@ public class EmisWaybill extends BaseEntity
private String billPicDispatchRmk;
/* 时区偏差 */
private String timezoneOffset;
/* 数据来源 */
private String dataFrom;
private List<EmisWaybillCargo> cargoList;

78
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -53,6 +53,7 @@
<result property="productType" column="product_type" />
<result property="timeType" column="time_type" />
<result property="meterType" column="meter_type" />
<result property="carryType" column="carry_type" />
<result property="customsClear" column="customs_clear" />
<result property="customsEclaration" column="customs_eclaration" />
<result property="estimateDate" column="estimate_date" />
@ -88,8 +89,12 @@
<result property="volumeWeight" column="volume_weight" />
<result property="currency" column="currency" />
<result property="settlementWeight" column="settlement_weight" />
<result property="scanWeight" column="scan_weight" />
<result property="feeWeight" column="fee_weight" />
<result property="freight" column="freight" />
<result property="realPaymentType" column="real_payment_type" />
<result property="realFee" column="real_fee" />
<result property="blSpecialQuote" column="bl_special_quote" />
<result property="blOverLong" column="bl_over_long" />
<result property="blBill" column="bl_bill" />
<result property="blBillText" column="bl_bill_text" />
@ -155,6 +160,7 @@
<result property="billPicSendRmk" column="bill_pic_send_rmk" />
<result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" />
<result property="timezoneOffset" column="timezone_offset" />
<result property="dataFrom" column="data_from" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -227,7 +233,7 @@
<sql id="selectEmisWaybillVo">
select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill
select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, carry_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, scan_weight, fee_weight, freight, real_payment_type, real_fee, bl_special_quote, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill
</sql>
<select id="selectWaybillStatByEmpCode" parameterType="String" resultType="map">
@ -266,37 +272,8 @@
</select>
<select id="selectEmisWaybillByMutiBillCode" parameterType="String" resultMap="EmisWaybillResult">
select id, order_sn, cust_order_id, bill_code,
bill_code_sub, order_status, waybill_status,
order_type, order_date, user_id, customer_code,
customer_name, receive_customer_code,
receive_customer_name, third_customer_code,
third_customer_name, open_id, receive_name,
receive_company, receive_mobile, receive_tel,
receive_country, receive_province, receive_city,
receive_county, receive_town, receive_address,
receive_postcode, receive_pcd, send_name,
send_company, send_mobile, send_tel, send_country, send_province, send_city,
send_county, send_town, send_address, send_postcode, send_pcd, payment_type,
calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type,
customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method,
pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code,
into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone,
into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time,
goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee,
prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume,
parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight,
bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code,
real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark,
insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd,
transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code,
last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code,
send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code,
produce_bill_man_code, destination_code, destination_province, destination_city, destination_county,
dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code,
bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message,
bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk,
timezone_offset, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
select
id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, carry_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, scan_weight, fee_weight, freight, real_payment_type, real_fee, bl_special_quote, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
from emis_waybill
where billCode in
<foreach item="id" collection="array" open="(" separator="," close=")">
@ -356,6 +333,7 @@
<if test="productType != null and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
<if test="timeType != null and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
<if test="meterType != null and meterType != ''"> and meter_type like concat('%', #{meterType}, '%')</if>
<if test="carryType != null and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if>
<if test="customsClear != null and customsClear != ''"> and customs_clear like concat('%', #{customsClear}, '%')</if>
<if test="customsEclaration != null and customsEclaration != ''"> and customs_eclaration like concat('%', #{customsEclaration}, '%')</if>
<if test="estimateDate != null "> and estimate_date = #{estimateDate}</if>
@ -384,15 +362,19 @@
<if test="prepareInBillCode != null and prepareInBillCode != ''"> and prepare_in_bill_code like concat('%', #{prepareInBillCode}, '%')</if>
<if test="prepareInRemark != null and prepareInRemark != ''"> and prepare_in_remark like concat('%', #{prepareInRemark}, '%')</if>
<if test="prepareInSupplier != null and prepareInSupplier != ''"> and prepare_in_supplier like concat('%', #{prepareInSupplier}, '%')</if>
<if test="totalWeight != null "> and total_weight like concat('%', #{totalWeight}, '%')</if>
<if test="totalVolume != null "> and total_volume like concat('%', #{totalVolume}, '%')</if>
<if test="parcelQty != null "> and parcel_qty like concat('%', #{parcelQty}, '%')</if>
<if test="billWeight != null "> and bill_weight like concat('%', #{billWeight}, '%')</if>
<if test="volumeWeight != null "> and volume_weight like concat('%', #{volumeWeight}, '%')</if>
<if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
<if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
<if test="parcelQty != null "> and parcel_qty = #{parcelQty}</if>
<if test="billWeight != null "> and bill_weight = #{billWeight}</if>
<if test="volumeWeight != null "> and volume_weight = #{volumeWeight}</if>
<if test="currency != null and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
<if test="settlementWeight != null "> and settlement_weight like concat('%', #{settlementWeight}, '%')</if>
<if test="feeWeight != null "> and fee_weight like concat('%', #{feeWeight}, '%')</if>
<if test="freight != null "> and freight like concat('%', #{freight}, '%')</if>
<if test="settlementWeight != null "> and settlement_weight = #{settlementWeight}</if>
<if test="scanWeight != null "> and scan_weight = #{scanWeight}</if>
<if test="feeWeight != null "> and fee_weight = #{feeWeight}</if>
<if test="freight != null "> and freight = #{freight}</if>
<if test="realPaymentType != null and realPaymentType != ''"> and real_payment_type like concat('%', #{realPaymentType}, '%')</if>
<if test="realFee != null "> and real_fee = #{realFee}</if>
<if test="blSpecialQuote != null and blSpecialQuote != ''"> and bl_special_quote like concat('%', #{blSpecialQuote}, '%')</if>
<if test="blOverLong != null and blOverLong != ''"> and bl_over_long like concat('%', #{blOverLong}, '%')</if>
<if test="blBill != null and blBill != ''"> and bl_bill like concat('%', #{blBill}, '%')</if>
<if test="blBillText != null and blBillText != ''"> and bl_bill_text like concat('%', #{blBillText}, '%')</if>
@ -458,6 +440,7 @@
<if test="billPicSendRmk != null and billPicSendRmk != ''"> and bill_pic_send_rmk like concat('%', #{billPicSendRmk}, '%')</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''"> and bill_pic_dispatch_rmk like concat('%', #{billPicDispatchRmk}, '%')</if>
<if test="timezoneOffset != null and timezoneOffset != ''"> and timezone_offset like concat('%', #{timezoneOffset}, '%')</if>
<if test="dataFrom != null and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
@ -489,7 +472,7 @@
where a.id = #{id}
</select>
<insert id="insertEmisWaybill" parameterType="EmisWaybill" useGeneratedKeys="true" keyProperty="id">
<insert id="insertEmisWaybill" parameterType="EmisWaybill">
insert into emis_waybill
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@ -540,6 +523,7 @@
<if test="productType != null and productType != ''">product_type,</if>
<if test="timeType != null and timeType != ''">time_type,</if>
<if test="meterType != null and meterType != ''">meter_type,</if>
<if test="carryType != null and carryType != ''">carry_type,</if>
<if test="customsClear != null and customsClear != ''">customs_clear,</if>
<if test="customsEclaration != null and customsEclaration != ''">customs_eclaration,</if>
<if test="estimateDate != null">estimate_date,</if>
@ -575,8 +559,12 @@
<if test="volumeWeight != null">volume_weight,</if>
<if test="currency != null and currency != ''">currency,</if>
<if test="settlementWeight != null">settlement_weight,</if>
<if test="scanWeight != null">scan_weight,</if>
<if test="feeWeight != null">fee_weight,</if>
<if test="freight != null">freight,</if>
<if test="realPaymentType != null and realPaymentType != ''">real_payment_type,</if>
<if test="realFee != null">real_fee,</if>
<if test="blSpecialQuote != null and blSpecialQuote != ''">bl_special_quote,</if>
<if test="blOverLong != null and blOverLong != ''">bl_over_long,</if>
<if test="blBill != null and blBill != ''">bl_bill,</if>
<if test="blBillText != null and blBillText != ''">bl_bill_text,</if>
@ -642,6 +630,7 @@
<if test="billPicSendRmk != null and billPicSendRmk != ''">bill_pic_send_rmk,</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">bill_pic_dispatch_rmk,</if>
<if test="timezoneOffset != null and timezoneOffset != ''">timezone_offset,</if>
<if test="dataFrom != null and dataFrom != ''">data_from,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -700,6 +689,7 @@
<if test="productType != null and productType != ''">#{productType},</if>
<if test="timeType != null and timeType != ''">#{timeType},</if>
<if test="meterType != null and meterType != ''">#{meterType},</if>
<if test="carryType != null and carryType != ''">#{carryType},</if>
<if test="customsClear != null and customsClear != ''">#{customsClear},</if>
<if test="customsEclaration != null and customsEclaration != ''">#{customsEclaration},</if>
<if test="estimateDate != null">#{estimateDate},</if>
@ -735,8 +725,12 @@
<if test="volumeWeight != null">#{volumeWeight},</if>
<if test="currency != null and currency != ''">#{currency},</if>
<if test="settlementWeight != null">#{settlementWeight},</if>
<if test="scanWeight != null">#{scanWeight},</if>
<if test="feeWeight != null">#{feeWeight},</if>
<if test="freight != null">#{freight},</if>
<if test="realPaymentType != null and realPaymentType != ''">#{realPaymentType},</if>
<if test="realFee != null">#{realFee},</if>
<if test="blSpecialQuote != null and blSpecialQuote != ''">#{blSpecialQuote},</if>
<if test="blOverLong != null and blOverLong != ''">#{blOverLong},</if>
<if test="blBill != null and blBill != ''">#{blBill},</if>
<if test="blBillText != null and blBillText != ''">#{blBillText},</if>
@ -802,6 +796,7 @@
<if test="billPicSendRmk != null and billPicSendRmk != ''">#{billPicSendRmk},</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">#{billPicDispatchRmk},</if>
<if test="timezoneOffset != null and timezoneOffset != ''">#{timezoneOffset},</if>
<if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -813,6 +808,7 @@
</trim>
</insert>
<update id="updateEmisWaybill" parameterType="EmisWaybill">
update emis_waybill
<trim prefix="SET" suffixOverrides=",">