Merge branch 'dev-temp-xw-202501150000-44838' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java

@@ -42,7 +42,7 @@ public class MesWorkOrderCutController extends BaseMesController<MesWorkOrderCut
             ValidatorBean.checkNotNull(cutCode, "裁片方案不存在");
 
             workOrderCutService.doGenerateCutWorkOrder(Arrays.asList(workOrderIds), cutCode, remark,
-                    AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), editionNumber, isFree, mesCutSchemeFgs);
+                    AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), editionNumber, false, null);
             return ResultBean.success("生成成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {