diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 6b4e66cf0..a0392b470 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -37,7 +37,6 @@ public class EmisWaybill extends BaseEntity { private static final long serialVersionUID = 1L; - /* id */ private Long id; /* 订单号 */ @@ -286,6 +285,8 @@ public class EmisWaybill extends BaseEntity private String takePieceEmployeeCode; /* 发件网点代码 */ private String sendSiteCode; + /* 发件财务中心代码 */ + private String sendCenterCode; /* 发货时间 - 取本地时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sendDate; @@ -336,13 +337,15 @@ public class EmisWaybill extends BaseEntity private String blAcceptMessage; /* 是否生成子单 1-是 0-否 */ private String blGenSubbill; - /* 签收人 */ + /* 签收状态 字典 */ + private String blSign; + /* 签收人(客户) */ private String signMan; - /* 签收人代码 */ + /* 签收员代码 */ private String signManCode; /* 签收站点代码 */ private String signSiteCode; - /* 签收时间 */ + /* sign_date */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signDate; /* 揽收图片备注 */ @@ -362,6 +365,8 @@ public class EmisWaybill extends BaseEntity private String orderRemark; /* 数据来源 */ private String dataFrom; + /* 是否敏感物 */ + private String blSpecialGoods; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java new file mode 100644 index 000000000..04d77846a --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/SendStatDataInfo.java @@ -0,0 +1,30 @@ +package com.xdadan.erp.emis.domain.stat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 寄件录单统计 + */ +@Data +public class SendStatDataInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /* 录单日期 yyyy-mm-dd */ + private String sendDay; + + private String sendDay; + + // 扫描记录数,已签收数量 + private Integer scanCount; + private Integer signCount; + + private String billCodeStr; + + private String scanSiteCode; + private String scanSiteName; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseMapper.java new file mode 100644 index 000000000..828ab184a --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseMapper.java @@ -0,0 +1,27 @@ +/** + * @Project: emis + * @Title: EmisBrandMapper.java + * @author linfso + * @date 2023-12-14 13:02:47 + * @Copyright: ShangHai Doitinfo 2022 All rights reserved. + * @version v1.0 + * @Description:

品牌 Mapper 接口

+ * Warning : This file is generate by ai tools,don't edit!!! + */ +package com.xdadan.erp.emis.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.common.core.domain.BaseEntity; + +import java.util.List; + +/** + * @ClassName EmisBaseMapper + * @Description

公共 Mapper 接口

+ * @author linfso + * @date 2023-12-14 13:02:47 + */ +public interface EmisBaseMapper extends BaseMapper +{ + +} diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml new file mode 100644 index 000000000..91173b669 --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml b/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml index 4582ea109..6f3fbcb13 100644 --- a/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisBrandMapper.xml @@ -5,7 +5,7 @@ - + @@ -15,15 +15,16 @@ - - - - - - - - - + + + + + + + + + + diff --git a/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml b/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml index 59f5dfd61..649538ec3 100644 --- a/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml @@ -20,6 +20,7 @@ + diff --git a/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml index 5ca48961e..9a020c57e 100644 --- a/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCountryAreaMapper.xml @@ -19,6 +19,8 @@ + + diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml index 814385746..69970c873 100644 --- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml @@ -24,6 +24,12 @@ + + + + + + diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml index 6982f8248..3c5376732 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml @@ -36,10 +36,16 @@ - - - - + + + + + + + + + + @@ -47,14 +53,6 @@ - - - - - select a.name from emis_country a where a.code = #{code} limit 1 - - - - - - - - - - select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml index ad99f12a2..4d16f342f 100644 --- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml @@ -29,11 +29,17 @@ - - + + + + - - + + + + + + @@ -45,26 +51,6 @@ select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination - - - - - - - - - - - select a.site_name from emis_site a where a.site_code = #{code} limit 1 - - - - - - - - select id, prefix, apply_seq, apply_date, provide_type, material_code, material_name, apply_man_code, apply_site_code, apply_count, unit_money, sum_money, bl_send, send_date, send_man_code, send_site_code, send_center_man_code, send_center_site_code, bl_cancel, cancel_man_code, cancel_date, cancel_site_code, user_site_code, provide_flag, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_electronic_pag_apply diff --git a/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml b/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml index 798a816b5..17a2354c2 100644 --- a/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml @@ -26,6 +26,12 @@ + + + + + + diff --git a/emis-biz/src/main/resources/mapper/EmisElectronicSitePagMapper.xml b/emis-biz/src/main/resources/mapper/EmisElectronicSitePagMapper.xml index 4fcb0aed1..dda60343c 100644 --- a/emis-biz/src/main/resources/mapper/EmisElectronicSitePagMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisElectronicSitePagMapper.xml @@ -31,6 +31,12 @@ + + + + + + diff --git a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml index 55695d981..f891ebf80 100644 --- a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml @@ -69,6 +69,12 @@ + + + + + + diff --git a/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml b/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml index fe91b2d20..e69be2f08 100644 --- a/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml @@ -31,6 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + diff --git a/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml index d21b4a6f8..d7c3794b4 100644 --- a/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml @@ -56,42 +56,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + - - - - - - - - + + + + + + + + - select id, cust_no, cust_name, cust_name_en, customer_code, user_type, company, lic_no, biz_info, cust_level, country, province, city, county, address, sex, owner_site, contact, phone, email, status, payee, salesmen, market_man, invitation_info, contract_type, order_num, contract_content, contract_change_content, contract_startdate, contract_enddate, contract_signdate, contract_senddate, contract_recievedate, express_name, express_billcode, bank, account_no, invoice_address, financial_contact, sender, send_address, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_monthpay_account - - - - - - - - - - select GROUP_CONCAT(name) from emis_country where FIND_IN_SET(`code`,#{code}) - - select a.site_name from emis_site a where a.site_code = #{code} limit 1 - - + + + + - select group_concat(a.prod_name) from emis_trans_product a where FIND_IN_SET(a.prod_code, #{code}) limit 1 - - - - - - - - - - - - select quote_id, quote_code, quote_name, quote_type, customer_code, cust_no, use_site_code, trans_line_code, fee_type, prod_code, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml index da70f0dda..156e1c5f3 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml @@ -26,7 +26,7 @@ - + @@ -34,9 +34,6 @@ select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_send_area - - select a.name from emis_country a where a.code = #{code} limit 1 - - select a.name from emis_country a where a.code = #{code} limit 1 - - - - - - - - - - - - select a.line_name from emis_trans_line a,emis_trans_product b where a.line_code=b.trans_line_code and b.prod_code = #{code} limit 1 - - - - select id, prod_code, prod_name, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_special_calc_weight diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml index 9647fa363..6e1d445ec 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml @@ -87,16 +87,13 @@ - - - - - + - select group_concat(a.site_name) as site_name from emis_site a where a.del_flag='0' and FIND_IN_SET(a.site_code, #{code}) limit 1 - - - - - diff --git a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml index f1fb7ded8..8497a9187 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml @@ -33,22 +33,14 @@ - - - + + + - - - - select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_line diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml index 68795b420..1cc1f6727 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml @@ -30,21 +30,11 @@ - - + + - - - - - - select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, aging_flag, min_aging, max_aging, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_product diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 539939014..2ded16cc0 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -126,6 +126,7 @@ + @@ -150,6 +151,7 @@ + @@ -162,6 +164,7 @@ + @@ -171,85 +174,44 @@ - - - - + + + + - - - - + + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - + + - - - - - - - - - - - - - - - - - - - - - - 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, 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, cust_name, 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, payment_status, payment_date, payment_remark, order_remark, data_from, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml index f4848d3ac..45a198468 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml @@ -26,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +