1.物料日志导出 增加线体

2.缺料预警生成工单不拆分

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -114,6 +114,7 @@ public class TaskController {
                 headerList.add(Lists.newArrayList("数量"));
                 headerList.add(Lists.newArrayList("类型"));
                 headerList.add(Lists.newArrayList("来源"));
+                headerList.add(Lists.newArrayList("线体"));
                 headerList.add(Lists.newArrayList("状态"));
                 headerList.add(Lists.newArrayList("操作人"));
                 headerList.add(Lists.newArrayList("创建时间"));
@@ -133,6 +134,7 @@ public class TaskController {
                     result.add(dataLog.getNum());
                     result.add(dataLog.getType() == 1 ? "入库" : "出库");
                     result.add(dataLog.getSourceName());
+                    result.add(dataLog.getLine());
                     result.add(dataLog.getStatus());
                     result.add(dataLog.getCreator());
                     result.add(dataLog.getCreateDate());

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/util/PreWarningItemCache.java

@@ -100,7 +100,7 @@ public class PreWarningItemCache {
                     //判断数量是否大于25,如果是除以25,向上取整,分箱子
                     if (itemList != null) {
                         int itemSize = itemList.size();
-                        if (itemSize > 25) {
+                        if (itemSize > 9999) {
                             log.info(line+"当前缺料数量为:"+itemSize+",需要拆分工单");
                             List<List<PreWarningItem>> resultList = splitWorkOrdersIntoBoxes(itemList);
                             if (resultList != null && !resultList.isEmpty()){