面辅料数据类型调整

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

@@ -522,6 +522,14 @@ public class SyPackingListFabricController {
 				 for (SyPackingListFabricVo vo : list) {
 					 SyPackingListFabricItem po =new SyPackingListFabricItem();
 					 BeanUtils.copyProperties(vo,po);
+					 if(po==null){
+					 	continue;
+					 }
+					 if(vo.getManualYarnFlag1()!=null&&vo.getManualYarnFlag1().equals("是")){
+						 po.setManualYarnFlag(1);
+					 }else{
+						 po.setManualYarnFlag(0);
+					 }
 					 if(!maps.containsKey(vo.getSyShippingDetailsId())){
 						 SyPackingListFabric main =new SyPackingListFabric();
 						 main.setGarmentFactory(vo.getTheGarmentFactory());//成衣工厂

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/vo/SyPackingListFabricVo.java

@@ -83,7 +83,7 @@ public class SyPackingListFabricVo {
 	@Excel(name = "处理方式", width = 15)
 	private String treatmentMethod;
 	@Excel(name = "是否手册纱", width = 15)
-	private Integer manualYarnFlag;
+	private String manualYarnFlag1;
 	@Excel(name = "手册纱单价", width = 15)
 	private java.math.BigDecimal manualYarnUnitPrice;
 	@Excel(name = "手册纱占比%", width = 15)