推送调整

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

@@ -113,7 +113,7 @@
 		and b.del_flag=0
 		${ew.customSqlSegment}
 		group by a.id
-		order by a.create_time desc
+		order by a.export_Invoice_No,a.garment_Factory,a.create_time desc
 	</select>
 
     <select id="queryMain2" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">

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

@@ -2101,7 +2101,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				continue;//退出本次循环
 			}
 			List<JSONObject> jsonObjects = JsonChangeUtils.toJSONObject(listMain);
-			System.out.println("主表长度\t"+jsonObjects.size());
+			//System.out.println("主表长度\t"+jsonObjects.size());
 			for (JSONObject json : jsonObjects) {//主表
 				try{
 					SyPackingListFabric sy = JSONObject.toJavaObject(json, SyPackingListFabric.class);
@@ -2181,7 +2181,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					}
 					List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
 					List<SyPackingListFabricItem> items=new ArrayList<>();
-					System.out.println("获取子表长度\t"+jianSon.size());
+					//System.out.println("获取子表长度\t"+jianSon.size());
 					for (JSONObject json1 : jianSon) {
 						SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
 						sy1.setU8Id(account + sy1.getU8Id());//获取账套号+子表id
@@ -2340,7 +2340,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			}
 		}
 		long endTime2 = System.currentTimeMillis();
-		System.out.println("删除时间：" + (endTime2 - startTime) + "ms");
+		System.out.println("自动拉取耗费时间：" + (endTime2 - startTime) + "ms");
 		return "成功添加了"+num+"条数据!";
 	}
 

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

@@ -1465,11 +1465,13 @@ public class SyPackingListTailoringController {
 				result.setMessage("请至少选中一条数据");
 				return result;
 			}
+			String message2="";
 			SyPackingListTailoring main=syPackingListTailoringService.getById(ids);
 			if(main.getIsReference()==0){
 				result.setSuccess(false);
 				result.setMessage("请先做托书再推送");
-				return result;
+				message2="请先做托书再推送";
+				//return result;
 			}
 			Map<String,Object> map=new HashMap<>();
 			Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(ids);
@@ -1478,14 +1480,16 @@ public class SyPackingListTailoringController {
 				if(!mapdate.containsKey("e4")||mapdate.get("e4").equals("0")){
 					result.setSuccess(false);
 					result.setMessage("请先提交托书再推送");
-					return result;
+					message2="请先提交托书再推送";
+					//return result;
 				}
 				if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null){
 					main.setTheFinalShippingDate(mapdate.get("e1").toString());
 				}else{
 					result.setSuccess(false);
 					result.setMessage("请先维护最终船期再推送");
-					return result;
+					message2="请先维护最终船期再推送";
+					//return result;
 				}
 				if(mapdate.containsKey("e2")&&mapdate.get("e2")!=null){
 					main.setTheFinalShippingDate2(mapdate.get("e2").toString());
@@ -1495,7 +1499,8 @@ public class SyPackingListTailoringController {
 				}else{
 					result.setSuccess(false);
 					result.setMessage("请先维护装运期限再推送");
-					return result;
+					message2="请先维护装运期限再推送";
+					//return result;
 				}
 			}
 
@@ -1523,6 +1528,13 @@ public class SyPackingListTailoringController {
 				if(syOrderData.getFlag()==1){
 					result.setSuccess(false);
 					result.setMessage("这是手工匹配订单不能推送");
+					message2="这是手工匹配订单不能推送";
+				}
+				if(message2.length()>1){
+					main.setRecordingError(message2);//报错原因
+					main.setRecordingStatus(0);//改成未推送状态
+					main.setPushState("2");//推送失败
+					syPackingListTailoringService.updateById(main);
 					return result;
 				}
 				if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){

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

@@ -243,7 +243,7 @@
     </select>
 
     <select id="getOmOrPoItem" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select  iMoney,iTaxPrice ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice    from ${tableName} where  ${orderName}
+        select  iMoney,iNatUnitPrice iTaxPrice ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice    from ${tableName} where  ${orderName}
     </select>
 
     <select id="getSoMain" parameterType="java.lang.String" resultType="java.util.HashMap">