预装箱单导入调整

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

@@ -921,9 +921,11 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			for (SyPreAssembledPackingListItem item :main.getSyPreAssembledPackingListItemList()){
 				Map<String,String> map=new HashMap<>();
 				for (SyShippingDetailsItem detailsItem : syShippingDetailsItems){
-					if(((detailsItem.getCodingRules()==null||detailsItem.getCodingRules().length()<1)&&item.getWithCode().equals("默认配码规格"))
-					||detailsItem.getCodingRules().equals(item.getWithCode())){
-						map.put(detailsItem.getSize(),detailsItem.getId());
+					if (item.getGroupItemId().equals(detailsItem.getGroupId())){
+						if(((detailsItem.getCodingRules()==null||detailsItem.getCodingRules().length()<1)&&item.getWithCode().equals("默认配码规格"))
+								||detailsItem.getCodingRules().equals(item.getWithCode())){
+							map.put(detailsItem.getSize(),detailsItem.getId());
+						}
 					}
 				}
 				//System.out.println("size\t"+item.getSizeTables());默认配码规格
@@ -973,8 +975,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			}
 			total4=total2.add(total3);
 			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
-				//throw new JeecgBootException(name+"本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
+				throw new JeecgBootException(name+"本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
 			}
+			System.out.println(name+"的原单据数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；");
 			strs+=name+"的原单据数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
 		}
 		return strs;

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

@@ -1273,7 +1273,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					if (rate==null||rate.size()==0){
 						throw new JeecgBootException("该船期查询不到汇率,请检查日期是否填错");
 					}
-					map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
+					map5.put("IEXCHRATE",rate.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
 				}
 			}
 			System.out.println("map5\t"+map5);