调整推送单据

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

@@ -307,17 +307,36 @@ public class SyPackingListFabricController implements Job {
 	 @GetMapping(value = "/submit")
 	 public Result<SyPackingListFabric> submit(String id) {
 		 Result<SyPackingListFabric> result=new Result<>();
+		 result.setSuccess(false);
 		 if(oConvertUtils.isEmpty(id)){
-			 result.setSuccess(false);
 			 result.setMessage("id为空");
 			 return result;
 		 }
 		 SyPackingListFabric syPackingListFabric=syPackingListFabricService.getById(id);
+		 QueryWrapper queryWrapper=new QueryWrapper();
+		 queryWrapper.select("sum(net_Weight) net_Weight,sum(gross_Weight) grossWeight,rolls rolls");//获取净重合计、毛重、匹数合计
+		 queryWrapper.eq("sy_Packing_List_Fabric_Id",id);
+		 SyPackingListFabricItem fabricItem=syPackingListFabricItemService.getOne(queryWrapper);
 		 if (syPackingListFabric==null){
-			 result.setSuccess(false);
 			 result.setMessage("数据库未找到该信息");
 			 return result;
 		 }
+		 if(fabricItem==null){
+			 result.setMessage("数据库未找到子表信息");
+			 return result;
+		 }
+		 if(fabricItem.getNetWeight()==null||fabricItem.getNetWeight().doubleValue()==0){
+			 result.setMessage("净重未填或净重为0");
+			 return result;
+		 }
+		 if(fabricItem.getGrossWeight()==null||fabricItem.getGrossWeight().doubleValue()==0){
+			 result.setMessage("毛重未填或毛重为0");
+			 return result;
+		 }
+		 if(fabricItem.getNetWeight()==null||fabricItem.getNetWeight().doubleValue()==0){
+			 result.setMessage("匹数(箱数)未填或匹数(箱数)为0");
+			 return result;
+		 }
 		 syPackingListFabric.setStatus("1");
 		 syPackingListFabricService.updateById(syPackingListFabric);
 		 result.setSuccess(true);
@@ -337,19 +356,19 @@ public class SyPackingListFabricController implements Job {
 	 @GetMapping(value = "/submitBatch")
 	 public Result<SyPackingListFabric> submitBatch(@RequestParam(value = "ids",required = true)String[] ids) {
 		 Result<SyPackingListFabric> result=new Result<>();
-		 if(oConvertUtils.isEmpty(ids)){
-			 result.setSuccess(false);
-			 result.setMessage("请至少选中一条单据");
-			 return result;
-		 }
-		 boolean bool=syPackingListFabricService.submitBatch(ids);
-		 if (bool==false){
+		 try {
+			 if(oConvertUtils.isEmpty(ids)){
+				 result.setSuccess(false);
+				 result.setMessage("请至少选中一条单据");
+				 return result;
+			 }
+			 String message=syPackingListFabricService.submitBatch(ids);
+			 result.setSuccess(true);
+			 result.setMessage(message);
+		 }catch (Exception e){
 			 result.setSuccess(false);
-			 result.setMessage("数据库未找到信息");
-			 return result;
+			 result.setMessage("提交失败");
 		 }
-		 result.setSuccess(true);
-		 result.setMessage("成功提交");
 		 return result;
 	 }
 

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

@@ -69,7 +69,7 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 
 	String getU8Data();
 
-	boolean submitBatch(String[] ids);
+	String submitBatch(String[] ids);
 
 	String cancelSubmitBatch(String[] ids);
 

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

@@ -715,21 +715,35 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 */
 	@Override
 	@Transactional
-	public boolean submitBatch(String[] ids) {
-		boolean bool=false;
-		try{
-			for(String id:ids){
+	public String submitBatch(String[] ids) {
+		String message="";
+		int num=0;
+		for(String id:ids){
+			num++;
+			QueryWrapper queryWrapper=new QueryWrapper();
+			queryWrapper.select("sum(net_Weight) net_Weight,sum(gross_Weight) grossWeight,rolls rolls");//获取净重合计、毛重、匹数合计
+			queryWrapper.eq("sy_Packing_List_Fabric_Id",id);
+			SyPackingListFabricItem fabricItem=syPackingListFabricItemService.getOne(queryWrapper);
+			if(fabricItem.getNetWeight()==null||fabricItem.getNetWeight().doubleValue()==0){
+				 message+="第"+num+"条提交失败,净重未填或净重为0";
+			}
+			else if(fabricItem.getGrossWeight()==null||fabricItem.getGrossWeight().doubleValue()==0){
+				message+="第"+num+"条提交失败,毛重未填或毛重为0";
+			}
+			else if(fabricItem.getNetWeight()==null||fabricItem.getNetWeight().doubleValue()==0){
+				message+="第"+num+"条提交失败,匹数(箱数)未填或匹数(箱数)为0";
+			}
+			else{
 				SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.selectById(id);
 				syPackingListFabric.setStatus("1");//提交
 				syPackingListFabricMapper.updateById(syPackingListFabric);//修改
+				message+="第"+num+"条提交成功";
 			}
-			bool=true;
-		}catch (Exception e){
-			log.error(e.getMessage());
-			bool=false;
-		}finally {
-			return bool;
 		}
+		if(message.indexOf("失败")<0&&message.indexOf("成功")>0){
+			message="全部提交成功";
+		}
+		return message;
 	}
 
 	/**
@@ -1200,7 +1214,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		boolean ycIsPush=true;
 		if (main!=null){
 			Map<String, Order> mapSort=new HashMap<>();
-			String date2 = main.getLatestDateOfShipment2().substring(0,10);//装柜日期
+			String date2 = main.getTheFinalShippingDate().substring(0,10);//装柜日期
 			String createBy="进出口平台管理员";
 			String istc=main.getSyPackingListFabricItem().get(0).getIsTc();
 			if (istc!=null&&istc.equals("1")){
@@ -1735,24 +1749,24 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		String isSucceed=null;
 		//try{
 			if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null&&main.getIsSucceed().indexOf("-7-")>0&&ycIsPush){//印花
+				redisUtil.set("pushsno006", pushsno006);//材料出库单
 				JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
 				isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
-				redisUtil.set("pushsno006", pushsno006);//材料出库单
 				isSucceed(main,isSucceed);
 				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 			}
 			else if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()==null){
+				redisUtil.set("pushsno001", pushsno007);//印厂采购入库单
 				JSONArray resturn7 = InterfaceConnUtils.doPost(mapList7,"purchasein_import");//采购入库单
 				isSucceed=result(main,resturn7,"印厂采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"7");//采购入库单
-				redisUtil.set("pushsno001", pushsno007);//印厂采购入库单
 				pushsno001=org.jeecg.modules.system.util.oConvertUtils.addOne(pushsno001);
 				isSucceed(main,isSucceed);
 				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn7.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
+				redisUtil.set("pushsno006", pushsno006);//材料出库单
 				JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
 				isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//材料出库单
 				isSucceed(main,isSucceed);
-				redisUtil.set("pushsno006", pushsno006);//材料出库单
 				//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 			}
 //		}catch (Exception e){
@@ -1794,9 +1808,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						}
 						text(mapList5,mapt.get("ordertype")+"发票单");
 						if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
+							redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 							JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 							recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
-							redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 							recording(main,recording);
 							//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 							if(((Map) mapList.get(0)).get("CACCID").toString().equals("101")){
@@ -1808,9 +1822,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							return account+"账套推送成功!";
 						}
 						text(mapList3,"销售发货单");
+						redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 						JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 						recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
-						redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 						maps.get(account).put("code",resturn3.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 						String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
@@ -1838,9 +1852,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						}
 						text(mapList4,"销售出库单");
 						//return null;//提示报错测试数据
+						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");
 						recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
-						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						maps.get(account).put("code",resturn4.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 					case "4":
@@ -1867,18 +1881,18 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							}
 						}
 						text(mapList6,"销售发票单");
+						redisUtil.set("pushsno005", pushsno005);//采购委外入库单
 						JSONArray resturn6 = InterfaceConnUtils.doPost(mapList6,"saleinvoice_import");//销售发票单
 						recording=result(main,resturn6,"销售发票单",((Map) mapList.get(0)).get("CACCID").toString(),"5");//销售发票单
-						redisUtil.set("pushsno005", pushsno005);//采购委外入库单
 						recording(main,recording);
 				}
 				return account+"账套推送成功!";
 			}
 		}
 
+		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
 		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
 		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
-		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
 		recording(main,recording);
 		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
@@ -1905,9 +1919,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 		text(mapList5,mapt.get("ordertype")+"发票单");
 		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
+			redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 			JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 			recording=result(main,resturn5,mapt.get("ordertype")+"发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
-			redisUtil.set("pushsno002", pushsno002);//采购委外入库单
 			recording(main,recording);
 			//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn5.getJSONObject(0).get("U8ReceiptNo").toString()),"109");
 
@@ -1917,9 +1931,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		}
 
 		text(mapList3,"销售发货单");
+		redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 		JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 		recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
-		redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 		recording(main,recording);
 		String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
@@ -1947,9 +1961,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		}
 
 		text(mapList4,"销售出库单");
+		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 		recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
-		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		recording(main,recording);
 
 		JSONObject jsonObject4=resturn4.getJSONObject(0);//销售出库单
@@ -1977,9 +1991,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			}
 		}
 		text(mapList6,"销售发票单");
+		redisUtil.set("pushsno005", pushsno005);//采购委外入库单
 		JSONArray resturn6 = InterfaceConnUtils.doPost(mapList6,"saleinvoice_import");//销售发票单
 		recording=result(main,resturn6,"销售发票单",((Map) mapList.get(0)).get("CACCID").toString(),"5");//销售发票单
-		redisUtil.set("pushsno005", pushsno005);//采购委外入库单
 		recording(main,recording);
 		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn6.getJSONObject(0).get("U8ReceiptNo").toString()),"120");
 		return mapList.getJSONObject(0).get("CACCID").toString()+"账套推送成功!";

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

@@ -1375,7 +1375,7 @@ public class SyPackingListTailoringController implements Job {
 			 try {
 				 String message2="";
 				 String id=syPackingListTailorings.get(i).getId();
-				 SyPackingListTailoring main=syPackingListTailoringService.getById(id);
+				 SyPackingListTailoring main=syPackingListTailoringService.queryId(id);
 				 if(main.getIsReference()==0){
 					 message2="请先做托书再推送";
 				 }
@@ -1660,7 +1660,7 @@ public class SyPackingListTailoringController implements Job {
 				return result;
 			}
 			String message2="";
-			SyPackingListTailoring main=syPackingListTailoringService.getById(ids);
+			SyPackingListTailoring main=syPackingListTailoringService.queryId(ids);
 			if(main.getIsReference()==0){
 				result.setSuccess(false);
 				result.setMessage("请先做托书再推送");

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

@@ -1142,7 +1142,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			String createBy="进出口平台管理员";
 			//String createDate=main.getCreateTime().toString();
 			String createDate=main.getTheFinalShippingDate().substring(0,10);//转化日期类型
-			String date2 = main.getLatestDateOfShipment2().substring(0,10);//装柜日期
+			String date2 = main.getTheFinalShippingDate().substring(0,10);//装柜日期
 			JSONObject map=new JSONObject();//采购(委外)入库单
 			map.put("CVOUCHCODE", pushsno001);//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
@@ -1559,13 +1559,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 //						}
 					case "2":
 						text(mapList3,"销售发货单");
+						redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 						JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 						recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
 						maps.get(account).put("code",resturn3.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 						String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 						//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
-						redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 					case "3":
 						String consignmentName=maps.get(account).get("code");//获取销售发货单
 						List<Map<String,Object>> consignmentMaps= syPackingListTailoringMapper.getDispatchLists(consignmentName);
@@ -1586,9 +1586,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							}
 						}
 						text(mapList4,"销售出库单");
+						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 						recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
-						redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 						maps.get(account).put("code",resturn4.getJSONObject(0).get("U8ReceiptNo").toString());
 						recording(main,recording);
 //				 	case "4":
@@ -1619,9 +1619,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 		}
 
+		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
 		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
 		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
-		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
 		recording(main,recording);
 		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn1.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
@@ -1652,9 +1652,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 //		}
 
 		text(mapList3,"销售发货单");
+		redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 		JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 		recording=result(main,resturn3,"销售发货单",((Map) mapList.get(0)).get("CACCID").toString(),"3");//销售发货单
-		redisUtil.set("pushsno003", pushsno003);//采购委外入库单
 		recording(main,recording);
 		String u8ReceiptNo103= resturn3.getJSONObject(0).get("U8ReceiptNo").toString();
 		//this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(u8ReceiptNo103,"108");
@@ -1680,9 +1680,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 
 		text(mapList4,"销售出库单");
+		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//
 		recording=result(main,resturn4,"销售出库单",((Map) mapList.get(0)).get("CACCID").toString(),"4");//销售出库单
-		redisUtil.set("pushsno004", pushsno004);//采购委外入库单
 		recording(main,recording);
 
 		JSONObject jsonObject4=resturn4.getJSONObject(0);//销售出库单
@@ -1973,10 +1973,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			return "无可推送数据!";
 		}
 		String account=maps.get("account").toString();
-		Map<String,List<String>> customers=getSuppliers(codes);//key：供应商编码，value：出库单id
+		//Map<String,List<String>> customers=getSuppliers(codes,listTailorings);//key：供应商编码，value：出库单id
+		Map<String,List<String>> customers=getSuppliers(listTailorings);//key：供应商编码，value：出库单id
 		System.out.println(account+"采购customers\t"+customers);
 		if(account.equals("102")){
-			customers=getSuppliers2(codes);//key：供应商编码，value：出库单id
+			//customers=getSuppliers2(codes,listTailorings);//key：供应商编码，value：出库单id
+			customers=getSuppliers2(listTailorings);//key：供应商编码，value：出库单id
 		}
 		Map<String,List<SyPackingListTailoringItem>> listTailoringItemMaps=getListTailoringItemMaps(customers,listTailorings);//key：供应商编码，value：对应子表
 		Map<String,List<SyPackingListTailoring>> listTailoringMaps=getListTailoringMaps(customers,listTailorings);//key：供应商编码，value：对应主表
@@ -2425,45 +2427,84 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return mapLists;
 	}
 
+//	/**
+//	 * 采购发票
+//	 * @param codes,listTailorings
+//	 * @return
+//	 */
+//	public Map<String,List<String>> getSuppliers(List<String> codes,List<SyPackingListTailoring> listTailorings){
+//		List<Map<String,Object>> suppliers=syPackingListTailoringMapper.getSuppliers("rdrecord01",codes.toArray(new String[codes.size()]));
+//		Map<String,List<String>> mapLists=new HashMap<>();
+//		for (Map<String,Object> map : suppliers){
+//			if(mapLists.containsKey(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString())){
+//				mapLists.get(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString()).add(map.get("ccode").toString());
+//			}else{
+//				List<String> list=new ArrayList<>();
+//				list.add(map.get("ccode").toString());
+//				mapLists.put(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString(),list);
+//			}
+//		}
+//		System.out.println("mapLists\t"+mapLists);
+//		return mapLists;
+//	}
+
+
 	/**
 	 * 采购发票
-	 * @param codes
+	 * @param listTailorings
 	 * @return
 	 */
-	public Map<String,List<String>> getSuppliers(List<String> codes){
-		List<Map<String,Object>> suppliers=syPackingListTailoringMapper.getSuppliers("rdrecord01",codes.toArray(new String[codes.size()]));
+	public Map<String,List<String>> getSuppliers(List<SyPackingListTailoring> listTailorings){
 		Map<String,List<String>> mapLists=new HashMap<>();
-		for (Map<String,Object> map : suppliers){
-			if(mapLists.containsKey(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString())){
-				mapLists.get(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString()).add(map.get("ccode").toString());
+		for (SyPackingListTailoring tailoring : listTailorings){
+			if(mapLists.containsKey(tailoring.getSupplier()+"-"+tailoring.getSalesman1())){
+				mapLists.get(tailoring.getSupplier()+"-"+tailoring.getSalesman1()).add(tailoring.getRdrecord32Code());
 			}else{
 				List<String> list=new ArrayList<>();
-				list.add(map.get("ccode").toString());
-				mapLists.put(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString(),list);
+				list.add(tailoring.getRdrecord32Code());
+				mapLists.put(tailoring.getSupplier()+"-"+tailoring.getSalesman1(),list);
 			}
 		}
-		System.out.println("mapLists\t"+mapLists);
 		return mapLists;
 	}
 
+//	/**
+//	 * 采购发票
+//	 * @param codes,listTailorings
+//	 * @return
+//	 */
+//	public Map<String,List<String>> getSuppliers2(List<String> codes,List<SyPackingListTailoring> listTailorings){
+//		List<Map<String,Object>> suppliers=syPackingListTailoringMapper.getSuppliers("rdrecord01",codes.toArray(new String[codes.size()]));
+//		Map<String,List<String>> mapLists=new HashMap<>();
+//		for (Map<String,Object> map : suppliers){
+//			if(mapLists.containsKey(map.get("cVenCode").toString())){
+//				mapLists.get(map.get("cVenCode").toString()).add(map.get("ccode").toString());
+//			}else{
+//				List<String> list=new ArrayList<>();
+//				list.add(map.get("ccode").toString());
+//				mapLists.put(map.get("cVenCode").toString(),list);
+//			}
+//		}
+//		System.out.println("mapLists\t"+mapLists);
+//		return mapLists;
+//	}
+
 	/**
 	 * 采购发票
-	 * @param codes
+	 * @param listTailorings
 	 * @return
 	 */
-	public Map<String,List<String>> getSuppliers2(List<String> codes){
-		List<Map<String,Object>> suppliers=syPackingListTailoringMapper.getSuppliers("rdrecord01",codes.toArray(new String[codes.size()]));
+	public Map<String,List<String>> getSuppliers2(List<SyPackingListTailoring> listTailorings){
 		Map<String,List<String>> mapLists=new HashMap<>();
-		for (Map<String,Object> map : suppliers){
-			if(mapLists.containsKey(map.get("cVenCode").toString())){
-				mapLists.get(map.get("cVenCode").toString()).add(map.get("ccode").toString());
+		for (SyPackingListTailoring tailoring : listTailorings){
+			if(mapLists.containsKey(tailoring.getSupplier())){
+				mapLists.get(tailoring.getSupplier()).add(tailoring.getRdrecord32Code());
 			}else{
 				List<String> list=new ArrayList<>();
-				list.add(map.get("ccode").toString());
-				mapLists.put(map.get("cVenCode").toString(),list);
+				list.add(tailoring.getRdrecord32Code());
+				mapLists.put(tailoring.getSupplier(),list);
 			}
 		}
-		System.out.println("mapLists\t"+mapLists);
 		return mapLists;
 	}