取消手工匹配

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.splfi.controller;
 import java.io.*;
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -256,11 +257,11 @@ public class SyPackingListFabricController implements Job {
 			ids.add(item.getSyOrderDataId());
 		}
 		Map<String,String> maps=orderNumber(ids);
-		if(maps.size()==2){
-			result.setSuccess(true);
-			result.setMessage("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单"));
-			return result;
-		}
+//		if(maps.size()==2){
+//			result.setSuccess(true);
+//			result.setMessage("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单"));
+//			return result;
+//		}
 		syPackingListFabricService.saveMain(syPackingListFabric,token);
 		result.setSuccess(false);
 		result.setMessage("添加成功");
@@ -458,11 +459,11 @@ public class SyPackingListFabricController implements Job {
 			ids.add(item.getSyOrderDataId());
 		}
 		Map<String,String> maps=orderNumber(ids);
-		if(maps.size()==2){
-			result.setSuccess(false);
-			result.setMessage("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单"));
-			return result;
-		}
+//		if(maps.size()==2){
+//			result.setSuccess(false);
+//			result.setMessage("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单"));
+//			return result;
+//		}
 		syPackingListFabricService.updateMain(syPackingListFabric, syPackingListFabric.getSyPackingListFabricItem());
 		result.setSuccess(true);
 		result.setMessage("编辑成功");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -886,9 +886,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					ids.add(item.getSyOrderDataId());
 				}
 				Map<String,String> maps2=orderNumber(ids);
-				if(maps2.size()==2){
-					throw new JeecgBootException("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单"));
-				}
+//				if(maps2.size()==2){
+//					throw new JeecgBootException("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单"));
+//				}
 				//syPackingListFabric.setGarmentFactory(str);//成衣工厂
 				syPackingListFabric.setDocumentNo(documentNos.get(num));//单据号
 				num++;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -1412,9 +1412,9 @@ public class SyPackingListTailoringController implements Job {
 					 if(syOrderData!=null){
 						 main.setEndCustomer(syOrderData.getEndCustomer());
 					 }
-					 if(syOrderData.getFlag()==1){
+					 /*if(syOrderData.getFlag()==1){
 						 message2="手工匹配订单不能推送";
-					 }
+					 }*/
 					 if(message2.length()>1){
 						 main.setRecordingError(message2);//报错原因
 						 main.setRecordingStatus(0);//改成未推送

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

@@ -1384,8 +1384,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					mapItem3.put("ITAXRATE",orderDataItem2.get("iTaxRate"));//税率（如果传空，取来源单据，无来源单据，取存货档案对应的销项税率）
 					mapItem3.put("SOAUTOIDCOL","ISOSID");//来源单据明细ID对应字段名(如果取销售订单主键，需传固定值ISOSID)
 					mapItem3.put("AUTOID_SO",orderDataItem2.get("iSOsID"));//来源单据明细ID
-					map6.put("iTaxRate",orderDataItem2.get("iTaxRate"));
-					mapItem6.put("iTaxRate",orderDataItem2.get("iTaxRate"));
+					map6.put("ITAXRATE",orderDataItem2.get("iTaxRate"));
+					mapItem6.put("ITAXRATE",orderDataItem2.get("iTaxRate"));
 					mapt.put("poid", orderDataItem2.get("id"));
 				}
 				//}
@@ -2253,7 +2253,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("SALETPYECODE",order.get("cSTCode"));//销售类型编码
 			jsonObject1.put("IEXCHRATE",order.get("iExchRate"));//汇率
 			jsonObject1.put("CEXCH_NAME",order.get("cexch_name"));//币种名称
-			jsonObject1.put("iTaxRate",order.get("iTaxRate"));//税率
+			jsonObject1.put("ITAXRATE",order.get("iTaxRate"));//税率
 			if(account.equals("103")){
 				//jsonObject1.put("iTaxRate","13");//税率
 			}
@@ -2316,7 +2316,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				//jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位
 				jsonObject.put("CDEFINE23",item.getDeclarationUnit());//报关单位
 				jsonObject.put("CDEFINE31",item.getDeclarationName());//存货名称
-				jsonObject.put("iTaxRate",order.get("iTaxRate"));//税率
+				jsonObject.put("ITAXRATE",order.get("iTaxRate"));//税率
 				//if(iTaxRate!=null){
 				//}
 				jsonObject.put("CWHCODE",syPackingListFabricItemMapper.getVencode(item.getSupplier()));//获取仓库编码