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-03-31 23:09:40 +08:00
parent 14efa68f46
commit 2365a6b2d5
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisWaybill.java
* @author linfso
* @date 2024-03-31 08:33:04
* @date 2024-03-31 15:08:56
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 运单列表 实体类 </p>
@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisWaybill
* @Description 运单列表
* @author linfso
* @date 2024-03-31 08:33:04
* @date 2024-03-31 15:08:56
*/
@Data
public class EmisWaybill extends BaseEntity
@ -60,6 +60,10 @@ public class EmisWaybill extends BaseEntity
private String receiveCustomerCode;
/* 收件客户客户名称 */
private String receiveCustomerName;
/* 第三方客户客户编号 */
private String thirdCustomerCode;
/* 第三方客户客户名称 */
private String thirdCustomerName;
/* wx openid */
private String openId;
/* 收货人名 */

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

@ -18,6 +18,8 @@
<result property="customerName" column="customer_name" />
<result property="receiveCustomerCode" column="receive_customer_code" />
<result property="receiveCustomerName" column="receive_customer_name" />
<result property="thirdCustomerCode" column="third_customer_code" />
<result property="thirdCustomerName" column="third_customer_name" />
<result property="openId" column="open_id" />
<result property="receiveName" column="receive_name" />
<result property="receiveCompany" column="receive_company" />
@ -168,7 +170,7 @@
</resultMap>
<sql id="selectEmisWaybillVo">
select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_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, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_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, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill
select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_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, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_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, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill
</sql>
<select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@ -187,6 +189,8 @@
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="receiveCustomerCode != null and receiveCustomerCode != ''"> and receive_customer_code like concat('%', #{receiveCustomerCode}, '%')</if>
<if test="receiveCustomerName != null and receiveCustomerName != ''"> and receive_customer_name like concat('%', #{receiveCustomerName}, '%')</if>
<if test="thirdCustomerCode != null and thirdCustomerCode != ''"> and third_customer_code like concat('%', #{thirdCustomerCode}, '%')</if>
<if test="thirdCustomerName != null and thirdCustomerName != ''"> and third_customer_name like concat('%', #{thirdCustomerName}, '%')</if>
<if test="openId != null and openId != ''"> and open_id like concat('%', #{openId}, '%')</if>
<if test="receiveName != null and receiveName != ''"> and receive_name like concat('%', #{receiveName}, '%')</if>
<if test="receiveCompany != null and receiveCompany != ''"> and receive_company like concat('%', #{receiveCompany}, '%')</if>
@ -339,7 +343,7 @@
</select>
<select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">
select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_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, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_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, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark
select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_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, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, payment_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, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_over_weight, over_weight_number, bl_bill_text, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site, insure_site_code, insure_date, bl_print, print_man, print_man_code, print_site, print_date, print_count, bl_disp_fd, disp_fd_date, disp_fd_reason, transfer_code, transfer_billcode, current_site_code, next_site_code, last_site_code, register_site, register_site_code, register_date, register_man, register_man_code, take_piece_employee, take_piece_employee_code, send_site, send_site_code, send_date, dispatch_man, dispatch_man_code, dispatch_date, dispatch_site, dispatch_site_code, produce_bill_date, produce_bill_site, produce_bill_site_code, produce_bill_man, produce_bill_man_code, destination, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site, dispatch_underling_site_code, destination_center, destination_center_code, market_man, market_man_code, payee, salesmen, operate_employee, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, modifier, modifier_code, modify_date, modify_site, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark
from emis_waybill a
where a.id = #{id}
</select>
@ -360,6 +364,8 @@
<if test="customerName != null and customerName != ''">customer_name,</if>
<if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code,</if>
<if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name,</if>
<if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code,</if>
<if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name,</if>
<if test="openId != null and openId != ''">open_id,</if>
<if test="receiveName != null and receiveName != ''">receive_name,</if>
<if test="receiveCompany != null and receiveCompany != ''">receive_company,</if>
@ -522,6 +528,8 @@
<if test="customerName != null and customerName != ''">#{customerName},</if>
<if test="receiveCustomerCode != null and receiveCustomerCode != ''">#{receiveCustomerCode},</if>
<if test="receiveCustomerName != null and receiveCustomerName != ''">#{receiveCustomerName},</if>
<if test="thirdCustomerCode != null and thirdCustomerCode != ''">#{thirdCustomerCode},</if>
<if test="thirdCustomerName != null and thirdCustomerName != ''">#{thirdCustomerName},</if>
<if test="openId != null and openId != ''">#{openId},</if>
<if test="receiveName != null and receiveName != ''">#{receiveName},</if>
<if test="receiveCompany != null and receiveCompany != ''">#{receiveCompany},</if>
@ -687,6 +695,8 @@
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
<if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code = #{receiveCustomerCode},</if>
<if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name = #{receiveCustomerName},</if>
<if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code = #{thirdCustomerCode},</if>
<if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name = #{thirdCustomerName},</if>
<if test="openId != null and openId != ''">open_id = #{openId},</if>
<if test="receiveName != null and receiveName != ''">receive_name = #{receiveName},</if>
<if test="receiveCompany != null and receiveCompany != ''">receive_company = #{receiveCompany},</if>