推送状态调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrder.java

@@ -247,7 +247,7 @@ public class SyShippingOrder {
 	@Excel(name = "定时状态", width = 15)
 	@ApiModelProperty(value = "定时状态")
 	private Integer timeStuta;
-	
+
 	/**定时推送成功消息*/
 	@Excel(name = "定时推送成功消息", width = 15)
 	@ApiModelProperty(value = "定时推送成功消息")

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

@@ -526,68 +526,81 @@ public class SyPackingListFabricController implements Job {
 //			 result.setMessage("id为空");
 //			 return result;
 //		 }
-		 List<SyPackingListFabric> listFabrics=syPackingListFabricService.queryByList(id);
-		 if(listFabrics.size()==0){
-			 codeMaps.put("error","未在装箱单找到对应单据");//失败信息
-			 return "未在装箱单找到对应单据";
-		 }
-		 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listFabrics.get(0).getId());//获取一些日期信息
-		 for (SyPackingListFabric fabric : listFabrics){
-			 if (!fabric.getPushState().equals("1")&&!fabric.getPushState().equals("4")){
-			 	 codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
-				 return "需要装箱单全部推送成功，才能推送发票";
+		 String message="";
+		 try {
+
+			 List<SyPackingListFabric> listFabrics=syPackingListFabricService.queryByList(id);
+			 if(listFabrics.size()==0){
+				 codeMaps.put("error","未在装箱单找到对应单据");//失败信息
+				 return "未在装箱单找到对应单据";
 			 }
-			 fabric.setSaleInvoiceError("");
-			 //System.out.println("madate\t"+mapdate);
-			 if(mapdate!=null){
-				 if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null) {
-					 fabric.setTheFinalShippingDate(mapdate.get("e1").toString());
+			 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listFabrics.get(0).getId());//获取一些日期信息
+			 for (SyPackingListFabric fabric : listFabrics){
+				 if (!fabric.getPushState().equals("1")&&!fabric.getPushState().equals("4")){
+					 codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
+					 return "需要装箱单全部推送成功，才能推送发票";
 				 }
-				 if(mapdate.containsKey("e2")&&mapdate.get("e2")!=null){
-					 fabric.setTheFinalShippingDate2(mapdate.get("e2").toString());
+				 fabric.setSaleInvoiceError("");
+				 //System.out.println("madate\t"+mapdate);
+				 if(mapdate!=null){
+					 if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null) {
+						 fabric.setTheFinalShippingDate(mapdate.get("e1").toString());
+					 }
+					 if(mapdate.containsKey("e2")&&mapdate.get("e2")!=null){
+						 fabric.setTheFinalShippingDate2(mapdate.get("e2").toString());
+					 }
+					 if(mapdate.containsKey("e3")&&mapdate.get("e3")!=null){
+						 fabric.setLatestDateOfShipment2(mapdate.get("e3").toString());
+					 }
 				 }
-				 if(mapdate.containsKey("e3")&&mapdate.get("e3")!=null){
-					 fabric.setLatestDateOfShipment2(mapdate.get("e3").toString());
+				 List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.selectByMainId3(fabric.getId());//获取所有未删除的子表
+				 if(listFabricItems.size()>0){
+					 SyOrderData syOrderData=syOrderDataMapper.selectById(listFabricItems.get(0).getSyOrderDataId());//随机选中一条子表记录确定最终客户
+					 if(syOrderData!=null){
+						 fabric.setEndCustomer(syOrderData.getEndCustomer());
+					 }
+					 SyOrderDataItem dataItem=syOrderDataItemMapper.selectById(listFabricItems.get(0).getSyOrderDataItemId());//供应商全称
+					 if(dataItem!=null){
+						 fabric.setSupplierCode(dataItem.getSupplierCode());
+					 }
 				 }
+				 fabric.setSyPackingListFabricItem(listFabricItems);
+			/* List<SyPackingListFabricItem> fabricItemList=syPackingListFabricService.getList(fabric.getId());
+			 fabric.setSyPackingListFabricItem(fabricItemList);*/
 			 }
-			 List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.selectByMainId3(fabric.getId());//获取所有未删除的子表
-			 if(listFabricItems.size()>0){
-				 SyOrderData syOrderData=syOrderDataMapper.selectById(listFabricItems.get(0).getSyOrderDataId());//随机选中一条子表记录确定最终客户
-				 if(syOrderData!=null){
-					 fabric.setEndCustomer(syOrderData.getEndCustomer());
+			 try {
+				 message = syPackingListFabricService.pushInvoice(listFabrics);
+			 }catch (Exception e){
+				 e.printStackTrace();
+			 }
+			 syPackingListFabricService.updateBatchById(listFabrics);
+			 List<String> msgs=new ArrayList<>();
+			 List<String> errors=new ArrayList<>();
+			 for (SyPackingListFabric tailoring : listFabrics){
+				 if(tailoring.getSaleInvoiceError()!=null&&tailoring.getSaleInvoiceError().length()>1){
+					 errors.add(tailoring.getSaleInvoiceError());
 				 }
-				 SyOrderDataItem dataItem=syOrderDataItemMapper.selectById(listFabricItems.get(0).getSyOrderDataItemId());//供应商全称
-				 if(dataItem!=null){
-					 fabric.setSupplierCode(dataItem.getSupplierCode());
+				 if(tailoring.getSaleInvoiceCode()!=null){
+					 if(!msgs.contains(tailoring.getSaleInvoiceCode())){
+						 msgs.add(tailoring.getSaleInvoiceCode());
+					 }
 				 }
 			 }
-			 fabric.setSyPackingListFabricItem(listFabricItems);
-			/* List<SyPackingListFabricItem> fabricItemList=syPackingListFabricService.getList(fabric.getId());
-			 fabric.setSyPackingListFabricItem(fabricItemList);*/
-		 }
-		 String message="";
-		 try {
-			 message = syPackingListFabricService.pushInvoice(listFabrics);
-		 }catch (Exception e){
-		 	e.printStackTrace();
-		 }
-		 syPackingListFabricService.updateBatchById(listFabrics);
-		 List<String> msgs=new ArrayList<>();
-		 List<String> errors=new ArrayList<>();
-		 for (SyPackingListFabric tailoring : listFabrics){
-			 if(tailoring.getSaleInvoiceError()!=null&&tailoring.getSaleInvoiceError().length()>1){
-				 errors.add(tailoring.getSaleInvoiceError());
+			 codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
+			 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//失败信息
+			 if(errors.size()==0){
+				 codeMaps.put("time_Stuta",2);//成功
 			 }
-			 if(tailoring.getSaleInvoiceCode()!=null){
-				 if(!msgs.contains(tailoring.getSaleInvoiceCode())){
-					 msgs.add(tailoring.getSaleInvoiceCode());
-				 }
+		 }catch (Exception e){
+			 e.printStackTrace();
+			 String msg2= null;
+			 try {
+				 msg2 = getExceptionStr(e);
+			 } catch (IOException ex) {
+				 ex.printStackTrace();
 			 }
-		 }
-		 codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
-		 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//失败信息
-		 if(errors.size()==0){
-			 codeMaps.put("time_Stuta",2);//成功
+			 System.out.println("托书发票推送报错");
+			 log.info("托书发票推送报错\t"+msg2);
 		 }
 		 return message;
 		 //List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.queryByList(id);//获取托书下所有的主表信
@@ -1323,7 +1336,7 @@ public class SyPackingListFabricController implements Job {
 						 }
 					 }
 				 }
-				 System.out.println("message\t"+message);
+				 System.out.println("成衣message\t"+message);
 				 //if(message!=null&&message.length()>0&&(message.indexOf("接口")>-1||message.indexOf("账套")>-1)){
 				 if(message!=null&&message.length()>0&&message.indexOf("接口")>-1){
 					 main.setPushState("2");//推送失败！
@@ -1332,7 +1345,7 @@ public class SyPackingListFabricController implements Job {
 					 main.setPushState("1");//推送成功！
 					 main.setRecordingError("");
 				 }else{
-					 main.setPushState("2");//推送失败！
+					 main.setPushState("3");//推送失败！重新推送
 					 main.setRecordingError(message);
 				 }
 				 main.setRecordingStatus(2);
@@ -1341,6 +1354,7 @@ public class SyPackingListFabricController implements Job {
 				 e.printStackTrace();
 			 }
 		 }
+		 syPackingListTailoringService.updateTimeStatus();
 	 }
 
 
@@ -1635,7 +1649,7 @@ public class SyPackingListFabricController implements Job {
 				 main.setRecordingError("");
 				 result.setMessage(message);
 			 }else{
-				 main.setPushState("2");//推送失败！
+				 main.setPushState("3");//推送失败！重新推送
 				 result.setSuccess(false);
 				 result.setMessage(message);
 				 main.setRecordingError(message);
@@ -1648,6 +1662,7 @@ public class SyPackingListFabricController implements Job {
 			 result.setSuccess(false);
 			 result.error500("操作失败："+e.getMessage());
 		 }
+		 syPackingListTailoringService.updateTimeStatus();
 		 return result;
 	 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -246,6 +246,7 @@ public class SyPackingListFabric implements Serializable {
 	private String saleInvoiceError;
 
 
+
 	/**是否云工厂推送*/
 	//@TableField(exist = false)
 	@ApiModelProperty(value = "是否云工厂推送")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -200,4 +200,5 @@
         </foreach>
     </select>
 
+
 </mapper>

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

@@ -94,4 +94,5 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	List<SyPackingListFabric> queryByList(String id);
 
 	public void  updateQuantitys(Map<String,SyPackingListFabricItem> mapItems,List<String> ids);
+
 }

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

@@ -1499,7 +1499,7 @@ public class SyPackingListTailoringController implements Job {
 					 main.setPushState("1");//推送成功！
 					 main.setRecordingError("");
 				 }else{
-					 main.setPushState("2");//推送失败！
+					 main.setPushState("3");//推送失败！
 					 main.setRecordingError(message);
 				 }
 				 main.setRecordingStatus(0);
@@ -1516,6 +1516,7 @@ public class SyPackingListTailoringController implements Job {
 				 log.info("成衣批量推送报错\t"+msg2);
 			 }
 		 }
+		 syPackingListTailoringService.updateTimeStatus();
 	 }
 
 	 @AutoLog(value = "装箱单成衣批量推送u8")
@@ -1813,7 +1814,7 @@ public class SyPackingListTailoringController implements Job {
 				result.setSuccess(true);
 				result.setMessage(message);
 			}else{
-				main.setPushState("2");//推送失败！
+				main.setPushState("3");//推送失败！
 				main.setRecordingError(message);
 				result.setSuccess(false);
 				result.setMessage(message);
@@ -1826,6 +1827,7 @@ public class SyPackingListTailoringController implements Job {
 			result.setSuccess(false);
 			result.error500("操作失败："+e.getMessage());
 		}
+		 syPackingListTailoringService.updateTimeStatus();
 		 return result;
 	 }
 
@@ -2014,120 +2016,132 @@ public class SyPackingListTailoringController implements Job {
 	 @GetMapping(value = "/testPushInvoice")*/
 	 //public Result<List<SyPackingListTailoring>> pushInvoice(@RequestParam(name="id",required=true) String id) {
 	 public String pushInvoice(@RequestParam(name="id",required=true) String id,Map<String,Object> codeMaps) {
-		 List<SyPackingListTailoring> listTailorings=syPackingListTailoringService.queryByList(id);
-		 if(listTailorings.size()==0){
-		 	return "未在装箱单找到对应单据";
-		 }
-		 //List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.queryByList(id);//获取托书下所有的主表信
-		 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listTailorings.get(0).getId());//获取一些日期信息
-		 Map<String,List<SyPackingListTailoring>> listMap=new HashMap<>();
-		 Map<String,List<String>> listStrMap=new HashMap<>();
-		 for (SyPackingListTailoring tailoring : listTailorings){
-		 	 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) {
-					 tailoring.setTheFinalShippingDate(mapdate.get("e1").toString());
-				 }
-				 if(mapdate.containsKey("e2")&&mapdate.get("e2")!=null){
-					 tailoring.setTheFinalShippingDate2(mapdate.get("e2").toString());
-				 }
-				 if(mapdate.containsKey("e3")&&mapdate.get("e3")!=null){
-					 tailoring.setLatestDateOfShipment2(mapdate.get("e3").toString());
-				 }
+		 String messages="";
+	 	 try {
+			 List<SyPackingListTailoring> listTailorings=syPackingListTailoringService.queryByList(id);
+			 if(listTailorings.size()==0){
+			 	return "未在装箱单找到对应单据";
 			 }
-			 List<SyPackingListTailoringItem> tailoringItemList=syPackingListTailoringService.getList(tailoring.getId());
-			 if(tailoring.getIsTc()!=null){
-			 	for (SyPackingListTailoringItem tailoringItem : tailoringItemList){
-			 		tailoringItem.setIsTc(tailoring.getIsTc());
+			 //List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.queryByList(id);//获取托书下所有的主表信
+			 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listTailorings.get(0).getId());//获取一些日期信息
+			 Map<String,List<SyPackingListTailoring>> listMap=new HashMap<>();
+			 Map<String,List<String>> listStrMap=new HashMap<>();
+			 for (SyPackingListTailoring tailoring : listTailorings){
+				if (!tailoring.getPushState().equals("1")&&!tailoring.getPushState().equals("4")){
+					codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
+					return "需要装箱单全部推送成功，才能推送发票";
 				}
-			 }
-			 SyOrderData syOrderData=syOrderDataMapper.selectById(tailoringItemList.get(0).getSyOrderDataId());//最终客户
-			 if(syOrderData!=null){
-				 tailoring.setEndCustomer(syOrderData.getEndCustomer());
-			 }
-			 tailoring.setSyPackingListTailoringItemList(tailoringItemList);
-			 if(listMap.containsKey(tailoring.getOmpoAccount())){
-			 	 listMap.get(tailoring.getOmpoAccount()).add(tailoring);
+				tailoring.setSaleInvoiceError("");
+				//System.out.println("madate\t"+mapdate);
+				if(mapdate!=null){
+					if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null) {
+						tailoring.setTheFinalShippingDate(mapdate.get("e1").toString());
+					}
+					if(mapdate.containsKey("e2")&&mapdate.get("e2")!=null){
+						tailoring.setTheFinalShippingDate2(mapdate.get("e2").toString());
+					}
+					if(mapdate.containsKey("e3")&&mapdate.get("e3")!=null){
+						tailoring.setLatestDateOfShipment2(mapdate.get("e3").toString());
+					}
+				}
+				List<SyPackingListTailoringItem> tailoringItemList=syPackingListTailoringService.getList(tailoring.getId());
+				if(tailoring.getIsTc()!=null){
+					for (SyPackingListTailoringItem tailoringItem : tailoringItemList){
+						tailoringItem.setIsTc(tailoring.getIsTc());
+					}
+				}
+				SyOrderData syOrderData=syOrderDataMapper.selectById(tailoringItemList.get(0).getSyOrderDataId());//最终客户
+				if(syOrderData!=null){
+					tailoring.setEndCustomer(syOrderData.getEndCustomer());
+				}
+				tailoring.setSyPackingListTailoringItemList(tailoringItemList);
+				if(listMap.containsKey(tailoring.getOmpoAccount())){
+					listMap.get(tailoring.getOmpoAccount()).add(tailoring);
 
-			 	 listStrMap.get(tailoring.getOmpoAccount()).add(tailoring.getId());
-			 }else{
-				 List<SyPackingListTailoring> listTailorings1=new ArrayList<>();
-				 listTailorings1.add(tailoring);
-				 listMap.put(tailoring.getOmpoAccount(),listTailorings1);
-				 List<String> stringList=new ArrayList<>();
-				 stringList.add(tailoring.getId());
-				 listStrMap.put(tailoring.getOmpoAccount(),stringList);
+					listStrMap.get(tailoring.getOmpoAccount()).add(tailoring.getId());
+				}else{
+					List<SyPackingListTailoring> listTailorings1=new ArrayList<>();
+					listTailorings1.add(tailoring);
+					listMap.put(tailoring.getOmpoAccount(),listTailorings1);
+					List<String> stringList=new ArrayList<>();
+					stringList.add(tailoring.getId());
+					listStrMap.put(tailoring.getOmpoAccount(),stringList);
+				}
 			 }
-		 }
-		 String message="";
-		 String messages="";
-		 for (String key : listMap.keySet()){
-			 Map<String,Object> maps=new HashMap<>();
-			 maps.put("account",key);//账套号
-			 maps.put("account1",key);//账套号
-			 for (int i=0;i<3;i++){
-			 	/*if(maps.get("account").equals("103")){
+			 String message="";
+			 for (String key : listMap.keySet()){
+				 Map<String,Object> maps=new HashMap<>();
+				 maps.put("account",key);//账套号
+				 maps.put("account1",key);//账套号
+				 for (int i=0;i<3;i++){
+			 	 /*if(maps.get("account").equals("103")){
 					message+=syPackingListTailoringService.pushInvoice3(listTailorings, maps);
 					message+=syPackingListTailoringService.pushInvoice6(listTailorings, maps);
-				}else if(maps.get("account").equals("102")){
+				 }else if(maps.get("account").equals("102")){
 					message+=syPackingListTailoringService.pushInvoice2(listTailorings, maps);
 					message+=syPackingListTailoringService.pushInvoice5(listTailorings, maps);
-				}else if(maps.get("account").equals("101")){
+				 }else if(maps.get("account").equals("101")){
 					message+=syPackingListTailoringService.pushInvoice1(listTailorings, maps);
 					message+=syPackingListTailoringService.pushInvoice6(listTailorings, maps);
-				}*/
-			 	try{
-					if(i==0){
-						maps.put("account","103");//账套号
-						message+=syPackingListTailoringService.pushInvoice3(listMap.get(key), maps);
-					}else if(i==1){
-						maps.put("account","102");//账套号
-						message+=syPackingListTailoringService.pushInvoice2(listMap.get(key), maps);
-					}else if(i==2){
-						maps.put("account","101");//账套号
-						message+=syPackingListTailoringService.pushInvoice1(listMap.get(key), maps);
+				 }*/
+					try{
+						if(i==0){
+							maps.put("account","103");//账套号
+							message+=syPackingListTailoringService.pushInvoice3(listMap.get(key), maps);
+						}else if(i==1){
+							maps.put("account","102");//账套号
+							message+=syPackingListTailoringService.pushInvoice2(listMap.get(key), maps);
+						}else if(i==2){
+							maps.put("account","101");//账套号
+							message+=syPackingListTailoringService.pushInvoice1(listMap.get(key), maps);
+						}
+					}catch (Exception e){
+						e.printStackTrace();
 					}
-				}catch (Exception e){
-			 		e.printStackTrace();
-				}
 
-				 try{
-					 if(i==0){
-						 message+=syPackingListTailoringService.pushInvoice6(listMap.get(key), maps);
-					 }else if(i==1){
-						 message+=syPackingListTailoringService.pushInvoice5(listMap.get(key), maps);
-					 }else if(i==2){
-						 message+=syPackingListTailoringService.pushInvoice4(listMap.get(key), maps);
-					 }
-				 }catch (Exception e){
-					 e.printStackTrace();
-				 }
-			 }
-		 }
-		 boolean bool= syPackingListTailoringService.updateBatchById(listTailorings);
-		 log.info("listTailorings\n"+listTailorings);
-		 List<String> msgs=new ArrayList<>();
-		 List<String> errors=new ArrayList<>();
-		 for (SyPackingListTailoring tailoring : listTailorings){
-			 if(tailoring.getSaleInvoiceError()!=null&&tailoring.getSaleInvoiceError().length()>1){
-				errors.add(tailoring.getSaleInvoiceError());
-			 }
-			 if(tailoring.getSaleInvoiceCode()!=null){
-			 	if(!msgs.contains(tailoring.getSaleInvoiceCode())){
-					msgs.add(tailoring.getSaleInvoiceCode());
+					try{
+						if(i==0){
+							message+=syPackingListTailoringService.pushInvoice6(listMap.get(key), maps);
+						}else if(i==1){
+							message+=syPackingListTailoringService.pushInvoice5(listMap.get(key), maps);
+						}else if(i==2){
+							message+=syPackingListTailoringService.pushInvoice4(listMap.get(key), maps);
+						}
+					}catch (Exception e){
+						e.printStackTrace();
+					}
 				}
+			}
+			boolean bool= syPackingListTailoringService.updateBatchById(listTailorings);
+			log.info("listTailorings\n"+listTailorings);
+			List<String> msgs=new ArrayList<>();
+			List<String> errors=new ArrayList<>();
+			for (SyPackingListTailoring tailoring : listTailorings){
+				if(tailoring.getSaleInvoiceError()!=null&&tailoring.getSaleInvoiceError().length()>1){
+					errors.add(tailoring.getSaleInvoiceError());
+				}
+				if(tailoring.getSaleInvoiceCode()!=null){
+					if(!msgs.contains(tailoring.getSaleInvoiceCode())){
+						msgs.add(tailoring.getSaleInvoiceCode());
+					}
+				}
+			}
+			codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
+			codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//成功
+			if(errors.size()==0){
+				codeMaps.put("time_Stuta",2);//成功
+			}
+		}catch (Exception e){
+			 e.printStackTrace();
+			 String msg2= null;
+			 try {
+				 msg2 = getExceptionStr(e);
+			 } catch (IOException ex) {
+				 ex.printStackTrace();
 			 }
-		 }
-		 codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
-		 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//成功
-		 if(errors.size()==0){
-			 codeMaps.put("time_Stuta",2);//成功
-		 }
-		 return messages;
+			 System.out.println("托书发票推送报错");
+			 log.info("托书发票推送报错\t"+msg2);
+		}
+	 	 return messages;
 	 }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/SyPackingListTailoringMapper.java

@@ -78,4 +78,6 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
 
     //获取供应商,区分来源
     public Map<String,Object> getSoMainCode(String id);
+
+    void updateTimeStatus();
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -363,4 +363,16 @@
          ) )
     </select>
 
+
+    <update id="updateTimeStatus" >
+        update sy_shipping_order set time_Stuta=1
+        where del_flag=0 and shipping_order_number not in
+        (select  shipping_order_number from sy_packing_list_fabric
+        where del_flag=0 and push_State!=1 and push_State!=4
+        and shipping_order_number is not null  union all
+        select  shipping_order_number from sy_packing_list_tailoring
+        where del_flag=0 and push_State!=1 and push_State!=4
+        and shipping_order_number is not null ) and time_Stuta=4
+    </update>
+
 </mapper>

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

@@ -143,4 +143,5 @@ public interface ISyPackingListTailoringService extends IService<SyPackingListTa
 
 	List<String> getRedisSno(int max);
 
+	void updateTimeStatus();
 }

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

@@ -2366,6 +2366,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return codes;
 	}
 
+	@Override
+	public void updateTimeStatus() {
+		syPackingListTailoringMapper.updateTimeStatus();
+	}
+
 
 	@Autowired
 	private SyPackingListFabricMapper syPackingListFabricMapper;