1

src/main/java/net/chenlin/dp/common/support/orm/db/DataSourceEnum.java

@@ -10,6 +10,8 @@ public enum DataSourceEnum {
 
     SLAVE("slave-data-source", false),
 
+    SLAVE2("slave-data-source999",false),
+
     LAST("last-data-source",false);
 
 

src/main/java/net/chenlin/dp/common/support/orm/db/DynamicDataSourceConfig.java

@@ -35,13 +35,21 @@ public class DynamicDataSourceConfig {
         return DruidDataSourceBuilder.create().build();
     }
 
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.slave-data-source999")
+    public DataSource slave2DataSource(){
+        return DruidDataSourceBuilder.create().build();
+    }
+
+
     @Bean
     @Primary
     public DynamicDataSource dataSource(DataSource defaultDataSource,DataSource slaveDataSource) {
-        Map<String, DataSource> targetDataSources = new HashMap<>(3);
+        Map<String, DataSource> targetDataSources = new HashMap<>(4);
         targetDataSources.put(DataSourceEnum.MASTER.getName(), defaultDataSource);
         targetDataSources.put(DataSourceEnum.SLAVE.getName(), slaveDataSource);
         targetDataSources.put(DataSourceEnum.LAST.getName(), lastDataSource());
+        targetDataSources.put(DataSourceEnum.SLAVE2.getName(), slave2DataSource());
         return new DynamicDataSource(defaultDataSource, targetDataSources);
     }
 }

src/main/java/net/chenlin/dp/modules/api/dao/SaleOrderMapper.java

