推送调整

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

@@ -573,12 +573,14 @@ public class SyPackingListFabricController implements Job {
 			 }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){
+				 	tailoring.setTimeStuta(3);
 					 errors.add(tailoring.getSaleInvoiceError());
+				 }else{
+				 	tailoring.setTimeStuta(2);
 				 }
 				 if(tailoring.getSaleInvoiceCode()!=null){
 					 if(!msgs.contains(tailoring.getSaleInvoiceCode())){
@@ -586,6 +588,7 @@ public class SyPackingListFabricController implements Job {
 					 }
 				 }
 			 }
+			 syPackingListFabricService.updateBatchById(listFabrics);
 			 codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
 			 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//失败信息
 			 if(errors.size()==0){

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

@@ -1834,22 +1834,9 @@ public class SyPackingListTailoringController implements Job {
 	 @AutoLog(value = "获取100个单据号")
 	 @ApiOperation(value="获取100个单据号", notes="获取100个单据号")
 	 @GetMapping(value = "/getDoc")
-	 public Result getOrderNumber(int num) {
+	 public Result getOrderNumber() {
 	 	Result result=new Result();
-	 	List<String> times=new ArrayList<>();
-	 	//获取100个单据号,
-		 int size=1;
-		 int num1=num;
-		 while (num1>=10){
-			 num1=num1/10;
-		 	size+=1;
-		 }
-	 	for (int i=1;i<=num;i++){
-			SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS");
-			String dateNo ="YCY"+sf.format(System.currentTimeMillis())+String.format("%0"+size+"d", i);
-			times.add(dateNo);
-		}
-	 	result.setResult(times);
+	 	syPackingListTailoringService.updateTimeStatus();
 		return result;
 	 }
 
@@ -2112,20 +2099,23 @@ public class SyPackingListTailoringController implements Job {
 					}
 				}
 			}
-			boolean bool= syPackingListTailoringService.updateBatchById(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());
+					 tailoring.setTimeStuta(3);
+				 }else{
+					 tailoring.setTimeStuta(2);
+				 }
+				 if(tailoring.getSaleInvoiceCode()!=null){
+					 if(!msgs.contains(tailoring.getSaleInvoiceCode())){
+						 msgs.add(tailoring.getSaleInvoiceCode());
+					 }
+				 }
+			 }
+			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){

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

@@ -53,7 +53,7 @@ public class PushJob implements Job {
         }
         if(orderIds.size()>0){
             updateWrapper.in("id",orderIds);
-            updateWrapper.set("time_Stuta","4");
+            updateWrapper.set("time_Stuta","5");
             syShippingOrderMapper.update(null,updateWrapper);
         }
         System.out.println("orderList.size\t"+orderList.size());

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

@@ -367,4 +367,5 @@
         where rdrecords01.autoid=#{value }
     </select>
 
+
 </mapper>

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

@@ -126,6 +126,7 @@
          a.total_Volume ,
          a.total_Price ,
          a.elements_Id ,
+         a.time_stuta ,
          b.ac_set_no,
          b.garment_Factory,
          b.hod,
@@ -355,7 +356,7 @@
     </select>
 
     <select id="getSoMainCode" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select cPersonCode,cDepCode,cBusType,cPayCode,cexch_name,iExchRate,cCusCode,cSOCode,cSTCode,cexch_name
+        select cPersonCode,cDepCode,cBusType,cPayCode,cexch_name,iExchRate,cCusCode,cSOCode,cSTCode,cexch_name,iTaxRate
         from SO_SOMain WHERE  cSOCode=
         (select top 1 cSOCode  from DispatchList where cDLCode
         in (select cbuscode from rdrecord32

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

@@ -2197,6 +2197,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"));//税率
 			if(!order.get("cexch_name").equals("人民币")){//不为人民币
 				SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
 				String dd = sf1.format(new Date());
@@ -2206,6 +2207,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 			JSONArray jsonArrays=new JSONArray();
 			List<Object> autoIds=new ArrayList<>();
+			//String iTaxRate=syPackingListTailoringItemMapper.getItaxRate(syPackingListTailoring.getRdrecord32Code());
 			for (SyPackingListTailoringItem item : listFabricItems){
 				JSONObject  jsonObject=new JSONObject();
 				jsonObject.put("IQUANTITY",item.getTotal());//净重
@@ -2234,11 +2236,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				//jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位
 				jsonObject.put("CDEFINE23",item.getDeclarationUnit());//报关单位
 				jsonObject.put("CDEFINE31",item.getDeclarationName());//存货名称
-				String iTaxRate=syPackingListFabricItemMapper.getItaxRate(item.getOmpoIdItem());
-				if(iTaxRate!=null){
-					jsonObject.put("iTaxRate",iTaxRate);//税率
-					jsonObject1.put("iTaxRate",iTaxRate);//税率
-				}
+				//if(iTaxRate!=null){
+				jsonObject.put("iTaxRate",order.get("iTaxRate"));//税率
+				//}
 				jsonObject.put("CWHCODE",syPackingListFabricItemMapper.getVencode(item.getSupplier()));//获取仓库编码
 				jsonArrays.add(jsonObject);
 			}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/vo/SyPackingListTailoringVo.java

@@ -164,4 +164,9 @@ public class SyPackingListTailoringVo {
 	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")
 	private Integer isReference;
 
+	/**定时状态*/
+	@Excel(name = "定时状态", width = 15)
+	@ApiModelProperty(value = "定时状态")
+	private Integer timeStuta;
+
 }