面辅料拉取调整

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

@@ -656,7 +656,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		List<SyPreAssembledPackingList> lists=new ArrayList<>();
 		List<SyPreAssembledPackingListItem> listItems=new ArrayList<>();
 
-		List<SyPreAssembledPackingList> lists2=new ArrayList<>();
+		//List<SyPreAssembledPackingList> lists2=new ArrayList<>();
 		//Map<String,>
 		List<String> ids=new ArrayList<>();
 		long startTime = System.currentTimeMillis();

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

@@ -1045,14 +1045,14 @@ public class SyPackingListFabricController {
 				 map.put("poid","one");//销售订单id
 				 for (int x=0;x<3;x++){//最多循环3次
 					 try {
-						 if (map.get("account").equals("103")){
-							 account="103";
+						 if (map.get("account").equals("903")){
+							 account="903";
 							 message+=syPackingListFabricService.three(main,map)+";";
-						 }else if(map.get("account").equals("102")){
-							 account="102";
+						 }else if(map.get("account").equals("902")){
+							 account="902";
 							 message+=syPackingListFabricService.two(main,map)+";";
-						 }else if(map.get("account").equals("101")){
-							 account="101";
+						 }else if(map.get("account").equals("901")){
+							 account="901";
 							 message+=syPackingListFabricService.one(main,map)+";";
 						 }else{
 						 	// 业务员，克重，包装方式，处理方式，是否手册纱，手册纱占比，尺码

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -177,12 +177,6 @@
 		and is_Pull is null
 		and del_flag=0
 		and submit_Status='1'
-		AND sy_order_data_item_id
-		NOT IN
-		(SELECT DISTINCT isosid
-		FROM `sy_packing_list_fabric_item`
-		WHERE isosid!='' and del_flag=0
-		 )
 </select>
 
 <!--

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

@@ -1079,11 +1079,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				map6.put("CDEFINE12",venName);//供应商(打印)全称
 			}
 
-			if(mapt.get("account").equals("101")){
+			if(mapt.get("account").equals("901")){
 				map5.put("CDEFINE4",main.getLatestDateOfShipment2());//最终船期
 			}
 
-			if(mapt.get("account").equals("103")){//查询委外订单主表数据	顺序---1
+			if(mapt.get("account").equals("903")){//查询委外订单主表数据	顺序---1
 				orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
 				map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
 				map.put("CGLTYPE","委外订单");//来源单据类型
@@ -1091,7 +1091,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				//map5.put("CGLTYPE","委外订单");//来源单据类型
 				map6.put("CGLTYPE","销售出库单");//来源单据类型
 			}else {//查询采购订单表数据
-				if(mapt.get("account1").equals("101")){
+				if(mapt.get("account1").equals("901")){
 					orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
 					map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
 					map.put("CGLTYPE","委外订单");//来源单据类型
@@ -1135,7 +1135,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			int num1=1;
 			Map<String,BigDecimal> bigDecimalMap=new HashMap<>();//k:委外采购订单id v:合计数量
 			Map<String,Boolean> booleanMap=new HashMap<>();
-			if(mapt.get("account").equals("101")){//101账套
+			if(mapt.get("account").equals("901")){//901账套
 				for (SyPackingListFabricItem item : main.getSyPackingListFabricItem()){
 					//System.out.println("inventoryCcode\t"+item.getInventoryCcode());
 					if(item.getInventoryCcode().indexOf("04")!=-1||item.getInventoryCcode().indexOf("03")!=-1){
@@ -1158,7 +1158,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 			}
 			for (SyPackingListFabricItem item : main.getSyPackingListFabricItem()){
-				if(mapt.get("account").equals("101")&&booleanMap.containsKey(item.getInventoryCode())){
+				if(mapt.get("account").equals("901")&&booleanMap.containsKey(item.getInventoryCode())){
 					System.out.println("inventoryCode\t"+item.getInventoryCode());
 					if(booleanMap.get(item.getInventoryCode())){//为true就退出循环
 						continue;
@@ -1180,7 +1180,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				map6.put("CACCID",mapt.get("account"));//账套号
 				map7.put("CACCID",mapt.get("account"));//账套号
 
-				if(mapt.get("account").equals("103")){
+				if(mapt.get("account").equals("903")){
 					mapItem.put("CBATCH",item.getDyelotNumber());//批号-缸号
 					mapItem4.put("CBATCH",item.getDyelotNumber());//批号-缸号
 				}else{
@@ -1193,7 +1193,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 				num1++;
 				Map<String,Object> orderDataItem=null;// inum
-				if(!mapt.get("account").equals("103")&&!mapt.get("account1").equals("101")){ //采购订单子表数据  顺序---2
+				if(!mapt.get("account").equals("903")&&!mapt.get("account1").equals("901")){ //采购订单子表数据  顺序---2
 					if(!mapt.containsKey("itemSort")){  //第一次进行循环
 						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
 					}else{
@@ -1235,7 +1235,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
 					mapItem.put("CBATCHPROPERTY3",item.getRolls());
 					//map5.put("CGLTYPE","委外订单");
-					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("040")>-1&&mapt.get("account").equals("103")){//103账套中物料分类为040的印花面料
+					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("040")>-1&&mapt.get("account").equals("903")){//903账套中物料分类为040的印花面料
 						List<Map<String,Object>> orderDataItem3 =syPackingListFabricMapper.getOM_MOMaterials(item.getOmpoIdItem(),item.getInventoryCode());//委外订单子表
 						Map<String,Object> mapStr1=syPackingListFabricMapper.getOM_MOMain(item.getOmpoIdItem(),item.getInventoryCode());//供应商编码，存货编码
 						//System.out.println("mapStr1\n"+mapStr1);
@@ -1314,9 +1314,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem3.put("SOAUTOIDCOL","ISOSID");//来源单据明细ID对应字段名(如果取销售订单主键，需传固定值ISOSID)
 					mapItem3.put("AUTOID_SO",orderDataItem2.get("iSOsID"));//来源单据明细ID
 					mapt.put("poid", orderDataItem2.get("id"));
-				}else if(mapt.get("account").equals("103")) {
+				}else if(mapt.get("account").equals("903")) {
 					throw new JeecgBootException(mapt.get("account")+"账套,委外订单子表行id"+mapItem.get("AUTOID_PO")+"的isosid为空");
-				}else if(mapt.get("account").equals("102")) {
+				}else if(mapt.get("account").equals("902")) {
 					throw new JeecgBootException(mapt.get("account")+"账套,委外订单子表行id"+mapItem.get("AUTOID_PO")+"的isosid为空");
 				}
 				//}
@@ -1370,7 +1370,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					mapItem6.put("IQUANTITY",item.getActualDeclaredQuantity());//数量
 				}
 
-				if(mapt.get("account").equals("101")&&(item.getInventoryCcode().indexOf("04")!=-1||item.getInventoryCcode().indexOf("03")!=-1)){
+				if(mapt.get("account").equals("901")&&(item.getInventoryCcode().indexOf("04")!=-1||item.getInventoryCcode().indexOf("03")!=-1)){
 					mapItem.put("IQUANTITY",bigDecimalMap.get(item.getInventoryCode()));//入库单数量
 					mapItem5.put("IQUANTITY",bigDecimalMap.get(item.getInventoryCode()));//采购单数量
 				}
@@ -1414,12 +1414,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			mapList5.add(map5);
 			map6.put("DETAILList",mapItems6);//明细集合
 			mapList6.add(map6);
-			if(mapt.get("customerCode").equals("T020001")&&!mapt.get("account").equals("101")){
-				mapt.put("account","101");//账套号
-			}else if(mapt.get("customerCode").equals("0001")&&!mapt.get("account").equals("102")){
-				mapt.put("account","102");//账套号
+			if(mapt.get("customerCode").equals("T020001")&&!mapt.get("account").equals("901")){
+				mapt.put("account","901");//账套号
+			}else if(mapt.get("customerCode").equals("0001")&&!mapt.get("account").equals("902")){
+				mapt.put("account","902");//账套号
 			}else{
-				mapt.put("account","104");//账套号
+				mapt.put("account","904");//账套号
 			}
 			mapt.put("itemSort",mapSort);
 			System.out.println("mapsort\n"+mapSort);
@@ -1480,17 +1480,17 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							}
 						}
 						text(mapList5,"采购发票单");
-						if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
+						if(!((Map) mapList.get(0)).get("CACCID").toString().equals("903")){
 							JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 							recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 							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")){
+							if(((Map) mapList.get(0)).get("CACCID").toString().equals("901")){
 								return account+"账套推送成功!";
 							}
 						}
 					case "2":
-						if(account.equals("101")){
+						if(account.equals("901")){
 							return account+"账套推送成功!";
 						}
 						text(mapList3,"销售发货单");
@@ -1576,14 +1576,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 		text(mapList3,"销售发货单");
 		text(mapList5,"采购发票单");
-		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("103")){
+		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("903")){
 			JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 			recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 			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")){
+		if(((Map) mapList.get(0)).get("CACCID").toString().equals("901")){
 			return mapList.getJSONObject(0).get("CACCID").toString()+"账套推送成功!";
 		}
 
@@ -1858,10 +1858,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					"or cWhCode='PT0005') "+//辅料
 					"and cCusCode='T020001'" ;//获取所有id
 			List<Map<String, Object>> listMain = new ArrayList<>();
-			if (account.equals("103")) {
-				listMain = senYuDataSourceThree.queryForList(sql);//103
+			if (account.equals("903")) {
+				listMain = senYuDataSourceThree.queryForList(sql);//903
 			} else {
-				listMain = senYuDataSourceTwo.queryForList(sql);//102
+				listMain = senYuDataSourceTwo.queryForList(sql);//902
 			}
 			if (listMain.size() == 0) {
 				continue;//退出本次循环
@@ -1938,10 +1938,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							"and cCusCode='T020001' and\n" +
 							" a.ID  = "+sy.getU8Id().substring(3,sy.getU8Id().length());//查询主表全部拉取
 					List<Map<String, Object>> list = new ArrayList<>();
-					if (account.equals("103")) {
-						list = senYuDataSourceThree.queryForList(sql2);//103
+					if (account.equals("903")) {
+						list = senYuDataSourceThree.queryForList(sql2);//903
 					} else {
-						list = senYuDataSourceTwo.queryForList(sql2);//102
+						list = senYuDataSourceTwo.queryForList(sql2);//902
 					}
 					List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
 					List<SyPackingListFabricItem> items=new ArrayList<>();

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

@@ -933,6 +933,7 @@ public class SyPackingListTailoringController {
 	 private void refreshSheet(Workbook workbook1) {
 		 //String load="C:\\Users\\admin\\Downloads\\装箱单测试.xls";
 		 //头表目前固定七个字段数据
+		 long startTime = System.currentTimeMillis();
 		 List<SyPackingListTailoring> mains=new ArrayList<>();
 		 Iterator sheets=workbook1.sheetIterator();
 		 int num=0;
@@ -996,7 +997,11 @@ public class SyPackingListTailoringController {
 			 main.setSyPackingListTailoringItemList(items);
 			 mains.add(main);
 		 }
+		 long endTime = System.currentTimeMillis();
+		 System.out.println("添加数据之前：" + (endTime - startTime) + "ms");
 		 syPackingListTailoringService.excelAdd(mains);//新增
+		 long endTime2 = System.currentTimeMillis();
+		 System.out.println("添加数据之后：" + (endTime2 - startTime) + "ms");
 	 }
 
 
@@ -1060,17 +1065,16 @@ public class SyPackingListTailoringController {
 								 sheet.getRow(3).getCell(i).getStringCellValue()+"未填值！");
 					 }*/
 					 cell.setCellType(CellType.STRING);//获取的都转换成String
-					 System.out.print(cell.getStringCellValue()+"\t");
 					 if(x==2&&i<12){
 						 strMain+=cell.getStringCellValue()+"！-！";
 						 continue;
 					 }else if(x==1){
 						 continue;
 					 }
-					 if(x==3&&i>6&&i<row.getLastCellNum()-8){
+					 if(x==3&&i>6&&i<row.getLastCellNum()-7){
 						 str2+=cell.getStringCellValue()+",";
 					 }
-					 if((i>6&&i<row.getLastCellNum()-8)||i==row.getLastCellNum()-1){
+					 if((i>6&&i<row.getLastCellNum()-7)||i==row.getLastCellNum()-1){
 						 str1+=cell.getStringCellValue()+",";
 					 }else{
 						 str+=cell.getStringCellValue()+",";
@@ -1083,9 +1087,7 @@ public class SyPackingListTailoringController {
 							 str2.substring(0,str2.length()-1).split(","));
 					 items.add(item);
 				 }else if(x==2){
-					 System.out.println("\nstrMain1\n"+strMain);
 					 main=new SyPackingListTailoring(strMain.substring(0,strMain.length()-3).split("！-！"));
-					 System.out.println("\nmain\n"+main);
 				 }
 			 }
 			 main.setSyPackingListTailoringItemList(items);
@@ -1373,11 +1375,11 @@ public class SyPackingListTailoringController {
 				map.put("poid","one");//销售订单id
 				for (int x=0;x<3;x++){//最多循环3次
 					try {
-						if (map.get("account").equals("103")){
+						if (map.get("account").equals("003")){
 							message+=syPackingListTailoringService.three(main,map);
-						}else if(map.get("account").equals("102")){
+						}else if(map.get("account").equals("902")){
 							message+=syPackingListTailoringService.two(main,map);
-						}else if(map.get("account").equals("101")){
+						}else if(map.get("account").equals("901")){
 							message+=syPackingListTailoringService.one(main,map);
 						}else{
 							break;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoringItem.java

@@ -17,6 +17,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -350,6 +351,9 @@ public class SyPackingListTailoringItem implements Serializable {
 			colour=params1[6];
 			unitPrice=new BigDecimal("0");//初始化
 			totalPrice=new BigDecimal("0");//初始化
+			System.out.println("params2\n"+ Arrays.asList(params2));
+			System.out.println("params3\n"+ Arrays.asList(params3));
+			System.out.println("params1[7]\t"+params1[7]);
 			outerBoxLength=new BigDecimal(params1[7]);
 			outerBoxWidth=new BigDecimal(params1[8]);
 			outerBoxHeight=new BigDecimal(params1[9]);

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

@@ -706,6 +706,141 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	@Transactional
 	public boolean excelAdd(List<SyPackingListTailoring> mains) {
 		boolean bool=true;
+		/*Date day=new Date();//当前日期
+		try {
+			String time= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis());
+			day =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(time);//获取制单日期
+		}catch (Exception e){
+
+		}
+		List<SyPackingListTailoring> lists=new ArrayList<>();
+		List<SyPackingListTailoringItem> listItems=new ArrayList<>();
+		List<String> ids=new ArrayList<>();
+		List<String> mainIds=new ArrayList<>();
+		long startTime = System.currentTimeMillis();
+		for (SyPackingListTailoring item : mains){
+			mainIds.add(item.getId());
+			List<SyPackingListTailoringItem> listItems2=item.getSyPackingListTailoringItemList();
+			for (SyPackingListTailoringItem listItem : listItems2){
+				for (SizeTable sizeTable : listItem.getSizeTables()){
+					ids.add(sizeTable.getItemId());
+				}
+			}
+		}
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.in("id",ids);
+		List<SyPreAssembledPackingListItem> syItems=syPreAssembledPackingListItemMapper.selectList(queryWrapper);//获取数据
+		Map<String,SyPreAssembledPackingListItem> mapItems=new HashMap<>();
+		for (SyPreAssembledPackingListItem item : syItems){
+			mapItems.put(item.getId(),item);
+		}
+		long endTime2 = System.currentTimeMillis();
+		System.out.println("批量查询时间：" + (endTime2 - startTime) + "ms");
+
+		UpdateWrapper updateWrapper=new UpdateWrapper();
+		updateWrapper.set("is_Reference","2");//已被装箱单参照,预装箱单不能取消提交
+		updateWrapper.in("id",mainIds);//预装箱单主表id做为修改条件
+		syPreAssembledPackingListMapper.update(null,updateWrapper);//修改
+
+		try{
+			for (SyPackingListTailoring syPackingListTailoring : mains){
+				syPackingListTailoring.setDelFlag("0");//删除状态默认为0
+				syPackingListTailoring.setPushState("0");//推送状态默认为0
+				syPackingListTailoring.setStatus("0");//单据状态默认为0
+				syPackingListTailoring.setDocumentNo(randomStr());//单据号
+				//syPackingListTailoringMapper.insert(syPackingListTailoring);//往主表添加数据
+				syPackingListTailoring.setTotal(new BigDecimal("0"));
+				syPackingListTailoring.setTotalBoxes(new BigDecimal("0"));
+				syPackingListTailoring.setTotalNetWeight(new BigDecimal("0"));
+				syPackingListTailoring.setTotalGrossWeight(new BigDecimal("0"));
+				syPackingListTailoring.setTotalVolume(new BigDecimal("0"));
+				syPackingListTailoring.setTotalPrice(new BigDecimal("0"));
+				for (SyPackingListTailoringItem item : syPackingListTailoring.getSyPackingListTailoringItemList()){
+					List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
+					item.setSyPackingListTailoringId(syPackingListTailoring.getId());//获取主表id
+					item.setElementsId(syPackingListTailoring.getElementsId());//申报要素id
+					BigDecimal boxNumber1=item.getBoxNumber();//获取箱数
+					item.setGroupId(oConvertUtils.id());//分组随机idv1
+					item.setDelFlag("0");//默认为未删除
+					if(item.getTotal()==null){
+						item.setTotal(new BigDecimal("0"));
+					}
+					syPackingListTailoring.setTotal(syPackingListTailoring.getTotal().add(item.getTotal()));
+					item.setSmallPo(syPackingListTailoring.getSmallPo());
+					item.setPoNo(syPackingListTailoring.getSmallPo());
+					item.setDistributionPoint(syPackingListTailoring.getDistributionPoint());
+					item.setStyleNo(syPackingListTailoring.getItemNumber());
+					item.setGarmentFactory(syPackingListTailoring.getGarmentFactory());
+					syPackingListTailoring.setTotalBoxes(syPackingListTailoring.getTotalBoxes().add(item.getBoxNumber()));
+					syPackingListTailoring.setTotalNetWeight(syPackingListTailoring.getTotalNetWeight().add(item.getTotalNetWeight()));
+					syPackingListTailoring.setTotalGrossWeight(syPackingListTailoring.getTotalGrossWeight().add(item.getTotalGrossWeight()));
+					syPackingListTailoring.setTotalVolume(syPackingListTailoring.getTotalVolume().add(item.getTotalVolume()));
+					for (SizeTable size : sizes){
+						if(size.getProportion()==null){
+							size.setProportion(0);
+						}
+						SyPackingListTailoringItem item1=item;
+						item1.setSize(size.getSize());//获取尺码信息
+						BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
+						item1.setTotal(boxNumber);//该尺码件数
+
+						item1.setPlanQuantity(boxNumber);//计划装箱数量
+						item1.setActualPackingQty(boxNumber);//实际装箱数量
+						item1.setPlanQuantity(boxNumber);//计划装箱数量
+						item1.setSyPreAssembledPackingListItemId(size.getItemId());//获取到预装箱单子表id
+						item1.setSort(size.getNum());//获取序号
+						item1.setId(oConvertUtils.id());//获取到随机id
+						SyPreAssembledPackingListItem syPreItem=mapItems.get(size.getItemId());//获取预装箱单数据
+						if(syPreItem!=null){
+							syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()));//新剩余数量=原剩余数量-装箱单新增数量
+							syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()).negate());//同上面,取相反值
+							item1.setUnitPrice(syPreItem.getUnitPrice());//获取单价
+							item1.setHod(new SimpleDateFormat("yyyy-MM-dd").parse(syPreItem.getHod()));//预发货日期
+							item1.setWithCode(syPreItem.getWithCode());
+							item1.setPackId(syPreItem.getPackId());
+							item1.setUnitPrice(syPreItem.getUnitPrice());//获取销售单价
+							if(item1.getFactoryUnitPrice()!=null){
+								item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价
+							}
+							item1.setInventoryName(syPreItem.getInventoryName());//存货名称
+							item1.setAcSetNo(syPreItem.getAcSetNo());//获取账套号
+							item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
+							item1.setOrderNumber(syPreItem.getOrderNumber());//获取订单号
+							item1.setSalesman(syPreItem.getSalesman());//获取业务员
+							item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取销售部门
+							item1.setInventoryCode(syPreItem.getInventoryCcode());//存货名称
+							item1.setSpurOrSubOrder(syPreItem.getSpurOrSubOrder());//获取采购委外订货号
+							item1.setOmpoId(syPreItem.getOmpoId());//主表id
+							item1.setOmpoIdItem(syPreItem.getOmpoIdItem());//子表id
+							item1.setOmpoAccount(syPreItem.getOmpoAccount());//子表id
+
+							item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据子表id
+							item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
+							*//*item1.setSupplier(syPreItem.getSupplier());
+							item1.setSupplierCode(syPreItem.getSupplierCode());*//*
+							//syPreAssembledPackingListItemMapper.updateById(syPreItem);//修改剩余数量
+						}
+						syPackingListTailoring.setTotalPrice(syPackingListTailoring.getTotalPrice().add(item1.getTotalPrice()));//获取总价
+						if(size.getProportion()==0){
+							item1.setTotal(null);//该尺码件数
+						}
+						//syPackingListTailoringItemMapper.insert(item1);//添加子表数据
+					}
+				}
+				SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectById(syPackingListTailoring.getSyPreAssembledPackingListId());
+				if(syPreAssembledPackingList!=null){
+					syPackingListTailoring.setCustomer(syPreAssembledPackingList.getCustomer());
+					syPackingListTailoring.setElementsId(syPreAssembledPackingList.getElementsId());
+					syPackingListTailoring.setOrderNumber(syPreAssembledPackingList.getOrderNumber());
+				}
+				//syPackingListTailoringMapper.updateById(syPackingListTailoring);//修改数据
+			}
+			bool=true;
+		}catch (Exception e){
+			e.printStackTrace();
+		}
+		return bool;
+*/
 		try{
 			for (SyPackingListTailoring syPackingListTailoring : mains){
 				syPackingListTailoring.setDelFlag("0");//删除状态默认为0
@@ -993,11 +1128,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				System.out.println("供应商全称\t"+venName);
 			}
 
-			if(mapt.get("account").equals("101")){
+			if(mapt.get("account").equals("901")){
 				map5.put("CDEFINE4",main.getLatestDateOfShipment2());//最终船期
 			}
 
-			if(mapt.get("account").equals("103")){//查询委外订单主表数据	顺序---1
+			if(mapt.get("account").equals("903")){//查询委外订单主表数据	顺序---1
 				orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
 				map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
 				map.put("CGLTYPE","委外订单");//来源单据类型
@@ -1005,7 +1140,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				map5.put("CGLTYPE","委外订单");//来源单据类型
 				map6.put("CGLTYPE","销售出库单");//来源单据类型
 			}else {//查询采购订单表数据
-				if(mapt.get("account1").equals("101")){
+				if(mapt.get("account1").equals("901")){
 					orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
 					map.put("CRDCODE","12");//入库类别（采购入库/委外入库）
 					map.put("CGLTYPE","委外订单");//来源单据类型
@@ -1063,7 +1198,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 
 				Map<String,Object> orderDataItem=null;// inum
-				if(!mapt.get("account").equals("103")&&!mapt.get("account1").equals("101")){ //采购订单子表数据  顺序---2
+				if(!mapt.get("account").equals("903")&&!mapt.get("account1").equals("901")){ //采购订单子表数据  顺序---2
 					System.out.println("mapt.get(\"orderNumber\")\n"+mapt.get("orderNumber"));
 					System.out.println("mapt.containsKey(\"itemSort\")\t"+mapt.containsKey("itemSort"));
 					System.out.println("item.getOmpoIdItem()\t"+item.getOmpoIdItem());
@@ -1212,12 +1347,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map6.put("DETAILList",mapItems6);//明细集合
 			mapList6.add(map6);
 
-			if(mapt.get("customerCode").equals("T020001")&&!mapt.get("account").equals("101")){
-				mapt.put("account","101");//账套号
-			}else if(mapt.get("customerCode").equals("0001")&&!mapt.get("account").equals("102")){
-				mapt.put("account","102");//账套号
+			if(mapt.get("customerCode").equals("T020001")&&!mapt.get("account").equals("901")){
+				mapt.put("account","901");//账套号
+			}else if(mapt.get("customerCode").equals("0001")&&!mapt.get("account").equals("902")){
+				mapt.put("account","902");//账套号
 			}else{
-				mapt.put("account","104");//账套号
+				mapt.put("account","904");//账套号
 			}
 			mapt.put("itemSort",mapSort);
 		}