成衣推送增加自由项3

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

@@ -1577,6 +1577,15 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 	}
 
+	/*public Object setNull2(Object o){
+		if(o==null){
+			return "默认配码规格";
+		}else{
+			return o;
+		}
+
+	}*/
+
 	/**
 	 * 从u8拉取数据 添加方式4
 	 * @return

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

@@ -1260,7 +1260,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		itemMap.put("CDEFINE37",setNull(mapPOPodetails.get("cDefine37")));
 		itemMap.put("CFREE1",setNull(mapPOPodetails.get("cFree1")));
 		itemMap.put("CFREE2",setNull(mapPOPodetails.get("cFree2")));
-		itemMap.put("CFREE3",setNull(mapPOPodetails.get("cFree3")));
+		itemMap.put("CFREE3",setNull2(mapPOPodetails.get("cFree3")));
 		itemMap.put("CFREE4",setNull(mapPOPodetails.get("cFree4")));
 		itemMap.put("CFREE5",setNull(mapPOPodetails.get("cFree5")));
 		itemMap.put("CFREE6",setNull(mapPOPodetails.get("cFree6")));
@@ -1278,6 +1278,15 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 	}
 
+	public Object setNull2(Object o){
+		if(o==null){
+			return "默认配码规格";
+		}else{
+			return o;
+		}
+
+	}
+
 	@Override
 	public List<SyPackingListTailoringItem> getList(String id) {
 		return syPackingListTailoringItemMapper.getList(id);