预装箱单导入调整

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

@@ -765,8 +765,16 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		queryWrapper.in("shipping_Details_Id",ids);
 		List<SyShippingDetailsItem> syItems=syShippingDetailsItemMapper.selectList(queryWrapper);//获取数据
 		Map<String,SyShippingDetailsItem> mapItems=new HashMap<>();
+		Map<String,SyShippingDetailsItem> map=new HashMap<>();
+		for (SyShippingDetailsItem detailsItem : syItems){
+			if(detailsItem.getCodingRules()==null||detailsItem.getCodingRules().length()<1){
+				map.put(detailsItem.getGroupId()+"默认配码规格"+detailsItem.getSize(),detailsItem);
+			}else{
+				map.put(detailsItem.getGroupId()+detailsItem.getCodingRules()+detailsItem.getSize(),detailsItem);
+			}
+		}
 		for (SyShippingDetailsItem item : syItems){
-			mapItems.put(item.getGroupId()+item.getSize(),item);
+			mapItems.put(item.getId(),item);
 		}
 		long endTime2 = System.currentTimeMillis();
 		System.out.println("批量查询时间：" + (endTime2 - startTime) + "ms");
@@ -817,7 +825,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						if(size.getProportion()==null){
 							size.setProportion(0);
 						}
-						SyShippingDetailsItem syItem=mapItems.get(item.getGroupItemId()+size.getSize());
+						//SyShippingDetailsItem syItem=mapItems.get(map.get(item.getGroupItemId()+item.getWithCode()+size));
+						String str=item.getGroupItemId()+item.getWithCode()+size.getSize();
+						SyShippingDetailsItem syItem=map.get(str);
 						if(syItem==null){
 							continue;
 						}

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

@@ -1732,7 +1732,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			System.out.println("mapsort\n"+mapSort);
 		}
 
-		text(mapList,mapt.get("ordertype")+"入库单");
 		if(mapList2!=null&&mapList2.size()>0){
 			text(mapList2,"材料出库单");
 			text(mapList7,"染厂采购入库单");

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

@@ -1720,11 +1720,11 @@ public class SyPackingListTailoringController implements Job {
 					main.setEndCustomer(syOrderData.getEndCustomer());
 					//System.out.println("最终客户\t"+syOrderData.getEndCustomer());
 				}
-				if(syOrderData.getFlag()==1){
-					result.setSuccess(false);
-					result.setMessage("这是手工匹配订单不能推送");
-					message2="这是手工匹配订单不能推送";
-				}
+//				if(syOrderData.getFlag()==1){
+//					result.setSuccess(false);
+//					result.setMessage("这是手工匹配订单不能推送");
+//					message2="这是手工匹配订单不能推送";
+//				}
 				if(message2.length()>1){
 					main.setRecordingError(message2);//报错原因
 					main.setRecordingStatus(0);//改成未推送状态