计划单统计表调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -506,7 +506,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         System.out.println("国内加工单\t"+orderType+"\t面料含税成本美元\t"+syCostAllocation.getFabriccostIncludestaxUsd());
         System.out.println("fabriccostIncludestax集合\t"+fabriccostIncludestax);
         System.out.println("人民币\t"+signNumUS);
-        if(/*!orderType.equals("国外加工单")||*/ /*syCostAllocation.getFabriccostIncludestaxUsd()==null*/ fabriccostIncludestax!=null){
+        if(orderType.equals("国外加工单")&& /*syCostAllocation.getFabriccostIncludestaxUsd()==null*/ fabriccostIncludestax!=null){
             if(fabriccostIncludestax.size()!=0){
                 for(SyCostAllocation str : fabriccostIncludestax){
                     if (str.getExchangeRate().compareTo(str.getExchangeRate2())!=0){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/controller/SyCostLossReviewController.java

@@ -277,7 +277,8 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
                        c1.setCsubmitDate(c2.getCsubmitDate());
                        c1.setCfirstApproveDate(c2.getCfirstApproveDate());
                        c1.setCfinalApproveDate(c2.getCfinalApproveDate());
-                       c1.setCrejectDate(c2.getCrejectDate());
+//                       c1.setCrejectDate(c2.getCrejectDate());//frejectDate
+                       c1.setCrejectDate(c2.getFrejectDate());//frejectDate
                        c1.setCstatus(c2.getCstatus());
                        c1.setCbPlanMan(c2.getCbPlanMan());
                    }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -2424,7 +2424,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				jsonArrays1.forEach(j->{
 					JSONObject  jsonObject=(JSONObject)j;
 					JSONObject  jsonObject1=new JSONObject();
-					jsonObject1.put("CACCID","101");
+					jsonObject1.put("CACCID",account);
 					jsonObject1.put("CMAKER","进出口平台管理员");
 					jsonObject1.put("CVOUCHCODE_U8",jsonObject.get("CVOUCHCODE"));
 					jsonObject1.put("DDATE",jsonObject.get("DDATE"));
@@ -2475,6 +2475,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 //		if (account.equals("103")){
 //			return new ArrayList<>();
 //		}
+		System.out.println("账套号\t"+account);
 		Map<String,List<SyPackingListTailoring>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
 		for (SyPackingListTailoring packingListTailoring : listFabrics){
 			String code=packingListTailoring.getSaleInvoiceCode();
@@ -2489,9 +2490,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				cvenCode =syPackingListTailoringMapper.getCvenCode(account,documentNo);
 			}
 
-			if(code!=null&& (code.indexOf("101采购发票")>-1&&account.equals("101")&&(cvenCode.equals("T010001")||cvenCode.equals("T030001"))
-					||code.indexOf("102采购发票")>-1&&account.equals("102")&&cvenCode.equals("T020001")
-					||code.indexOf("101委外发票")>-1)&&account.equals("101")
+
+			if(code!=null&& ((code.indexOf("101采购发票")>-1&&account.equals("101")&&(cvenCode.equals("T010001")||cvenCode.equals("T030001")))
+					||(code.indexOf("102采购发票")>-1&&account.equals("102")&&cvenCode.equals("T020001"))
+					||(code.indexOf("101委外发票")>-1)&&account.equals("101"))
 					&&code.indexOf(account+"结算单")==-1){
 				String documentNo="";
 				if (code.indexOf(account+"委外发票")>-1){
@@ -2499,13 +2501,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}else{
 					documentNo=code.substring(code.indexOf(account+"采购发票单号")+9,code.indexOf(account+"采购发票单号")+20);
 				}
+				System.out.println("账套号  "+account+"  单据号  "+documentNo);
 				if (!ids.contains(documentNo)){
 					List<SyPackingListTailoring> fabricList=new ArrayList<>();
 					fabricList.add(packingListTailoring);
 					codeMaps.put(documentNo,fabricList);
 					ids.add(documentNo);
 					JSONObject  jsonObject1=new JSONObject();
-					jsonObject1.put("CACCID","101");
+					jsonObject1.put("CACCID",account);
 					jsonObject1.put("CMAKER","进出口平台管理员");
 					jsonObject1.put("CVOUCHCODE_U8",documentNo);
 					jsonObject1.put("DDATE",packingListTailoring.getTheFinalShippingDate().substring(0,10));
@@ -2517,6 +2520,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}
 			}
 		}
+		System.out.println("账套号  "+account+"  结算单JSON  "+jsonArrays2);
 		if (jsonArrays2.size()>0){
 			JSONArray resturnJsonArrays2 = InterfaceConnUtils.doPost(jsonArrays2,"purchasesettle_import");//结算单
 			Map<String,String> codeMaps3 = result(resturnJsonArrays2,"结算单","101");