推送调整

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

@@ -537,6 +537,7 @@ public class SyPackingListFabricController implements Job {
 			 	 codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
 				 return "需要装箱单全部推送成功，才能推送发票";
 			 }
+			 fabric.setSaleInvoiceError("");
 			 //System.out.println("madate\t"+mapdate);
 			 if(mapdate!=null){
 				 if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null) {

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

@@ -1957,11 +1957,11 @@ public class SyPackingListTailoringController implements Job {
 		 Map<String,List<SyPackingListTailoring>> listMap=new HashMap<>();
 		 Map<String,List<String>> listStrMap=new HashMap<>();
 		 for (SyPackingListTailoring tailoring : listTailorings){
-			 tailoring.setSaleInvoiceError(null);
 		 	 if (!tailoring.getPushState().equals("1")&&!tailoring.getPushState().equals("4")){
 				 codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
 		 		 return "需要装箱单全部推送成功，才能推送发票";
 			 }
+			 tailoring.setSaleInvoiceError("");
 			 //System.out.println("madate\t"+mapdate);
 			 if(mapdate!=null){
 				 if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null) {
@@ -2019,22 +2019,31 @@ public class SyPackingListTailoringController implements Job {
 					if(i==0){
 						maps.put("account","103");//账套号
 						message+=syPackingListTailoringService.pushInvoice3(listTailorings, maps);
-						message+=syPackingListTailoringService.pushInvoice6(listTailorings, maps);
 					}else if(i==1){
 						maps.put("account","102");//账套号
 						message+=syPackingListTailoringService.pushInvoice2(listTailorings, maps);
-						message+=syPackingListTailoringService.pushInvoice5(listTailorings, maps);
 					}else if(i==2){
 						maps.put("account","101");//账套号
 						message+=syPackingListTailoringService.pushInvoice1(listTailorings, maps);
-						message+=syPackingListTailoringService.pushInvoice4(listTailorings, maps);
 					}
 				}catch (Exception e){
 			 		e.printStackTrace();
 				}
+
+				 try{
+					 if(i==0){
+						 message+=syPackingListTailoringService.pushInvoice6(listTailorings, maps);
+					 }else if(i==1){
+						 message+=syPackingListTailoringService.pushInvoice5(listTailorings, maps);
+					 }else if(i==2){
+						 message+=syPackingListTailoringService.pushInvoice4(listTailorings, maps);
+					 }
+				 }catch (Exception e){
+					 e.printStackTrace();
+				 }
 			 }
 		 }
-		 boolean bool= syPackingListTailoringService.updateBatchById(listTailorings);
+		 //boolean bool= syPackingListTailoringService.updateBatchById(listTailorings);
 		 log.info("listTailorings\n"+listTailorings);
 		 List<String> msgs=new ArrayList<>();
 		 List<String> errors=new ArrayList<>();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/PushJob.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.splt.entity;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
 import org.jeecg.modules.splfi.controller.SyPackingListFabricController;
@@ -12,6 +13,7 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,12 +38,21 @@ public class PushJob implements Job {
         //queryWrapper.nested(i->i.eq("time_Stuta",1).or().eq("time_Stuta",3));//1、待推送，2、推送成功，3、推送失败
         queryWrapper.eq("time_Stuta","1");//待推送
         queryWrapper.eq("del_flag","0");
+        //queryWrapper.eq("id","c1429fecbedf49c6a8834957bae60595");
         //queryWrapper.eq("ready_Fabric","成衣");
         //queryWrapper.last("limit 2");
       //  queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().like("recording_Error","超时"))) ;//推送中
         //queryWrapper.ne("time_Stuta",2);
         //queryWrapper.last("limit 3");
+        UpdateWrapper updateWrapper=new UpdateWrapper();
         List<SyShippingOrder> orderList=syShippingOrderMapper.selectList(queryWrapper);
+        List<String> orderIds=new ArrayList<>();
+        for (SyShippingOrder order : orderList){
+            orderIds.add(order.getId());
+        }
+        updateWrapper.in("id",orderIds);
+        updateWrapper.set("time_Stuta","4");
+        syShippingOrderMapper.update(null,updateWrapper);
         System.out.println("orderList.size\t"+orderList.size());
         for (SyShippingOrder order : orderList){
             Map<String,Object> codeMaps=new HashMap<>();
@@ -54,13 +65,15 @@ public class PushJob implements Job {
                 syPackingListFabricController.pushInvoice(order.getId(),codeMaps);
             }
             order.setTimeStuta(Integer.parseInt(codeMaps.get("time_Stuta").toString()));
-            if(codeMaps.get("message").toString().length()>0){
-                order.setTimeMesage(codeMaps.get("message").toString());
+            if(codeMaps.get("message").toString().length()>2){
+                String names=codeMaps.get("message").toString();
+                order.setTimeMesage(names.substring(1,names.length()-1));
             }
-            if(codeMaps.get("error").toString().length()>0){
-                order.setFailMesage(codeMaps.get("error").toString());
+            if(codeMaps.get("error").toString().length()>2){
+                String names=codeMaps.get("error").toString();
+                order.setFailMesage(names.substring(1,names.length()-1));
             }
-            syShippingOrderMapper.updateById(order);
+            //syShippingOrderMapper.updateById(order);
             //codeMaps.put(order.getId(),message);
         }
         long endTime = System.currentTimeMillis();

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

@@ -1960,6 +1960,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 		String account=maps.get("account").toString();
 		Map<String,List<String>> customers=getSuppliers(codes);//key：供应商编码，value：出库单id
+		System.out.println(account+"采购customers\t"+customers);
 		if(account.equals("102")){
 			customers=getSuppliers2(codes);//key：供应商编码，value：出库单id
 		}
@@ -2115,13 +2116,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		if(codes.size()==0){
 			return "无可推送数据!";
 		}
+		String account=maps.get("account").toString();
 		Map<String,List<String>> customers=getCustomers(codes,listTailorings);//key：供应商编码，value：出库单id
+		System.out.println(account+"销售customers\t"+customers);
 		Map<String,List<SyPackingListTailoringItem>> listTailoringItemMaps=getListTailoringItemMaps(customers,listTailorings);//key：供应商编码，value：子表数据
 		Map<String,List<SyPackingListTailoring>> listTailoringMaps=getListTailoringMaps(customers,listTailorings);//key：供应商编码，value：主表数据
 		Map<String,List<SyPackingListTailoring>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
 		JSONArray jsonArrays1=new JSONArray();
 		String code=purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode");//发票号
-		String account=maps.get("account").toString();
 		for (String customer : customers.keySet()){
 			SyPackingListTailoring syPackingListTailoring=listTailoringMaps.get(customer).get(0);
 			List<SyPackingListTailoringItem> listFabricItems=listTailoringItemMaps.get(customer);
@@ -2351,6 +2353,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 		Map<String,List<String>> mapLists=new HashMap<>();
 		for (SyPackingListTailoring tailoring : listTailorings){
+			if(tailoring.getRdrecord32Code()==null){
+				continue;
+			}
 			if (mapLists.containsKey(tailoring.getSupplier()+tailoring.getSalesman1())){
 				mapLists.get(tailoring.getSupplier()+tailoring.getSalesman1()).add(tailoring.getRdrecord32Code());
 			}else{