托书推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -1598,7 +1598,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		 syShippingOrderService.updateById(entity);
 
 		 result.setResult("推送成功！");
-		 result.setSuccess(false);
+		 result.setSuccess(true);
 		 return result;
 	 }
 

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

@@ -2445,15 +2445,15 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			//List<SyPackingListFabricItem> listFabricItems=syPackingListFabric.getSyPackingListFabricItem();//需要进行分组
 			List<SyPackingListFabricItem> listFabricItems=listFabricItemMaps.get(customer);
 
-			String istc=syPackingListFabric.getSyPackingListFabricItem().get(0).getIsTc();
-			//String remarks="";
-			if (istc!=null&&istc.equals("1")){
-				if(syPackingListFabric.getRemarks()!=null){
-					syPackingListFabric.setRemarks(syPackingListFabric.getRemarks()+"TC证书");
-				}else{
-					syPackingListFabric.setRemarks("TC证书");
-				}
-			}
+//			String istc=syPackingListFabric.getSyPackingListFabricItem().get(0).getIsTc();
+//			//String remarks="";
+//			if (istc!=null&&istc.equals("1")){
+//				if(syPackingListFabric.getRemarks()!=null){
+//					syPackingListFabric.setRemarks(syPackingListFabric.getRemarks()+"TC证书");
+//				}else{
+//					syPackingListFabric.setRemarks("TC证书");
+//				}
+//			}
 			//System.out.println("codes.size\t"+codes.size());
 			System.out.println("codes\t"+codes);
 			List<Map<String,Object>> invoices=getInvoices(customers.get(customer));
@@ -2537,10 +2537,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						break;
 					}
 				}
-				if(bool){
-					//System.out.println("tid\t"+item.getId());
-					//System.out.println("tpid\t"+item.getSyPackingListFabricId());
-				}
+//				if(bool){
+//					System.out.println("tid\t"+item.getId());
+//					System.out.println("tpid\t"+item.getSyPackingListFabricId());
+//				}
 				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
 					jsonObject.put("CDEFINE23","千克");//报关单位
 				}else if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("M")){

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

@@ -1989,14 +1989,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			JSONObject  jsonObject1=new JSONObject();
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
 			codeMaps.put(code,listTailoringMaps.get(customer));
-			String istc=syPackingListTailoring.getIsTc();
-			if (istc!=null&&istc.equals("1")){
-				if(syPackingListTailoring.getMemo()!=null){
-					syPackingListTailoring.setMemo(syPackingListTailoring.getMemo()+"TC证书");
-				}else{
-					syPackingListTailoring.setMemo("TC证书");
-				}
-			}
+//			String istc=syPackingListTailoring.getIsTc();
+//			if (istc!=null&&istc.equals("1")){
+//				if(syPackingListTailoring.getMemo()!=null){
+//					syPackingListTailoring.setMemo(syPackingListTailoring.getMemo()+"TC证书");
+//				}else{
+//					syPackingListTailoring.setMemo("TC证书");
+//				}
+//			}
 			jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
 			jsonObject1.put("CVOUCHCODE",code);//发票号
 			jsonObject1.put("CMAKER","进出口平台管理员");//制单人
@@ -2129,14 +2129,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			List<Map<String,Object>> invoices=getInvoices(customers.get(customer));
 			JSONObject  jsonObject1=new JSONObject();
 
-			String istc=syPackingListTailoring.getIsTc();
-			if (istc!=null&&istc.equals("1")){
-				if(syPackingListTailoring.getMemo()!=null){
-					syPackingListTailoring.setMemo(syPackingListTailoring.getMemo()+"TC证书");
-				}else{
-					syPackingListTailoring.setMemo("TC证书");
-				}
-			}
+//			String istc=syPackingListTailoring.getIsTc();
+//			if (istc!=null&&istc.equals("1")){
+//				if(syPackingListTailoring.getMemo()!=null){
+//					syPackingListTailoring.setMemo(syPackingListTailoring.getMemo()+"TC证书");
+//				}else{
+//					syPackingListTailoring.setMemo("TC证书");
+//				}
+//			}
 			jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
 
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);