diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java index 640a1e537..13821e016 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java @@ -35,6 +35,8 @@ public class EmisCreditCustomer extends BaseEntity /* id */ private Long id; + /* 账户编号,按规则生成 */ + private String accCode; /* 客户编码 */ private String customerCode; /* 月结卡号 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomerRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomerRecord.java index 4f688f91d..16791b7c9 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomerRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomerRecord.java @@ -35,6 +35,8 @@ public class EmisCreditCustomerRecord extends BaseEntity /* id */ private Long id; + /* 账户编号,按规则生成 */ + private String accCode; /* 客户编码 */ private String customerCode; /* 运单号 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java index d0b4286ec..974775c5c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java @@ -35,6 +35,8 @@ public class EmisCreditSalesmen extends BaseEntity /* id */ private Long id; + /* 账户编号,按规则生成 */ + private String accCode; /* 销售名称 */ private String salesmen; /* 当前余额 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmenRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmenRecord.java index f330393ec..10aa4f507 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmenRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmenRecord.java @@ -35,6 +35,8 @@ public class EmisCreditSalesmenRecord extends BaseEntity /* id */ private Long id; + /* 账户编号,按规则生成 */ + private String accCode; /* 销售名称 */ private String salesmen; /* 运单号 */ diff --git a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml index 84806bb09..c03eaa3d7 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -23,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, customer_code, monthly_pay_code, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_customer + select id, acc_code, customer_code, monthly_pay_code, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_customer from emis_credit_customer select - a.id, a.customer_code,a.monthly_pay_code, a.cur_money, a.cur_money_rate, + a.id,a.acc_code, a.customer_code,a.monthly_pay_code, a.cur_money, a.cur_money_rate, a.credit_money, a.currency, a.trans_type, a.start_date, a.end_date, a.bl_open, a.remark, a.tenant_id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.create_site, a.update_site, @@ -127,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into emis_credit_customer + acc_code, customer_code, monthly_pay_code, cur_money, @@ -148,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_site, + #{accCode}, #{customerCode}, #{monthlyPayCode}, #{curMoney}, @@ -173,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update emis_credit_customer + acc_code = #{accCode}, customer_code = #{customerCode}, monthly_pay_code = #{monthlyPayCode}, cur_money = #{curMoney}, diff --git a/emis-biz/src/main/resources/mapper/EmisCreditCustomerRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditCustomerRecordMapper.xml index 23e3bf87e..bfdf48dfa 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditCustomerRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditCustomerRecordMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, customer_code, bill_code, change_type, change_money, pre_balance, back_balance, currency, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_customer_record + select id, acc_code, customer_code, bill_code, change_type, change_money, pre_balance, back_balance, currency, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_customer_record - + insert into emis_credit_customer_record id, + acc_code, customer_code, bill_code, change_type, @@ -90,9 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{id}, + #{accCode}, #{customerCode}, #{billCode}, #{changeType}, @@ -108,12 +112,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + update emis_credit_customer_record + acc_code = #{accCode}, customer_code = #{customerCode}, bill_code = #{billCode}, change_type = #{changeType}, @@ -134,11 +139,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_credit_customer_record where id = #{id} + update emis_credit_customer_record set del_flag='1' where id = #{id} - delete from emis_credit_customer_record where id in + update emis_credit_customer_record set del_flag='1' where id in #{id} diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml index 36c7247ea..b5c243215 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -19,16 +20,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, salesmen, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, bl_lock, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_salesmen + select id, acc_code, salesmen, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, bl_lock, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_salesmen - + insert into emis_credit_salesmen + acc_code, salesmen, cur_money, cur_money_rate, @@ -121,8 +128,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + + #{accCode}, #{salesmen}, #{curMoney}, #{curMoneyRate}, @@ -142,12 +150,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + update emis_credit_salesmen + acc_code = #{accCode}, salesmen = #{salesmen}, cur_money = #{curMoney}, cur_money_rate = #{curMoneyRate}, diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenRecordMapper.xml index 6439f5832..7ae8673a8 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenRecordMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,14 +17,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, salesmen, bill_code, change_type, change_money, pre_balance, back_balance, currency, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_salesmen_record + select id, acc_code, salesmen, bill_code, change_type, change_money, pre_balance, back_balance, currency, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_salesmen_record - + - + insert into emis_credit_salesmen_record id, + acc_code, salesmen, bill_code, change_type, @@ -90,9 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{id}, + #{accCode}, #{salesmen}, #{billCode}, #{changeType}, @@ -108,12 +113,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + update emis_credit_salesmen_record + acc_code = #{accCode}, salesmen = #{salesmen}, bill_code = #{billCode}, change_type = #{changeType}, @@ -134,11 +140,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_credit_salesmen_record where id = #{id} + update emis_credit_salesmen_record set del_flag='1' where id = #{id} - delete from emis_credit_salesmen_record where id in + update emis_credit_salesmen_record set del_flag='1' where id in #{id}