发票推送调整

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

@@ -2,13 +2,9 @@ package org.jeecg.modules.splfi.controller;
 
 import java.io.File;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.math.BigDecimal;
-import java.net.URLDecoder;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 import javax.servlet.ServletOutputStream;
@@ -23,12 +19,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.util.RedisUtil;
@@ -37,23 +29,10 @@ import org.jeecg.modules.documents.orderData.entity.SyOrderData;
 import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
 import org.jeecg.modules.documents.orderData.mapper.SyOrderDataItemMapper;
 import org.jeecg.modules.documents.orderData.mapper.SyOrderDataMapper;
-import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.documents.shippingDetails.mapper.SyShippingDetailsItemMapper;
-import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
-import org.jeecg.modules.openApi.entity.DxpDataPlan;
-import org.jeecg.modules.openApi.service.IDxpDataPlanService;
-import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
-import org.jeecg.modules.splfi.vo.SyPackingListFabricVo;
-import org.jeecg.modules.splt.entity.SyPackingListTailoring;
-import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
 import org.jeecg.modules.splt.service.ISyPackingListTailoringService;
 import org.jeecg.modules.system.controller.CommonController;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.mapper.SysUserMapper;
-import org.jeecg.modules.system.service.ISysDictItemService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -72,7 +51,6 @@ import org.quartz.JobExecutionException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.multipart.MultipartFile;
@@ -550,14 +528,15 @@ public class SyPackingListFabricController implements Job {
 //		 }
 		 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.getDocumentNo().indexOf("ML")>-1){
-				 System.out.println("需要装箱单全部推送成功，才能推送发票");
+			 if (!fabric.getPushState().equals("1")&&!fabric.getPushState().equals("4")){
+			 	 codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
 				 return "需要装箱单全部推送成功，才能推送发票";
-			 }*/
+			 }
 			 //System.out.println("madate\t"+mapdate);
 			 if(mapdate!=null){
 				 if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null) {
@@ -605,7 +584,7 @@ public class SyPackingListFabricController implements Job {
 			 }
 		 }
 		 codeMaps.put("message",msgs);//推送成功消息
-		 codeMaps.put("error",errors);//成功
+		 codeMaps.put("error",errors);//失败信息
 		 if(errors.size()==0){
 			 codeMaps.put("time_Stuta",2);//成功
 		 }

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

@@ -1958,7 +1958,8 @@ public class SyPackingListTailoringController implements Job {
 		 Map<String,List<String>> listStrMap=new HashMap<>();
 		 for (SyPackingListTailoring tailoring : listTailorings){
 			 tailoring.setSaleInvoiceError(null);
-		 	 if (!tailoring.getPushState().equals("1")){
+		 	 if (!tailoring.getPushState().equals("1")&&!tailoring.getPushState().equals("4")){
+				 codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
 		 		 return "需要装箱单全部推送成功，才能推送发票";
 			 }
 			 //System.out.println("madate\t"+mapdate);
@@ -1975,7 +1976,7 @@ public class SyPackingListTailoringController implements Job {
 			 }
 			 List<SyPackingListTailoringItem> tailoringItemList=syPackingListTailoringService.getList(tailoring.getId());
 			 if(tailoring.getIsTc()!=null){
-			 	for (SyPackingListTailoringItem tailoringItem : tailoring.getSyPackingListTailoringItemList()){
+			 	for (SyPackingListTailoringItem tailoringItem : tailoringItemList){
 			 		tailoringItem.setIsTc(tailoring.getIsTc());
 				}
 			 }

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

@@ -36,7 +36,6 @@ 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","17cdedf723b142b2bc95c0c49d9decce");
         //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","超时"))) ;//推送中
@@ -55,8 +54,12 @@ public class PushJob implements Job {
                 syPackingListFabricController.pushInvoice(order.getId(),codeMaps);
             }
             order.setTimeStuta(Integer.parseInt(codeMaps.get("time_Stuta").toString()));
-            order.setTimeMesage(codeMaps.get("message").toString());
-            order.setFailMesage(codeMaps.get("error").toString());
+            if(codeMaps.get("message").toString().length()>0){
+                order.setTimeMesage(codeMaps.get("message").toString());
+            }
+            if(codeMaps.get("error").toString().length()>0){
+                order.setFailMesage(codeMaps.get("error").toString());
+            }
             syShippingOrderMapper.updateById(order);
             //codeMaps.put(order.getId(),message);
         }