1

src/main/java/net/chenlin/dp/modules/api/controller/PayrequestController.java

@@ -50,7 +50,7 @@ public class PayrequestController {
                     Object payrequest2 = payrequestService.createPayrequest(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), payrequest1,data);
                     if (payrequest2!=null &&!"".equals(payrequest2)){
                        // DynamicDataSource.setDataSource("slave-data-source");
-                        sysUserService.autoRIdByPayequest(payrequest,payrequest2.toString());
+                        sysUserService.autoRIdByPayequest(payrequest,"fksqdSy");
                     }
 
                 }

src/main/java/net/chenlin/dp/modules/api/controller/PurchaseOrderController.java

@@ -50,7 +50,7 @@ public class PurchaseOrderController {
                     Object purchaseOrder1 = purchaseOrderService.createPurchaseOrder(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), purchaseOrder,data);
                     if (purchaseOrder1!=null &&!"".equals(purchaseOrder1)){
                        // DynamicDataSource.setDataSource("slave-data-source");
-                        sysUserService.autoRIdByOrder(purchaseOrders,purchaseOrder1.toString());
+                        sysUserService.autoRIdByOrder(purchaseOrders,"cgddSy");
                     }
                 }
             }

src/main/java/net/chenlin/dp/modules/api/controller/SaleOrderController.java

@@ -53,7 +53,7 @@ public class SaleOrderController {
                     Object order = service.createOrder(processCode, Long.valueOf(agentid), userid, Long.valueOf(deptid), yonyouSaleOrder,data);
                     if (order!=null &&!order.equals("")){
                     //    DynamicDataSource.setDataSource("slave-data-source");
-                        sysUserService.autoRIdBySale(saleOrder,order.toString());
+                        sysUserService.autoRIdBySale(saleOrder,"xsddSy");
                     }
                 }
             }

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

@@ -104,7 +104,7 @@
 		values
 		<foreach collection ="list" item="saleOrderBJMins" index= "index" separator =",">
 		 (	#{saleOrderBJMins.ID},
-			#{saleOrderBJMins.AutoID},
+			NEXT VALUE FOR getSequence,
 			#{saleOrderBJMins.irowno},
 			#{saleOrderBJMins.cInvCode},
 			#{saleOrderBJMins.iQuantity},
@@ -287,7 +287,7 @@
      itax,isum,inatunitprice,inatmoney,inattax,inatsum,isosid, cinvname,itaxrate,citemcode,citem_class,citemname,
      citem_cname,iinvexchrate,cunitid,csocode,ccusinvcode,ccusinvname,cMemo)values
 		<foreach collection ="list" item="saleOrderFTHMins" index= "index" separator =",">
