From e834732d74673309903f8794f9807d34629fdfb5 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Mon, 20 Jan 2025 10:03:00 +0800
Subject: [PATCH] =?UTF-8?q?44838=20=20MES:=E8=A3=81=E7=89=87=E8=A1=A5?=
 =?UTF-8?q?=E7=89=87=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0=EF=BC=86=E8=A3=81?=
 =?UTF-8?q?=E7=89=87=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/controller/base/MesWorkOrderCutController.java   | 2 +-
 .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java
index c8b642f..9bd9c90 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java
@@ -61,7 +61,7 @@ public class MesWorkOrderCutController extends BaseMesController<MesWorkOrderCut
             ValidatorBean.checkNotNull(workOrderCutModel.getCutCode(), "裁片方案不存在");
 
             workOrderCutService.doGenerateCutWorkOrder(Arrays.asList(workOrderCutModel.getWorkOrderIds()), workOrderCutModel.getCutCode(), workOrderCutModel.getRemark(),
-                    AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), workOrderCutModel.getEditionNumber(), workOrderCutModel.isFree(), workOrderCutModel.getMesCutSchemeFgs());
+                    AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), workOrderCutModel.getEditionNumber(), true, workOrderCutModel.getMesCutSchemeFgs());
             return ResultBean.success("生成成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java
index 000fd0b..2ac907d 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java
@@ -91,7 +91,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
         MesCutScheme cutScheme = getMesCutScheme(cutCode, organizeCode);
 
-
+        log.info("isFree={}", isFree);
         List<MesCutSchemeFg> cutSchemeFgList = new ArrayList<>();
         if (!isFree) {
             cutSchemeFgList = getMesCutSchemeFgs(cutCode, organizeCode);