导入文件判断是否手册纱

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

@@ -776,7 +776,7 @@ public class SyPackingListFabricController {
 		}
 		SyPackingListFabric syPackingListFabric=syPackingListFabricService.getById(id);
 		if(syPackingListFabric!=null){
-			if(syPackingListFabric.getAccessory()!=null){
+			if(syPackingListFabric.getAccessory()!=null&&syPackingListFabric.getAccessory().length()>0){
 				syPackingListFabric.setAccessory(syPackingListFabric.getAccessory()+","+fileName);
 			}else{
 				syPackingListFabric.setAccessory(fileName);
@@ -818,7 +818,7 @@ public class SyPackingListFabricController {
 					 }
 					 syPackingListFabric.setAccessory(accessory.substring(0,accessory.length()-1));
 				 }else{
-					 syPackingListFabric.setAccessory(null);
+					 syPackingListFabric.setAccessory("");
 				 }
 				 syPackingListFabricService.updateById(syPackingListFabric);
 

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

@@ -536,6 +536,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					item.setGroupId(oConvertUtils.getId());
 					item.setPurOrSubOrder(syShippingDetailsItem.getPurOrSubOrder());//委外采购订单
 					item.setManualYarnUnitPrice(syShippingDetailsItem.getManualYarnUnitPrice());//手册纱单价
+					item.setManualYarnFlag(syShippingDetailsItem.getManualYarnFlag());//手册纱单价
 					item.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比%
 					item.setInventoryName(syShippingDetailsItem.getInventoryName());//存货名称(辅料名称)
 					item.setComposition(syShippingDetailsItem.getInventoryName());//成分/Composition

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

@@ -1340,7 +1340,7 @@ public class SyPackingListTailoringController {
 		 }
 		 SyPackingListTailoring syPackingListTailoring=syPackingListTailoringService.getById(id);
 		 if(syPackingListTailoring!=null){
-			 if(syPackingListTailoring.getAccessory()!=null){
+			 if(syPackingListTailoring.getAccessory()!=null&&syPackingListTailoring.getAccessory().length()>0){
 				 syPackingListTailoring.setAccessory(syPackingListTailoring.getAccessory()+","+fileName);
 			 }else{
 				 syPackingListTailoring.setAccessory(fileName);
@@ -1353,7 +1353,6 @@ public class SyPackingListTailoringController {
 		 return result;
 	 }
 
-
 	 @Value(value = "${jeecg.path.upload}")
 	 private String uploadpath;
 
@@ -1374,8 +1373,9 @@ public class SyPackingListTailoringController {
 		 if(syPackingListTailoring!=null){//当成衣不为空
 			 if(syPackingListTailoring.getAccessory()!=null){//
 				 List<String> accessorys=new ArrayList<>(Arrays.asList(syPackingListTailoring.getAccessory().split(",")));
+				 System.out.println("accessorys1\n"+accessorys);
 				 accessorys.remove(fileName);
-
+				 System.out.println("accessorys2\n"+accessorys);
 				 if(accessorys.size()>0){
 					 String accessory="";
 					 for (String acc : accessorys){
@@ -1383,7 +1383,7 @@ public class SyPackingListTailoringController {
 					 }
 					 syPackingListTailoring.setAccessory(accessory.substring(0,accessory.length()-1));
 				 }else{
-					 syPackingListTailoring.setAccessory(null);
+					 syPackingListTailoring.setAccessory("");
 				 }
 				 syPackingListTailoringService.updateById(syPackingListTailoring);