Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyProductPlanAutoController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -35,8 +37,8 @@ public class ZyProductPlanAutoController extends JeecgController<ZyProductPlan,
 
     @ApiOperation(value = "生产计划自动化-模拟测试", notes = "生产计划自动化-模拟测试")
     @GetMapping(value = "/productPlanAuto4Mock")
-    public Result<?> productPlanAuto4Mock(List<String> workOrderIds) {
+    public Result<?> productPlanAuto4Mock(String workOrderIds) {
-        List<Map<String, List<ZyPlanProcess>>> list = iZyProductPlanAutoService.doAuto(workOrderIds);
+        List<Map<String, List<ZyPlanProcess>>> list = iZyProductPlanAutoService.doAuto(Arrays.asList(workOrderIds.split(",")));
         return Result.OK(list);
     }
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/IZyProductPlanAutoServiceImpl.java

@@ -247,7 +247,7 @@ public class IZyProductPlanAutoServiceImpl extends ServiceImpl<ZyProductPlanMapp
         //根据productCode，查询本次创建生产计划
         List<ZyProductPlan> productPlanList = iZyProductPlanService.list(new LambdaQueryWrapper<ZyProductPlan>()
                 .eq(ZyProductPlan::getStatus, ProductPlanStatusEnum.UNAUDITED.getCode())
-                .eq(ZyProductPlan::getProductNo, zyProductPlanProductNos));
+                .in(ZyProductPlan::getProductNo, zyProductPlanProductNos));
         return productPlanList;
     }