Merge branch 'jdt'

src/main/java/com/aps/config/SwaggerMapParamConfig.java

@@ -134,7 +134,7 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "operationMove":
                 properties.put("SceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("id", new StringSchema().description("操作ID").example(1));
@@ -150,7 +150,7 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "operationedit":
                 properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("operation", new StringSchema().description("操作对象"));
@@ -162,7 +162,7 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "changebasetime":
                 properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("baseTime", new StringSchema().description("基础时间").example("2025-11-03T07:36:00.000Z"));
@@ -174,7 +174,7 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "spiltOperation":
                 properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("id", new StringSchema().description("操作ID").example(1));
@@ -188,7 +188,7 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "delOperation":
                 properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("id", new StringSchema().description("操作ID").example(1));
@@ -200,7 +200,7 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "lockedOperation":
                 properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("id", new StringSchema().description("操作ID").example(1));
@@ -214,7 +214,7 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "spiltOrder":
                 properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("orderid", new StringSchema().description("订单ID").example("fcc0892a-0483-4da7-8414-9ce98be36e53"));
@@ -228,13 +228,13 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
-                
+
             case "orderMerge":
                 properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
                 properties.put("sourceorderid", new StringSchema().description("源订单ID").example("5be078b725b34ade8b6638f74dad6b10"));
                 properties.put("targetorderid", new StringSchema().description("目标订单ID").example("2a0f23d2429f4e5da7b3929da75a803d"));
                 examples.put("合并订单示例", createExample(
-                        "将源订单合并到目标订单",
+                        "按指定数量拆分订单",
                         "{\n" +
                                 "  \"sceneId\": \"B571EF6682DB463AB2977B1055A74112\",\n" +
                                 "  \"sourceorderid\": \"5be078b725b34ade8b6638f74dad6b10\",\n" +
@@ -242,6 +242,20 @@ public class SwaggerMapParamConfig {
                                 "}"
                 ));
                 break;
+
+            case "copyOrder":
+                properties.put("sceneId", new StringSchema().description("场景ID").example("B571EF6682DB463AB2977B1055A74112"));
+                properties.put("orderId", new StringSchema().description("订单ID").example("fcc0892a-0483-4da7-8414-9ce98be36e53"));
+                properties.put("copyCount", new StringSchema().description("复制数量").example(2));
+                examples.put("订单复制示例", createExample(
+                        "复制指定订单指定数量",
+                        "{\n" +
+                                "  \"sceneId\": \"B571EF6682DB463AB2977B1055A74112\",\n" +
+                                "  \"orderId\": \"fcc0892a-0483-4da7-8414-9ce98be36e53\",\n" +
+                                "  \"copyCount\": 2\n" +
+                                "}"
+                ));
+                break;
         }
 
         if (!properties.isEmpty()) {
@@ -301,6 +315,8 @@ public class SwaggerMapParamConfig {
                 return "拆分订单请求参数";
             case "orderMerge":
                 return "合并订单请求参数";
+            case "copyOrder":
+                return "订单复制请求参数";
             default:
                 return "请求参数";
         }

src/main/java/com/aps/controller/gantt/ResourceGanttController.java

@@ -761,7 +761,7 @@ public class ResourceGanttController {
             throw new RuntimeException("未找到对应的场景文件");
         }
 
-        List<Machine> machineList = planResultService.InitCalendarToAllMachines1(schedule.getScenarioID());
+        List<Machine> machineList = planResultService.InitCalendarToAllMachines1(sceneId);
 
         // 转换为 ResourceGanttVO 格式
         List<ResourceGanttVO> resourceGanttVOList = new ArrayList<>();

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -35,7 +35,7 @@ public class PlanResultServiceTest {
     public void testExecute2() {
         // 这里需要一个有效的SceneId来测试
         // 在实际测试中，您需要提供一个数据库中存在的SceneId
-        String sceneId = "2BAB2BF160BE447EA6673DABACEF05D2";
+        String sceneId = "2BD38C14EDAD4CBFB8C9671CD45437A6";
         
         try {
 //            Chromosome result = planResultService.execute2(sceneId);
@@ -56,6 +56,9 @@ public class PlanResultServiceTest {
 //
 //planResultService.SpiltOrder(sceneId,"2f24e563-1337-422b-a0ba-92da7e8c6584",splitCounts.toArray(new Double[0]));
 
+
+
+            planResultService.schedule(sceneId);
             Chromosome schedule = sceneService.loadChromosomeFromFile(sceneId);
 
             // 转换为 ProductGanttVO 格式