面辅料导入

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

@@ -524,8 +524,10 @@ public class SyPackingListFabricController {
 					 List<String> itemStrs=new ArrayList<>();
 					 for (int i=0;i<row.getLastCellNum();i++){
 						 Cell cell=row.getCell(i);
-						 if(cell==null&&i<18&&i>15||cell.toString().length()<1&&i<18&&i>15){
-							throw new JeecgBootException("请填写第"+x+"行里的"+sheet.getRow(3).getCell(i));
+						 if(i<18&&i>14){
+							 if(cell==null||cell.equals("")||cell.toString().length()<1){
+								 throw new JeecgBootException("请填写第"+x+"行里的"+sheet.getRow(3).getCell(i));
+							 }
 						 }
 						 itemStrs.add(cell.toString());
 					 }

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

@@ -255,7 +255,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 	@Override
 	public List<SyPackingListFabric> selectByList(List<SyPackingListFabric> syPackingListFabrics) {
-		System.out.println("syPackingListFabrics数量\t"+syPackingListFabrics.size());
 		ArrayList arrayList=new ArrayList();
 		for (SyPackingListFabric item : syPackingListFabrics){
 			arrayList.add(item.getId());
@@ -274,8 +273,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		for (SyPackingListFabric syPackingListFabric :syPackingListFabrics){
 			syPackingListFabric.setSyPackingListFabricItem(maps.get(syPackingListFabric.getId()));
 		}
-		System.out.println("maps.size\t"+maps.size());
-		System.out.println("items数量\t"+items.size());
 		return syPackingListFabrics;
 	}
 
@@ -568,6 +565,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				//syPackingListFabric.setGarmentFactory(str);//成衣工厂
 				syPackingListFabric.setDocumentNo(dateNo);//单据号
 				syPackingListFabric.setStatus("0");//状态
+				syPackingListFabric.setPreparedBy("admin");//制单人
+				syPackingListFabric.setCreateBy("admin");//制单人
+				syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis())));
 				syPackingListFabric.setDelFlag("0");//是否删除
 				syPackingListFabricMapper.insert(syPackingListFabric);
 				List<SyPackingListFabricItem> items=syPackingListFabric.getSyPackingListFabricItem();
@@ -583,11 +583,13 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							(syShippingDetailsItem.getInventoryCode().indexOf("04")!=-1&&!syShippingDetailsItem.getInventoryCode().equals("0499"))){
 						if( item.getMasterMetering().equals("KG")){//当单位为KG时
 							item.setTotalPrice(item.getNetWeight().multiply(syShippingDetailsItem.getSalesUnitPrice()));//净重*单价
+							item.setActualDeclaredQuantity(item.getNetWeight());
 						}else if( item.getMasterMetering().equals("M")){
 							if(item.getMeter()==null){
 								throw new JeecgBootException("净重、门幅、克重之间有值为空,无法获取米数计算总价");
 							}
 							item.setTotalPrice(item.getMeter().multiply(syShippingDetailsItem.getSalesUnitPrice()));//米数*单价
+							item.setActualDeclaredQuantity(item.getMeter());
 						}
 					}
 					item.setInventoryCcode(syShippingDetailsItem.getInventoryCcode());//物料分类
@@ -596,6 +598,23 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					item.setOmpoIdItem(syShippingDetailsItem.getOmpoId());
 					item.setOmpoAccount(syShippingDetailsItem.getAccount());
 
+					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("04")>-1
+							&&!item.getInventoryCcode().equals("0499")){
+						//满足条件
+						item.setSupplierCodeDyeingPlant(syShippingDetailsItem.getRSupplierCode());//染厂编码
+						item.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂
+					}
+					if(item.getInventoryCcode()!=null&&item.getInventoryCcode().indexOf("03")>-1
+							&&!item.getInventoryCcode().equals("0399")){
+						//满足条件
+						item.setSupplierCodeDyeingPlant(syShippingDetailsItem.getSupplierCode());//染厂编码
+					}
+
+
+					item.setManualYarnUnitPrice(syShippingDetailsItem.getManualYarnUnitPrice());//手册纱单价
+					item.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比%
+					item.setInventoryName(syShippingDetailsItem.getInventoryName());//存货名称(辅料名称)
+					item.setComposition(syShippingDetailsItem.getInventoryName());//成分/Composition
 					item.setDelFlag("0");//是否删除
 					item.setSyPackingListFabricId(syPackingListFabric.getId());
 					syPackingListFabricItemMapper.insert(item);