1

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

@@ -44,6 +44,13 @@ public interface SaleOrderMapper extends BaseMapper<YonyouSaleOrder> {
 	 */
 	int UInsertSaleOrderBJMin(List<SaleOrderBJMin>saleOrderBJMins);
 
+	/**
+	 * 销售报价单主表标识
+	 * @param code
+	 * @return
+	 */
+	String SaleOrderBJID(@Param("code")String code);
+
 
 	/**
 	 * crm销售订单主表查询

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

@@ -80,7 +80,7 @@
 		VALUES (
 		        	'01',
 					'8048',
-				   #{ID},
+				   NEXT VALUE FOR getSequence,
 				   #{dDate},
 				   #{cCode},
 				   #{cCusCode},
@@ -555,6 +555,10 @@
 				  left join CRM_U8_SO_SOMain b on a.id=b.id
 				where a.id=#{id}
 	</select>
+	<select id="SaleOrderBJID" resultType="java.lang.String">
+		select id from SA_QuoMain where cCode=#{code}
+
+	</select>
 
 
 </mapper>

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

@@ -451,9 +451,9 @@ public class SaleOrderService {
                     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);
@@ -581,8 +581,6 @@ 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("");
@@ -590,32 +588,20 @@ public class SaleOrderService {
 
             if (saleOrderBJS!=null&&saleOrderBJS.size()>0){
                 for (SaleOrderBJ i:saleOrderBJS){
-                    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(dlid);
                     DynamicDataSource.setDataSource("slave-data-source");
                     int sumt = saleOrderMapper.UInsertSaleOrderBJ(i);
+                    String s = saleOrderMapper.SaleOrderBJID(i.getcCode());
                     DynamicDataSource.setDataSource("");
+
                     DynamicDataSource.setDataSource("last-data-source");
-//                    if (sumt>0){
-//                        saleOrderMapper.UpdateSaleOrderBJ(cid);
-//                    }
-                    List<SaleOrderBJMin> saleOrderBJMins = saleOrderMapper.selectCode(cid);
+                    if (sumt>0){
+                        saleOrderMapper.UpdateSaleOrderBJ(i.getID());
+                    }
+                    List<SaleOrderBJMin> saleOrderBJMins = saleOrderMapper.selectCode(i.getID());
                     DynamicDataSource.setDataSource("");
                     if (saleOrderBJMins!=null&&saleOrderBJMins.size()>0){
                         for (SaleOrderBJMin t:saleOrderBJMins){
-                            t.setID(dlid);
+                            t.setID(s);
                             BigDecimal sum=new BigDecimal(t.getiQuantity());//数量
                             BigDecimal dj=new BigDecimal(t.getiTaxUnitPrice());//单价
                             String iUnitPrice=dj.toString();
@@ -699,9 +685,9 @@ public class SaleOrderService {
                     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);
@@ -1074,9 +1060,9 @@ public class SaleOrderService {
                     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);
@@ -1152,9 +1138,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("");