导出调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -912,7 +912,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Override
 	public String excelTest(List<SyPreAssembledPackingList> mains) {
 		String strs="";
+		List<String> mainIds=new ArrayList<>();
 		for(SyPreAssembledPackingList main : mains){
+			mainIds.add(main.getSyDeclarationElementsId());
 			BigDecimal total1=new BigDecimal("0");
 			BigDecimal total2=new BigDecimal("0");
 			BigDecimal total3=new BigDecimal("0");
@@ -957,12 +959,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					//throw new JeecgBootException("该单据已被参照,请勿重复提交");
 				}
 			}
-			total4=total4.add(total2).add(total3);
+			total4=total2.add(total3);
 			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
-				//throw new JeecgBootException("本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
+				throw new JeecgBootException(name+"本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
 			}
 			strs+=name+"的原单据数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
 		}
+		System.out.println("出运明细子表mainIds\t"+mainIds);
 		return strs;
 	}
 

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

@@ -1359,6 +1359,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					}
 					String rateSplit[] = dd.split("-");
 					Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+					if (rate==null||rate.size()==0){
+						throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+					}
 					map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 				}
 			}
@@ -1626,6 +1629,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							}
 							String rateSplit[] = dd.split("-");
 							Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+							if (rate==null||rate.size()==0){
+								throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+							}
 							map6.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 						}
 					}
@@ -2569,6 +2575,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 				String rateSplit[] = dd.split("-");
 				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+				if (rate==null||rate.size()==0){
+					throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+				}
 				jsonObject1.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 			}
 			JSONArray jsonArrays=new JSONArray();

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

@@ -1049,7 +1049,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					//throw new JeecgBootException("该单据已被成衣参照！请勿重复操作");
 				}
 			}
-			total4=total4.add(total2).add(total3);
+			total4=total2.add(total3);
 			System.out.println("total4.doubleValue()\t"+total4.doubleValue());
 			System.out.println("total1.doubleValue()*1.9\t"+total1.doubleValue()*1.9);
 			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
@@ -1270,6 +1270,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					}
 					String rateSplit[] = dd.split("-");
 					Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+					if (rate==null||rate.size()==0){
+						throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+					}
 					map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 				}
 			}
@@ -1437,6 +1440,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							}
 							String rateSplit[] = dd.split("-");
 							Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+							if (rate==null||rate.size()==0){
+								throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+							}
 							map6.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 						}
 					}
@@ -2055,6 +2061,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}
 				String rateSplit[] = dd.split("-");
 				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+				if (rate==null||rate.size()==0){
+					throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+				}
 				jsonObject1.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 			}
 			JSONArray jsonArrays=new JSONArray();
@@ -2230,6 +2239,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}
 				String rateSplit[] = dd.split("-");
 				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+				if (rate==null||rate.size()==0){
+					throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
+				}
 				jsonObject1.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
 			}
 			JSONArray jsonArrays=new JSONArray();