@@ -133,14 +133,14 @@ public interface SaleOrderMapper extends BaseMapper<YonyouSaleOrder> {
 	 * u8销售发货单表头接口实体->客诉单-抵扣
 	 * @return
 	 */
-	List<SaleOrderFH>CrmIKSDOrder();
+	List<SaleOrderTH>CrmIKSDOrder();
 
 	/**
 	 * u8销售发货单表体接口实体-》客诉单-抵扣
 	 * @param id
 	 * @return
 	 */
-	List<SaleOrderFHMin>CrmIKSDOrderMin(@Param("id")String id);
+	List<SaleOrderTHMin>CrmIKSDOrderMin(@Param("id")String id);
 
 
 	/**
@@ -200,14 +200,14 @@ public interface SaleOrderMapper extends BaseMapper<YonyouSaleOrder> {
 	 * u8接口实体--送样单表头
 	 * @return
 	 */
-	List<SaleOrderFH>CrmISYDOrder();
+	List<ISaleOrder>CrmISYDOrder();
 
 	/**
 	 * u8接口实体---送样单表体
 	 * @param id
 	 * @return
 	 */
-	List<SaleOrderFHMin>CrmISYDOrderMin(@Param("id")String id);
+	List<ISaleOrderMin>CrmISYDOrderMin(@Param("id")String id);
 
 
 	/**

src/main/java/net/chenlin/dp/modules/api/mapper/CustomerMapper.xml

@@ -87,7 +87,7 @@
 		select ccuscode,caccountnum,bdefault,caccountname,cbank,bdefault,cbranch from CRM_U8_customEntity15__c where ccuscode=#{code}
 	</select>
 	<select id="ICustomerList" resultMap="BaseResultMap">
-		select cCusCode ,cCusName ,cCusAbbName ,cCCCode ,cCusOAddress  from crm_u8_customer where cCusCode='0070'
+		select cCusCode ,cCusName ,cCusAbbName ,cCCCode ,cCusOAddress  from crm_u8_customer where issyu8 =0 or issyu8 is null
 	</select>
 
 	<update id="UpdateCustomer">

src/main/java/net/chenlin/dp/modules/api/mapper/SaleOrderMapper.xml

@@ -327,11 +327,11 @@
 		update CRM_U8_SA_QuoMain set issyu8='1' where id=#{id}
 	</update>
 	<update id="UpdateKSDDKOrder">
-		update CRM_U8_Deduction set issyu8='1' where DLID=#{id}
+		update CRM_U8_Deduction set issyu8='1' where id=#{id}
 
 	</update>
 	<update id="UpdateKSDTHOrder">
-		update CRM_U8_DispatchList set issyu8='1' where DLID=#{id}
+		update CRM_U8_DispatchList set issyu8='1' where id=#{id}
 	</update>
 	<update id="UpdateKSDTKOrder">
 		update CRM_U8_Refund set issyu8='1' where cVouchID=#{id}
@@ -347,8 +347,8 @@
 
 
 	<select id="SaleOrderBJList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderBJ">
-		select ID,dDate,cCode,cCusCode,cDepCode,cPersonCode,cexch_name as 'cexchName',iExchRate,(iTaxRate*100) as 'iTaxRate',cMemo,cMaker,cVerifier,cCloser,cBusType
-		from  CRM_U8_SA_QuoMain
+		select ID,convert(varchar(10),ddate,120) as 'dDate',cCode,cCusCode,cDepCode,cPersonCode,cexch_name as 'cexchName',iExchRate,(iTaxRate*100) as 'iTaxRate',cMemo,cMaker,cVerifier,cCloser,cBusType
+		from  CRM_U8_SA_QuoMain where issyu8 =0 or issyu8 is null
 
 	</select>
 
@@ -412,45 +412,45 @@
 
 	</select>
 	<select id="CrmKSOrderTHList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTH">
-		select cVouchID,dlid,
+		select cVouchID,id as 'dlid',
 				   cdlcode,cvouchtype,cstcode,ddate,crdcode,cdepcode,cpersoncode,ccuscode,csccode,cshipaddress,cexch_name as 'cexchname',iexchrate,
 			   itaxrate,breturnflag, cmaker,ccusname,cbustype from crm_u8_DispatchList
 	</select>
 	<select id="CrmKSOrderTHMinList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTHMin">
 		select  a.autoid,a.dlid,a.icorid,a.cwhcode,a.cinvcode,a.iquantity,a.inum,a.iunitprice,a.itaxunitprice,a.imoney,a.itax,a.isum, a.inatunitprice,a.inatmoney,a.inattax,a.inatsum,a.isosid,a.cinvname,a.itaxrate,b.citemcode,b.citem_class citemclass,a.iinvexchrate,a.cunitid,a.csocode,a.ccusinvcode,a.ccusinvname
 		from  CRM_U8_DispatchItem a
-				  left join CRM_U8_DispatchList b on a.dlid=a.dlid
- where a.dlid=#{id}
+				  left join CRM_U8_DispatchList b on a.mid=b.id
+ where a.Mid=#{id}
 
 	</select>
 	<select id="CrmKSDOrderFHList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTH">
-		select dlid,cVouchID,
+		select id as 'dlid',cVouchID,
 				   cdlcode,cvouchtype,cstcode,ddate,crdcode,cdepcode,cpersoncode,ccuscode,csccode,cshipaddress,cexch_name as 'cexchname',iexchrate,
-			   itaxrate,breturnflag, cmaker,ccusname,cbustype from CRM_U8_Deduction
+			   (itaxrate*100) as 'itaxrate' ,breturnflag, cmaker,ccusname,cbustype from CRM_U8_Deduction where issyu8 =0 or issyu8 is null
 	</select>
 	<select id="CrmKSDOrderFHMin" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTHMin">
 		select  a.autoid,a.dlid,a.cinvcode,a.iquantity, a.iunitprice,a.itaxunitprice,a.imoney,a.itax,a.isum,
-				a.inatunitprice,a.inatmoney,a.inattax,a.inatsum,a.cinvname,a.itaxrate,b.citemcode,b.citem_class as 'citemclass',a.citemname,
+				a.inatunitprice,a.inatmoney,a.inattax,a.inatsum,a.cinvname,(a.itaxrate *100) as 'itaxrate',b.citemcode,b.citem_class as 'citemclass',a.citemname,
 				a.citem_cname as 'citemcname', a.cunitid,a.cdefine33
 		from  CRM_U8_DeductionItem a left join CRM_U8_Deduction b
-											   on a.dlid=b.dlid
+											   on a.mid=b.id
 
-		where a.dlid=#{id}
+		where a.mid=#{id}
 	</select>
 	<select id="CrmSaleOrderCode" resultType="java.lang.String">
 		 select max( iDLsID)
 		from  DispatchLists
 	</select>
-	<select id="CrmIKSDOrder" resultMap="FH">
+	<select id="CrmIKSDOrder" resultMap="TH">
 		select
 			   cdlcode  ,convert(varchar(10),ddate,120) as 'ddate',crdcode,cdepcode,cpersoncode,ccuscode,csccode,cshipaddress,
-			   ccusname,dlid from CRM_U8_Deduction
+			   ccusname,id as 'dlid' from CRM_U8_Deduction where issyu8 =0 or issyu8 is null
 	</select>
-	<select id="CrmIKSDOrderMin" resultMap="FHMin">
+	<select id="CrmIKSDOrderMin" resultMap="THMin">
 		select  cinvcode,iquantity, iunitprice, itaxunitprice,imoney,itax,isum,
 				inatunitprice,inatmoney,inattax,inatsum,cinvname,(itaxrate*100) as 'itaxrate',citemcode,citem_class as 'citemclass',citemname,
 				citem_cname as 'citemcname', cunitid
-		from  CRM_U8_DeductionItem where dlid=#{id}
+		from  CRM_U8_DeductionItem where mid=#{id}
 	</select>
 	<select id="CrmSaleOrderMinCode" resultType="java.lang.String">
 		select max(iSOsID)
@@ -467,10 +467,10 @@
 		where a.id=#{id}
 	</select>
 	<select id="CrmSYDOrder" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTH">
-		select id as 'dlid', ddate as 'ddate',csocode as 'cdlcode',ccuscode as 'ccuscode',cdepcode as 'cdepcode',
-				cpersoncode as 'cpersoncode',ccusoaddress as 'cshipaddress',itaxrate as 'itaxrate',cmemo as 'bz',cmaker as 'cmaker',
-				ccusname as 'ccusname',cbustype as 'cbustype' from CRM_U8_customEntity12__c
-	</select>
+		select  id as 'closer',convert(varchar(10),ddate,120)  as 'date',csocode as 'code',ccuscode as 'custcode',cdepcode as 'deptcode',cpersoncode as 'personcode',
+				ccusoaddress as 'sendaddress',(itaxrate*100) as 'taxrate',cmemo as 'memo',cmaker as 'maker',ccusname as 'cusname'
+		from CRM_U8_customEntity12__c
+		</select>
 	<select id="CrmSYDOrderMin" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTHMin">
 		select a.id as 'dlid',a.cinvname as 'cinvname',a.cinvcode as'cinvcode',a.iquantity as 'iquantity'
 		,b.citemcode,b.citem_class as 'citemclass' from CRM_U8_customEntity13__c a left join CRM_U8_customEntity12__c b on a.id=b.id
@@ -485,20 +485,19 @@
 	<select id="SaleOrderFTHMaxId" resultType="java.lang.String">
 		select max(DLID) from DispatchList
 	</select>
-	<select id="CrmISYDOrder" resultMap="FH">
-		select id as 'dlid', convert(varchar(10),ddate,120) as 'ddate' ,csocode as 'cdlcode',ccuscode ,cdepcode ,
-			   cpersoncode ,ccusoaddress as 'cshipaddress',
-				cmaker as 'maker',
-				ccusname   from CRM_U8_customEntity12__c
+	<select id="CrmISYDOrder" resultType="net.chenlin.dp.modules.api.vo.ISaleOrder">
+		select  id as 'closer',convert(varchar(10),ddate,120)  as 'date',csocode as 'code',ccuscode as 'custcode',cdepcode as 'deptcode',cpersoncode as 'personcode',
+				ccusoaddress as 'sendaddress',(itaxrate*100) as 'taxrate',cmemo as 'memo',cmaker as 'maker',ccusname as 'cusname'
+		from  CRM_U8_customEntity12__c where issyu8 =0 or issyu8 is null
 </select>
-	<select id="CrmISYDOrderMin" resultMap="FHMin">
-		select a.id as 'dlid',a.cinvname as 'cinvname',a.cinvcode as'cinvcode',a.iquantity as 'iquantity'
-		,b.citemcode,b.citem_class as 'citemclass' from CRM_U8_customEntity13__c a left join CRM_U8_customEntity12__c b on a.id=b.id
+	<select id="CrmISYDOrderMin" resultType="net.chenlin.dp.modules.api.vo.ISaleOrderMin">
+		select a.cinvname as 'inventoryname',a.cinvcode as'inventorycode',a.iquantity as 'quantity'
+		from CRM_U8_customEntity13__c a
 		where a.id=#{id}
 	</select>
 	<select id="CrmIKSDOrderTH" resultMap="TH">
-		select cVouchID as 'cdlcode',dlid
-			 ,cstcode,convert(varchar(10),ddate,120) as 'ddate',cdepcode,cpersoncode,ccuscode,ccusname from crm_u8_DispatchList
+		select cVouchID as 'cdlcode',id as 'dlid'
+			 ,cstcode,convert(varchar(10),ddate,120) as 'ddate',cdepcode,cpersoncode,ccuscode,ccusname from crm_u8_DispatchList where issyu8 =0 or issyu8 is null
 	</select>
 	<select id="CrmIKSDOrderTHMin" resultMap="THMin">
 		select a.cwhcode,a.cinvcode,a.iquantity,a.iunitprice,a.itaxunitprice,a.imoney,
@@ -506,13 +505,13 @@
 			   a.cunitid
 		from  CRM_U8_DispatchItem a
 
-		where a.dlid=#{id}
+		where a.mid=#{id}
 	</select>
 	<select id="ISaleOrderList" resultType="net.chenlin.dp.modules.api.vo.ISaleOrder">
 		select id as 'closer', convert(varchar(10),ddate,120)  as 'date',csocode as 'code',ccuscode as 'custcode',cdepcode as 'deptcode',
 
 			(iTaxRate*100) as 'taxrate', cmaker as 'maker',ccusname as 'cusname'
-		from CRM_U8_SO_SOMain
+		from CRM_U8_SO_SOMain where issyu8 =0 or issyu8 is null
 	</select>
 	<select id="ISaleOrderMin" resultType="net.chenlin.dp.modules.api.vo.ISaleOrderMin">
 
@@ -537,7 +536,7 @@
 	<select id="IDYDOrder" resultType="net.chenlin.dp.modules.api.vo.ISaleOrder">
 		select  id as 'closer',convert(varchar(10),ddate,120)  as 'date',csocode as 'code',ccuscode as 'custcode',cdepcode as 'deptcode',cpersoncode as 'personcode',
 				ccusoaddress as 'sendaddress',(itaxrate*100) as 'taxrate',cmemo as 'memo',cmaker as 'maker',ccusname as 'cusname'
-		from crm_u8_customentity4__c
+		from crm_u8_customentity4__c where issyu8 =0 or issyu8 is null
 	</select>
 	<select id="IDYDOrderMin" resultType="net.chenlin.dp.modules.api.vo.ISaleOrderMin">
 		select a.cinvname as 'inventoryname',a.cinvcode as'inventorycode',a.iquantity as 'quantity'

src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -422,29 +422,38 @@ public class SaleOrderService {
                     BigDecimal bigDecimal1=new BigDecimal("1");
                     BigDecimal add = bigDecimal.add(bigDecimal1);
                     String cid=i.getDlid();
-                    i.setPoid("71");
-                    i.setBreturnflag("0");
+                    i.setPoid("75");
+                    i.setBreturnflag("1");
                     i.setDlid(add.toString());
                     i.setCdlcode("XSFH"+add.toString());
                     DynamicDataSource.setDataSource("slave-data-source");
-                    saleOrderMapper.UAddSaleOderFTH(i);
-                    DynamicDataSource.setDataSource("");
-                    DynamicDataSource.setDataSource("last-data-source");
-                    List<SaleOrderFTHMin> saleOrderFTHMins = saleOrderMapper.CrmKSDOrderFHMin(cid);
+                    int i1 = saleOrderMapper.UAddSaleOderFTH(i);
                     DynamicDataSource.setDataSource("");
-                    if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
-                        for (SaleOrderFTHMin ls:saleOrderFTHMins){
-                            BigDecimal a=new BigDecimal(s);
-                            BigDecimal b=new BigDecimal("1");
-                            BigDecimal c = a.add(b);
-                            ls.setAutoid(c.toString());
-                            ls.setDlid(add.toString());
-                            s=c.toString();
-                        }
-                        DynamicDataSource.setDataSource("slave-data-source");
-                        saleOrderMapper.UAddSaleOrderFTHMin(saleOrderFTHMins);
+                    if (i1>0){
+                        DynamicDataSource.setDataSource("last-data-source");
+                        saleOrderMapper.UpdateKSDDKOrder(cid);
+                        DynamicDataSource.setDataSource("");
+
+                        DynamicDataSource.setDataSource("last-data-source");
+                        List<SaleOrderFTHMin> saleOrderFTHMins = saleOrderMapper.CrmKSDOrderFHMin(cid);
                         DynamicDataSource.setDataSource("");
+
+                        if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
+                            for (SaleOrderFTHMin ls:saleOrderFTHMins){
+                                BigDecimal a=new BigDecimal(s);
+                                BigDecimal b=new BigDecimal("1");
+                                BigDecimal c = a.add(b);
+                                ls.setAutoid(c.toString());
+                                ls.setDlid(add.toString());
+                                s=c.toString();
+                            }
+
+                            DynamicDataSource.setDataSource("slave-data-source");
+                            saleOrderMapper.UAddSaleOrderFTHMin(saleOrderFTHMins);
+                            DynamicDataSource.setDataSource("");
+                        }
                     }
+
                     id=add.toString();
 
                 }
@@ -601,24 +610,32 @@ public class SaleOrderService {
                     i.setDlid(add.toString());
                     i.setCdlcode("XSFH"+add.toString());
                     DynamicDataSource.setDataSource("slave-data-source");
-                    saleOrderMapper.UAddSaleOderFTH(i);
-                    DynamicDataSource.setDataSource("");
-                    DynamicDataSource.setDataSource("last-data-source");
-                    List<SaleOrderFTHMin> saleOrderFTHMins = saleOrderMapper.CrmKSOrderTHMinList(cid);
+                    int i1 = saleOrderMapper.UAddSaleOderFTH(i);
                     DynamicDataSource.setDataSource("");
-                    if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
-                        for (SaleOrderFTHMin ls:saleOrderFTHMins){
-                            BigDecimal a=new BigDecimal(s);
-                            BigDecimal b=new BigDecimal("1");
-                            BigDecimal c = a.add(b);
-                            ls.setAutoid(c.toString());
-                            ls.setDlid(add.toString());
-                            s=c.toString();
-                        }
-                        DynamicDataSource.setDataSource("slave-data-source");
-                        saleOrderMapper.UAddSaleOrderFTHMin(saleOrderFTHMins);
+                    if (i1>0){
+                        DynamicDataSource.setDataSource("last-data-source");
+                        saleOrderMapper.UpdateKSDTHOrder(cid);
+                        DynamicDataSource.setDataSource("");
+
+                        DynamicDataSource.setDataSource("last-data-source");
+                        List<SaleOrderFTHMin> saleOrderFTHMins = saleOrderMapper.CrmKSOrderTHMinList(cid);
                         DynamicDataSource.setDataSource("");
+                        if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
+                            for (SaleOrderFTHMin ls:saleOrderFTHMins){
+                                BigDecimal a=new BigDecimal(s);
+                                BigDecimal b=new BigDecimal("1");
+                                BigDecimal c = a.add(b);
+                                ls.setAutoid(c.toString());
+                                ls.setDlid(add.toString());
+                                s=c.toString();
+                            }
+                            DynamicDataSource.setDataSource("slave-data-source");
+                            saleOrderMapper.UAddSaleOrderFTHMin(saleOrderFTHMins);
+                            DynamicDataSource.setDataSource("");
+                        }
                     }
+
+
                     id=add.toString();
 
 
@@ -817,20 +834,20 @@ public class SaleOrderService {
     public void IKSDDKOrder() throws OpenAPIException {
         try {
             DynamicDataSource.setDataSource("last-data-source");
-            List<SaleOrderFH> saleOrderFHS = saleOrderMapper.CrmIKSDOrder();
+            List<SaleOrderTH> saleOrderFHS = saleOrderMapper.CrmIKSDOrder();
             if (saleOrderFHS!=null&&saleOrderFHS.size()>0){
-                for (SaleOrderFH i:saleOrderFHS){
+                for (SaleOrderTH i:saleOrderFHS){
                    // i.setCode("XSDD211010062");
-                    String id=i.getCloser();
-                    List<SaleOrderFHMin> saleOrderFHMins = saleOrderMapper.CrmIKSDOrderMin(i.getCloser());
+                    String id=i.getRemark();
+                    List<SaleOrderTHMin> saleOrderFHMins = saleOrderMapper.CrmIKSDOrderMin(i.getRemark());
 //                    for (SaleOrderFHMin s:saleOrderFHMins){
 //                        s.setSocode("XSDD211010076");
 //                        s.setWarehouse_code("01");
 //                        s.setBatch("20210818");
 //                    }
-                    i.setCloser("");
+                    i.setRemark("");
                     i.setEntry(saleOrderFHMins);
-                    String s = ConsignMentAdd(i);
+                    String s = ConsignTHAdd(i);
                     if (s.equals("0")){
                         saleOrderMapper.UpdateKSDDKOrder(id);
                     }
@@ -850,18 +867,19 @@ public class SaleOrderService {
     public void ISYDOrder() throws OpenAPIException {
         try {
             DynamicDataSource.setDataSource("last-data-source");
-            List<SaleOrderFH> saleOrderFHS = saleOrderMapper.CrmISYDOrder();
+            List<ISaleOrder> saleOrderFHS = saleOrderMapper.CrmISYDOrder();
             if (saleOrderFHS!=null&&saleOrderFHS.size()>0){
-                for (SaleOrderFH i:saleOrderFHS){
+                for (ISaleOrder i:saleOrderFHS){
                     String id=i.getCloser();
-                    List<SaleOrderFHMin> saleOrderFHMins = saleOrderMapper.CrmISYDOrderMin(i.getCloser());
+                    i.setTypecode("02");
+                    List<ISaleOrderMin> saleOrderFHMins = saleOrderMapper.CrmISYDOrderMin(i.getCloser());
 //                    for (SaleOrderFHMin s:saleOrderFHMins){
 //                        s.setWarehouse_code("01");
 //                        s.setBatch("20210818");
 //                    }
                     i.setCloser("");
                     i.setEntry(saleOrderFHMins);
-                    String s = ConsignMentAdd(i);
+                    String s = yonyouAddSaleOrder(i);
                     if (s.equals("0")){
                         saleOrderMapper.UpdateSYDOrder(id);
                     }
@@ -958,6 +976,8 @@ public class SaleOrderService {
         }
 
     }
+
+
     public static void main(String[] args) throws OpenAPIException {
         SaleOrderService service=new SaleOrderService();
         UserService service1=new UserService();