推送调整

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

@@ -613,7 +613,7 @@ public class SyPackingListFabricController implements Job {
 			 }
 			 syPackingListFabricService.updateBatchById(listFabrics1);
 			 codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
-			 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//失败信息
+			 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//推送失败信息
 			 if(errors.size()==0){
 				 codeMaps.put("time_Stuta",2);//成功
 			 }

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

@@ -1436,7 +1436,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				Map<String,Object> orderDataItem=null;// inum
 				if(!mapt.get("account").equals("103")&&!mapt.get("account1").equals("101")){ //采购订单子表数据  顺序---2
 					if(!mapt.containsKey("itemSort")){  //第一次进行循环
-						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
+						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem2("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
 					}else{
 						if(orderData!=null&&orderData.containsKey("id")){
 							Order mapItem1=(Order)((Map<String,Order>)mapt.get("itemSort")).get((item.getId()));//获取订单号
@@ -1444,7 +1444,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 							Map<String,Object> orderData2=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapItem1.getOrderNumber()+"'","POID");//委外订单号判断 第一次
 
-							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData2.get("id")+"' and ivouchrowno='"+
+							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem2("PO_PoDetails", "poid='"+orderData2.get("id")+"' and ivouchrowno='"+
 									mapItem1.getIrowno()+"'","ID");//根据行号获取信息
 						}
 					}

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

@@ -1467,7 +1467,7 @@ public class SyPackingListTailoringController implements Job {
 					 }
 				 }
 				 System.out.println("message\t"+message);
-				 if(message!=null&&message.length()>0&&message.indexOf("接口")>-1){
+				 if(message!=null&&message.length()>0&&(message.indexOf("接口")>-1||message.indexOf("失败")>-1)){
 					 main.setPushState("2");//推送失败！
 					 main.setRecordingError(message);
 				 }else if(message.indexOf("成功")>-1){
@@ -1787,7 +1787,7 @@ public class SyPackingListTailoringController implements Job {
 					log.info("成衣推送报错error\t"+error);
 				}
 			}
-			if(message!=null&&message.length()>0&&message.indexOf("接口")>-1){
+			if(message!=null&&message.length()>0&&(message.indexOf("接口")>-1||message.indexOf("失败")>-1)){
 				main.setPushState("2");//推送失败！
 				result.setSuccess(false);
 				main.setRecordingError(message);
@@ -2119,7 +2119,7 @@ public class SyPackingListTailoringController implements Job {
 			syPackingListTailoringService.updateBatchById(listTailorings);
 			log.info("listTailorings\n"+listTailorings);
 			codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
-			codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//成功
+			codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//推送失败信息
 			if(errors.size()==0){
 				codeMaps.put("time_Stuta",2);//成功
 			}

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

@@ -43,6 +43,8 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
 
     //获取供应商,区分来源
     public Map<String,Object> getOmOrPoItem(@Param("tableName") String tableName, @Param("orderName") String orderName, @Param("id") String id);
+    //获取供应商,区分来源
+    public Map<String,Object> getOmOrPoItem2(@Param("tableName") String tableName, @Param("orderName") String orderName, @Param("id") String id);
 
     //获取供应商,区分来源
     public Map<String,Object> getSoMain(String id);

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

@@ -260,6 +260,10 @@
         select  iMoney,iNatUnitPrice, iTaxPrice ,iPerTaxRate ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice   from ${tableName} where  ${orderName}
     </select>
 
+    <select id="getOmOrPoItem2" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select  iMoney,iNatUnitPrice, iTaxPrice ,iPerTaxRate ,iNatMoney,iorderdid as iSOsID,${id} as id,inum,iUnitPrice   from ${tableName} where  ${orderName}
+    </select>
+
     <select id="getSoMain" parameterType="java.lang.String" resultType="java.util.HashMap">
         select cPersonCode,cDepCode,cBusType,cPayCode,cexch_name,iExchRate,cCusCode,cSOCode,cSTCode,cexch_name   from SO_SOMain WHERE id=#{id}
     </select>

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

@@ -1270,12 +1270,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					try {
 						dd = sf1.format(sf1.parse(main.getTheFinalShippingDate()));
 					}catch (Exception e){
-						throw new JeecgBootException("最终船期转换异常");
+						return "推送失败：最终船期转换异常";
 					}
 					String rateSplit[] = dd.split("-");
 					Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 					if (rate==null||rate.size()==0){
-						throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+						return  "推送失败：该船期查询不到汇率,请检查日期是否填错";
 					}
 					map5.put("IEXCHRATE",rate.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
 				}
@@ -1312,10 +1312,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					System.out.println("mapt.containsKey(\"itemSort\")\t"+mapt.containsKey("itemSort"));
 					System.out.println("item.getOmpoIdItem()\t"+item.getOmpoIdItem());*/
 					if(!mapt.containsKey("itemSort")){  //第一次进行循环
-						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
+						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem2("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
 					}else{
 						if(orderData!=null&&orderData.containsKey("id")){
-							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData.get("id")+"' and ivouchrowno='"+
+							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem2("PO_PoDetails", "poid='"+orderData.get("id")+"' and ivouchrowno='"+
 							((Map<String,String>)mapt.get("itemSort")).get(item.getId())+"'","ID");//根据行号获取信息
 						}
 					}
@@ -1378,9 +1378,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}*/
 				//if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据  顺序---5
 				if (orderDataItem==null){
-					throw new JeecgBootException(mapt.get("account")+"账套的"+mapt.get("ordertype")+"子表未获取到数据");
+					 return "推送失败："+mapt.get("account")+"账套的"+mapt.get("ordertype")+"子表未获取到数据";
 				}else if(orderDataItem.get("iSOsID")==null){
-					throw new JeecgBootException(mapt.get("account")+"的"+mapt.get("ordertype")+"子表的iSOsID为null");
+					return "推送失败："+mapt.get("account")+"的"+mapt.get("ordertype")+"子表的iSOsID为null";
 				}else{
 					Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
 					mapSort.put(item.getId(),orderDataItem2.get("irowno").toString());
@@ -1444,12 +1444,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							try {
 								dd = sf1.format(sf1.parse(main.getTheFinalShippingDate()));
 							}catch (Exception e){
-								throw new JeecgBootException("最终船期转换异常");
+								return  "推送失败：最终船期转换异常";
 							}
 							String rateSplit[] = dd.split("-");
 							Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 							if (rate==null||rate.size()==0){
-								throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+								return "推送失败：该船期查询不到汇率,请检查日期是否填错";
 							}
 							map6.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 						}