面辅料拉取数据接口

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

@@ -680,7 +680,7 @@ public class SyPackingListFabricController {
 			 String load="D:\\单证模板\\面辅料.xlsx";
 			 int count = packingListFabrics.size();//分几条sheet
 			 File file=new File(load);
-			 TemplateExportParams templateExcelConstants=new TemplateExportParams(file.getAbsolutePath(),true,"预装箱单");
+			 TemplateExportParams templateExcelConstants=new TemplateExportParams(file.getAbsolutePath(),true,"面辅料");
 			 List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
 			 Map<Integer, List<Map<String, Object>>> maps = new HashMap<Integer, List<Map<String, Object>>>();
 			 for (int i = 1; i <=count ; i++) {
@@ -690,8 +690,6 @@ public class SyPackingListFabricController {
 				 Map<String, Object> map = new HashMap<String, Object>();
 				 map.put("entity", exportList2);//主表数据
 				 map.put("maps", exportList2.getSyPackingListFabricItem());//子表数据
-				 System.out.println(" map.get(maps)\t"+map.get("maps"));
-				 System.out.println(" map.get(maps).size()\t"+exportList2.getSyPackingListFabricItem().size());
 				 listMap.add(map);
 			 }
 			 maps.put(0,listMap);
@@ -700,14 +698,15 @@ public class SyPackingListFabricController {
 			 for(int i=0;i<packingListFabrics.size();i++){
 				 workbook.setSheetName(i,"面辅料"+(i+1));
 			 }
-			 // refreshSheet(workbook,temps);//配置某列数据
+			 //refreshSheet(workbook,temps);//配置某列数据
 			 ServletOutputStream outputStream = response.getOutputStream();
 			 workbook.write(outputStream);
 			 result.setCode(200);
-			 result.setResult(packingListFabrics.get(0));
+			// result.setResult(packingListFabrics.get(0));
 			 result.setMessage("导出成功！");
 			 result.setSuccess(true);
 		 }catch (Exception e){
+		 	e.printStackTrace();
 			 System.err.println("message\t"+e.getMessage());
 			 result.setResult(null);
 			 result.setMessage(e.getMessage());

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

@@ -1132,7 +1132,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			return null;
 		}
 		String isSucceed=null;
-		if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null){//印花
+		/*if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null){//印花
 			JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//采购入库单
 			isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//采购入库单
 			isSucceed(main,isSucceed);
@@ -1144,11 +1144,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn7.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 
 			JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//材料出库单
-			isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//采购入库单
+			isSucceed=result(main,restu rn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//采购入库单
 			isSucceed(main,isSucceed);
 			this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
 		}
-
+*/
 		String recording=null;
 		if(main.getRecording()!=null){
 			String[] recordings=main.getRecording().split(",");
@@ -1430,7 +1430,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		}
 		for (String account : maps.keySet()) {//分成两类数据
 			//先插主表数据，然后根据主表id查询子表数据再添加
-			String sql ="select     \n" +
+			String sql ="select  distinct   \n" +
 					"a.id u8Id,       \n" +
 					"f.ID as  fId, \n"+
 					"'1' as is_U8_Data,    \n" +
@@ -1524,7 +1524,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							"and (cWhCode='PT0004' "+//面料
 							"or cWhCode='PT0005') "+//辅料
 							"and cCusCode='T020001' and\n" +
-							" f.ID  = "+sy.getFId();//查询主表全部拉取
+							" a.ID  = "+sy.getU8Id().substring(3,sy.getU8Id().length());//查询主表全部拉取
 					List<Map<String, Object>> list = new ArrayList<>();
 					if (account.equals("903")) {
 						list = senYuDataSourceThree.queryForList(sql2);//903