diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java index a393c3007..b85a7ab11 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java @@ -87,6 +87,8 @@ public class EmisSite extends BaseEntity private String exigencePhone; /* 传真 */ private String fax; + /* 站点级别 */ + private String siteLevels; /* 站点描述 */ private String siteDesc; /* 派送区域 */ @@ -191,9 +193,9 @@ public class EmisSite extends BaseEntity private String dataFrom; /* 站点区域 */ private String siteArea; - /* 允许代理金额 */ + /* 允许代收货款 */ private String blAllowDispAgentMoney; - /* 付款金额限制 */ + /* 代收货款金额限制 */ private String dispGoodsPaymentLimited; /* 投递站点 */ private String dispDeliverySite; @@ -243,7 +245,7 @@ public class EmisSite extends BaseEntity private String blClass; /* 是否材料 */ private String blMaterial; - /* soon_piece_type */ + /* 快递产品类型 */ private String soonPieceType; /* 省份区域 */ private String provinceArea; @@ -263,6 +265,10 @@ public class EmisSite extends BaseEntity private String blNotCashOut; /* 状态 1-启用 0-停用 */ private String status; + /* 增值服务 */ + private String incrementService; + /* 是否允许仓库收货 */ + private String blWarehouseIn; /* 创建网点 */ private String createSite; /* 更新网点 */ diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml index 0e6f6832b..08ee76490 100644 --- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml @@ -32,6 +32,7 @@ + @@ -100,6 +101,7 @@ + @@ -118,6 +120,8 @@ + + @@ -160,6 +164,10 @@ select a.name from emis_brand a where a.code = #{code} limit 1 + + select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, scope_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_levels, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, status, increment_service, bl_warehouse_in, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site + + @@ -326,6 +337,7 @@ sale_phone, exigence_phone, fax, + site_levels, site_desc, dispatch_range, not_dispatch_range, @@ -413,6 +425,8 @@ bl_not_disp, bl_not_cash_out, status, + increment_service, + bl_warehouse_in, remark, tenant_id, del_flag, @@ -451,6 +465,7 @@ #{salePhone}, #{exigencePhone}, #{fax}, + #{siteLevels}, #{siteDesc}, #{dispatchRange}, #{notDispatchRange}, @@ -538,6 +553,8 @@ #{blNotDisp}, #{blNotCashOut}, #{status}, + #{incrementService}, + #{blWarehouseIn}, #{remark}, #{tenantId}, #{delFlag}, @@ -579,6 +596,7 @@ sale_phone = #{salePhone}, exigence_phone = #{exigencePhone}, fax = #{fax}, + site_levels = #{siteLevels}, site_desc = #{siteDesc}, dispatch_range = #{dispatchRange}, not_dispatch_range = #{notDispatchRange}, @@ -666,6 +684,8 @@ bl_not_disp = #{blNotDisp}, bl_not_cash_out = #{blNotCashOut}, status = #{status}, + increment_service = #{incrementService}, + bl_warehouse_in = #{blWarehouseIn}, remark = #{remark}, tenant_id = #{tenantId}, del_flag = #{delFlag},