Merge remote-tracking branch 'origin/master' into tl

# Conflicts:
#	src/test/java/com/aps/demo/PlanResultServiceTest.java

src/main/java/com/aps/controller/common/ChromosomeDataController.java

@@ -97,14 +97,14 @@ public class ChromosomeDataController {
 
         // 文件实体必须要有sceneId
         if (isFileEntity(entityName) && (sceneId == null || sceneId.isEmpty())) {
-            return R.ok(null);
+            return ok(Collections.emptyList());
         }
 
         // 直接调用服务层的list查询方法
         List<Object> result = chromosomeDataService.queryChromosomeDataList(sceneId, entityName, paged);
 
         if (result == null) {
-            return ok(Collections.emptyList(), "查询成功，但未找到匹配的数据");
+            return ok(Collections.emptyList());
         }
 
         return ok(result);
@@ -289,4 +289,4 @@ public class ChromosomeDataController {
         Map<String, Object> results = chromosomeDataService.executeSqlOrderCommit(sqlOrders);
         return ok(results);
     }
-}
\ No newline at end of file
+}

src/main/java/com/aps/service/Algorithm/MaterialRequirementService.java

 package com.aps.service.Algorithm;
 
 
+import com.aps.common.util.FileHelper;
 import com.aps.common.util.GlobalCacheUtil;
 import com.aps.common.util.redis.RedisUtils;
 import com.aps.entity.*;
@@ -1249,7 +1250,7 @@ if(demand==null)
                        }
                    }
                }
-
+               FileHelper.writeLogFile("BOM:"+material.getCode());
                if (needed <= 0) {
                    orderMaterial.setYpQty(allneeded - needed);
                    orderMaterial.setQjQty(needed);
@@ -1281,7 +1282,7 @@ if(demand==null)
                        for (RoutingSupportingReplace rsr : routingsupportingreplaces2) {
 
                            Material material1 = materials.get(rsr.getTargetmaterialid());
-
+                           FileHelper.writeLogFile("RoutingSupportingReplace:"+material1.getCode());
                            if (material1 == null) {
                                break;
                            }
@@ -1291,6 +1292,7 @@ if(demand==null)
 
 
                                needed -= useStock;
+                               FileHelper.writeLogFile("RoutingSupportingReplace: "+material1.getCode()+": "+useStock);
                                orderMaterial.setUseStock(orderMaterial.getUseStock() + useStock);
                                orderMaterial.getReplaceMaterial().add(orderMaterial1);
                                if (needed <= 0) {

src/main/java/com/aps/service/common/ChromosomeDataService.java

@@ -1755,6 +1755,10 @@ public class ChromosomeDataService {
         // 检查是否是直接传入的EntityConfig（这种情况可能需要获取场景ID和实体类型）
         // 实际上这个方法是在queryChromosomeDataList中调用的，此时数据已经从文件中获取
 
+        if (data == null) {
+            return new ArrayList<>();
+        }
+
         if (data instanceof List) {
             List<Object> dataList = (List<Object>) data;