-		(	#{saleOrderFTHMins.autoid},
+		(	NEXT VALUE FOR getSequence,
 			#{saleOrderFTHMins.dlid},
 			#{saleOrderFTHMins.icorid},
 			'CRJ',

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

@@ -16,13 +16,16 @@ import net.chenlin.dp.common.openapi4j.service.ConsignmentService;
 import net.chenlin.dp.common.openapi4j.service.UserService;
 import net.chenlin.dp.common.openapi4j.util.PropUtil;
 import net.chenlin.dp.common.support.orm.db.DynamicDataSource;
+import net.chenlin.dp.common.utils.DateUtils;
 import net.chenlin.dp.common.utils.SpringContextUtils;
 import net.chenlin.dp.modules.api.controller.DingdingOpenInterface;
 import net.chenlin.dp.modules.api.dao.CustomerMapper;
 import net.chenlin.dp.modules.api.dao.SaleOrderMapper;
 import net.chenlin.dp.modules.api.vo.*;
+import net.chenlin.dp.modules.sys.dao.TestU8Mapper;
 import net.chenlin.dp.modules.sys.service.SysUserService;
 import net.chenlin.dp.modules.sys.service.impl.SysUserServiceImpl;
+import net.chenlin.dp.modules.sys.service.testU8Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
@@ -40,6 +43,11 @@ public class SaleOrderService {
 
     private  static  String getToaccount="";
 
+
+    private testU8Service testU8Service=SpringContextUtils.getBean("testU8Service",testU8Service.class);
+
+    //private TestU8Mapper testU8Mapper=SpringContextUtils.getBean("testU8Mapper",TestU8Mapper.class);
+
     /**
      * 新增销售订单接口
      * @param list
@@ -412,35 +420,40 @@ public class SaleOrderService {
      */
     public void CrmKSDDK(){
         try {
+            String codeClass="XSFH";
+            String yyMM = DateUtils.format(new Date(), "yyMM");
             DynamicDataSource.setDataSource("last-data-source");
             List<SaleOrderFTH> saleOrderFTHS = saleOrderMapper.CrmKSDOrderFHList();
             DynamicDataSource.setDataSource("");
-            DynamicDataSource.setDataSource("slave-data-source");
-            String id = saleOrderMapper.SaleOrderFTHMaxId();
-            String s = saleOrderMapper.CrmSaleOrderCode();
-            DynamicDataSource.setDataSource("");
-            if (s==null||s.equals("")){
-                s="10000";
-            }if (id==null||id.equals("")){
-                id="10000";
-            }
+
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
-                    BigDecimal bigDecimal=new BigDecimal(id);
-                    BigDecimal bigDecimal1=new BigDecimal("10");
-                    BigDecimal add = bigDecimal.add(bigDecimal1);
                     String cid=i.getDlid();
+                    DynamicDataSource.setDataSource("slave-data-source");
+                    String dlid=String.valueOf(testU8Service.callGetMaxCode("01"));
+                    DynamicDataSource.setDataSource("");
+                    String code="";
+                    i.setBreturnflag("1");
+                    if (dlid.length()==1){
+                        dlid="000"+dlid;
+                    }if (dlid.length()==2){
+                        dlid="00"+dlid;
+                    }if (dlid.length()==3){
+                        dlid="0"+dlid;
+                    }
+                    code=codeClass+yyMM+dlid;
+                    dlid=yyMM+dlid;
                     i.setPoid("75");
                     i.setBreturnflag("1");
-                    i.setDlid(add.toString());
-                    i.setCdlcode("XSFH"+add.toString());
+                    i.setDlid(dlid);
+                    i.setCdlcode(code);
                     DynamicDataSource.setDataSource("slave-data-source");
                     int i1 = saleOrderMapper.UAddSaleOderFTH(i);
                     DynamicDataSource.setDataSource("");
                     if (i1>0){
-                        DynamicDataSource.setDataSource("last-data-source");
-                        saleOrderMapper.UpdateKSDDKOrder(cid);
-                        DynamicDataSource.setDataSource("");
+//                        DynamicDataSource.setDataSource("last-data-source");
+//                        saleOrderMapper.UpdateKSDDKOrder(cid);
+//                        DynamicDataSource.setDataSource("");
 
                         DynamicDataSource.setDataSource("last-data-source");
                         List<SaleOrderFTHMin> saleOrderFTHMins = saleOrderMapper.CrmKSDOrderFHMin(cid);
@@ -448,12 +461,9 @@ public class SaleOrderService {
 
                         if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
                             for (SaleOrderFTHMin ls:saleOrderFTHMins){
-                                BigDecimal a=new BigDecimal(s);
-                                BigDecimal b=new BigDecimal("10");
-                                BigDecimal c = a.add(b);
-                                ls.setAutoid(c.toString());
-                                ls.setDlid(add.toString());
-                                s=c.toString();
+
+                                ls.setDlid(dlid);
+
                                     BigDecimal sum=new BigDecimal(ls.getIquantity());//数量
                                     BigDecimal dj=new BigDecimal(ls.getItaxunitprice());//含税单价
                                     String iUnitPrice=dj.toString();
@@ -496,8 +506,6 @@ public class SaleOrderService {
                         }
                     }
 
-                    id=add.toString();
-
                 }
             }
         }catch (Exception e){
@@ -573,42 +581,41 @@ public class SaleOrderService {
      */
     public void CrmSaleOrderBJ(){
         try {
+
+            String yyMM = DateUtils.format(new Date(), "yyMM");
             DynamicDataSource.setDataSource("last-data-source");
             List<SaleOrderBJ> saleOrderBJS = saleOrderMapper.SaleOrderBJList();
             DynamicDataSource.setDataSource("");
             DynamicDataSource.setDataSource("slave-data-source");
-            String s = saleOrderMapper.SaleOrderBJMaxId();
-            String st=saleOrderMapper.SaleOrderBJMinMaxId();
-            DynamicDataSource.setDataSource("");
-            if (s==null||s.equals("")){
-                s="10000";
-            }if (st==null||st.equals("")){
-                st="10000";
-            }
+
             if (saleOrderBJS!=null&&saleOrderBJS.size()>0){
                 for (SaleOrderBJ i:saleOrderBJS){
-                    BigDecimal a=new BigDecimal(s);
-                    BigDecimal b=new BigDecimal("10");
-                    BigDecimal add = a.add(b);
+                    DynamicDataSource.setDataSource("slave-data-source");
+                    String dlid=String.valueOf(testU8Service.callGetMaxCode("16"));
+                    DynamicDataSource.setDataSource("");
+                    String code="";
+                    if (dlid.length()==1){
+                        dlid="000"+dlid;
+                    }if (dlid.length()==2){
+                        dlid="00"+dlid;
+                    }if (dlid.length()==3){
+                        dlid="0"+dlid;
+                    }
+                    dlid=yyMM+dlid;
                      String cid=i.getID();
-                    i.setID(add.toString());
+                    i.setID(dlid);
                     DynamicDataSource.setDataSource("slave-data-source");
                     int sumt = saleOrderMapper.UInsertSaleOrderBJ(i);
                     DynamicDataSource.setDataSource("");
                     DynamicDataSource.setDataSource("last-data-source");
-                    if (sumt>0){
-                        saleOrderMapper.UpdateSaleOrderBJ(cid);
-                    }
+//                    if (sumt>0){
+//                        saleOrderMapper.UpdateSaleOrderBJ(cid);
+//                    }
                     List<SaleOrderBJMin> saleOrderBJMins = saleOrderMapper.selectCode(cid);
                     DynamicDataSource.setDataSource("");
                     if (saleOrderBJMins!=null&&saleOrderBJMins.size()>0){
                         for (SaleOrderBJMin t:saleOrderBJMins){
-                            BigDecimal a1=new BigDecimal(st);
-                            BigDecimal b1=new BigDecimal("10");
-                            BigDecimal add1 = a1.add(b1);
-                            t.setID(add.toString());
-                            t.setAutoID(add1.toString());
-                            st=add1.toString();
+                            t.setID(dlid);
                             BigDecimal sum=new BigDecimal(t.getiQuantity());//数量
                             BigDecimal dj=new BigDecimal(t.getiTaxUnitPrice());//单价
                             String iUnitPrice=dj.toString();
@@ -647,7 +654,7 @@ public class SaleOrderService {
                         saleOrderMapper.UInsertSaleOrderBJMin(saleOrderBJMins);
                         DynamicDataSource.setDataSource("");
                     }
-                    s=add.toString();
+
                 }
             }
         }catch (Exception e){
@@ -662,47 +669,46 @@ public class SaleOrderService {
      */
     public void CrmKSDTH(){
         try {
+            String codeClass="XSFH";
+            String yyMM = DateUtils.format(new Date(), "yyMM");
             DynamicDataSource.setDataSource("last-data-source");
             List<SaleOrderFTH> saleOrderFTHS = saleOrderMapper.CrmKSOrderTHList();
             DynamicDataSource.setDataSource("");
-            DynamicDataSource.setDataSource("slave-data-source");
-            String id = saleOrderMapper.SaleOrderFTHMaxId();
-            String s = saleOrderMapper.CrmSaleOrderCode();
-            DynamicDataSource.setDataSource("");
-            if (s==null||s.equals("")){
-                s="10000";
-            }if (id==null||id.equals("")){
-                id="10000";
-            }
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
-                    BigDecimal bigDecimal=new BigDecimal(id);
-                    BigDecimal bigDecimal1=new BigDecimal("10");
-                    BigDecimal add = bigDecimal.add(bigDecimal1);
                     String cid=i.getDlid();
+                    DynamicDataSource.setDataSource("slave-data-source");
+                    String dlid=String.valueOf(testU8Service.callGetMaxCode("01"));
+                    DynamicDataSource.setDataSource("");
+                    String code="";
+                    i.setBreturnflag("1");
+                    if (dlid.length()==1){
+                        dlid="000"+dlid;
+                    }if (dlid.length()==2){
+                        dlid="00"+dlid;
+                    }if (dlid.length()==3){
+                        dlid="0"+dlid;
+                    }
+                    code=codeClass+yyMM+dlid;
+                    dlid=yyMM+dlid;
                     i.setPoid("75");
                     i.setBreturnflag("1");
-                    i.setDlid(add.toString());
-                    i.setCdlcode("XSFH"+add.toString());
+                    i.setDlid(dlid);
+                    i.setCdlcode(code);
                     DynamicDataSource.setDataSource("slave-data-source");
                     int i1 = saleOrderMapper.UAddSaleOderFTH(i);
                     DynamicDataSource.setDataSource("");
                     if (i1>0){
-                        DynamicDataSource.setDataSource("last-data-source");
-                        saleOrderMapper.UpdateKSDTHOrder(cid);
-                        DynamicDataSource.setDataSource("");
+//                        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("10");
-                                BigDecimal c = a.add(b);
-                                ls.setAutoid(c.toString());
-                                ls.setDlid(add.toString());
-                                s=c.toString();
+                                ls.setDlid(dlid);
                                 BigDecimal sum=new BigDecimal(ls.getIquantity());//数量
                                 BigDecimal dj=new BigDecimal(ls.getItaxunitprice());//含税单价
                                 String iUnitPrice=dj.toString();
@@ -745,7 +751,7 @@ public class SaleOrderService {
                     }
 
 
-                    id=add.toString();
+
 
 
                 }
@@ -989,9 +995,9 @@ public class SaleOrderService {
                     i.setCloser("");
                     i.setEntry(saleOrderFHMins);
                     String s = yonyouAddSaleOrder(i);
-                    if (s.equals("0")){
-                        saleOrderMapper.UpdateSYDOrder(id);
-                    }
+//                    if (s.equals("0")){
+//                        saleOrderMapper.UpdateSYDOrder(id);
+//                    }
                 }
             }
             DynamicDataSource.setDataSource("");
@@ -1039,47 +1045,45 @@ public class SaleOrderService {
      */
     public void SaleOrderClass(){
         try {
+            String codeClass="XSFH";
+            String yyMM = DateUtils.format(new Date(), "yyMM");
             DynamicDataSource.setDataSource("last-data-source");
             List<SaleOrderFTH> saleOrderFTHS = saleOrderMapper.SaleOrderClass();
             DynamicDataSource.setDataSource("");
-            DynamicDataSource.setDataSource("slave-data-source");
-            String id = saleOrderMapper.SaleOrderFTHMaxId();
-            String s = saleOrderMapper.CrmSaleOrderCode();
-            DynamicDataSource.setDataSource("");
-            if (s==null||s.equals("")){
-                s="10000";
-            }if (id==null||id.equals("")){
-                id="10000";
-            }
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
-                    BigDecimal bigDecimal=new BigDecimal(id);
-                    BigDecimal bigDecimal1=new BigDecimal("10");
-                    BigDecimal add = bigDecimal.add(bigDecimal1);
+                    DynamicDataSource.setDataSource("slave-data-source");
+                    String dlid=String.valueOf(testU8Service.callGetMaxCode("01"));
+                    DynamicDataSource.setDataSource("");
+                    String code="";
                     String cid=i.getDlid();
                     i.setPoid("75");
                     i.setBreturnflag("1");
-                    i.setDlid(add.toString());
-                    i.setCdlcode("XSFH"+add.toString());
+                    if (dlid.length()==1){
+                        dlid="000"+dlid;
+                    }if (dlid.length()==2){
+                        dlid="00"+dlid;
+                    }if (dlid.length()==3){
+                        dlid="0"+dlid;
+                    }
+                    code=codeClass+yyMM+dlid;
+                    dlid=yyMM+dlid;
+                    i.setDlid(dlid);
+                    i.setCdlcode(code);
                     DynamicDataSource.setDataSource("slave-data-source");
                     int i1 = saleOrderMapper.UAddSaleOderFTH(i);
                     DynamicDataSource.setDataSource("");
                     if (i1>0){
-                        DynamicDataSource.setDataSource("last-data-source");
-                        saleOrderMapper.UpdateSaleOrder(cid);
-                        DynamicDataSource.setDataSource("");
+//                        DynamicDataSource.setDataSource("last-data-source");
+//                        saleOrderMapper.UpdateSaleOrder(cid);
+//                        DynamicDataSource.setDataSource("");
 
                         DynamicDataSource.setDataSource("last-data-source");
                         List<SaleOrderFTHMin> saleOrderFTHMins = saleOrderMapper.SaleOrderClassMin(cid);
                         DynamicDataSource.setDataSource("");
                         if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
                             for (SaleOrderFTHMin ls:saleOrderFTHMins){
-                                BigDecimal a=new BigDecimal(s);
-                                BigDecimal b=new BigDecimal("10");
-                                BigDecimal c = a.add(b);
-                                ls.setAutoid(c.toString());
-                                ls.setDlid(add.toString());
-                                s=c.toString();
+                                ls.setDlid(dlid);
                                 BigDecimal sum=new BigDecimal(ls.getIquantity());//数量
                                 BigDecimal dj=new BigDecimal(ls.getItaxunitprice());//含税单价
                                 String iUnitPrice=dj.toString();
@@ -1090,7 +1094,6 @@ public class SaleOrderService {
                                 if (!ls.getItaxrate().equals("0.00")&&!ls.getItaxrate().equals("0")){
                                     BigDecimal count=new BigDecimal("1");
                                     BigDecimal taxrater=new BigDecimal("100");
-                                    //BigDecimal iTaxUnitPrice=new BigDecimal(ls.getItaxunitprice());//含税单价
                                     BigDecimal iTaxRate=new BigDecimal(ls.getItaxrate());
                                     BigDecimal iTaxRates = iTaxRate.add(count);//税率
                                     BigDecimal divide =  dj.divide(iTaxRates, 8, BigDecimal.ROUND_DOWN);//无税单价
@@ -1122,7 +1125,6 @@ public class SaleOrderService {
                     }
 
 
-                    id=add.toString();
 
 
                 }
@@ -1150,9 +1152,9 @@ public class SaleOrderService {
                     i.setEntry(iSaleOrderMins);
                     i.setCloser("");
                     String s = yonyouAddSaleOrder(i);
-                    if (s.equals("0")){
-                        saleOrderMapper.UpdateSaleOrder(id);
-                    }
+//                    if (s.equals("0")){
+//                        saleOrderMapper.UpdateSaleOrder(id);
+//                    }
                 }
             }
             DynamicDataSource.setDataSource("");
@@ -1177,9 +1179,9 @@ public class SaleOrderService {
                     i.setEntry(iSaleOrderMins);
                     i.setCloser("");
                     String s = yonyouAddSaleOrder(i);
-                    if (s.equals("0")){
-                        saleOrderMapper.UpdateDYDOrder(id);
-                    }
+//                    if (s.equals("0")){
+//                        saleOrderMapper.UpdateDYDOrder(id);
+//                    }
                 }
             }
             DynamicDataSource.setDataSource("");

src/main/java/net/chenlin/dp/modules/sys/mapper/SysUserMapper.xml

@@ -118,7 +118,7 @@
 			u.user_id = #{value}
 	</select>
     <select id="querySaleOrderDate" resultType="java.lang.String">
-		select cSOCode  from SO_SOMain where  (iStatus='0' or iStatus is null) and cDefine10 is null
+		select cSOCode  from SO_SOMain where  (iStatus='0' or iStatus is null) and (cDefine10 is null or cDefine10!='xsddSy')
 	</select>
 
 	<update id="autoRIdBySale">
@@ -126,7 +126,7 @@
 	</update>
 
 	<select id="queryPurchaseOrderDate" resultType="java.lang.String">
-		select cPOID from PO_Pomain where  (iverifystateex='0' or iverifystateex is null) and cDefine10 is null
+		select cPOID from PO_Pomain where  (iverifystateex='0' or iverifystateex is null) and (cDefine10 is null or cDefine10!='cgddSy')
 	</select>
 
 	<update id="autoRIdByOrder">
@@ -134,7 +134,7 @@
 	</update>
 
 	<select id="queryPayrequestDate" resultType="java.lang.String">
-		select cVouchID from AP_ApplyPayVouch where cCheckMan is null  and cDefine10 is null
+		select cVouchID from AP_ApplyPayVouch where cCheckMan is null  and (cDefine10 is null or cDefine10!='fksqdSy')
 	</select>
 
 	<update id="autoRIdByPayequest">