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

@@ -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) {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java

@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -91,7 +92,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);
@@ -191,6 +192,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
     }
 
     @Override
+    @Transactional
     public void generateCutWorkOrderMaterial(WorkOrderMaterialCutModel workOrderMaterialCutModel) {
         String organizeCode = AuthUtil.getOrganizeCode();
         String userName = AuthUtil.getSessionUser().getUserName();
@@ -211,13 +213,9 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(workOrderMaterialCutModel.getCutWorkOrderNo(), MesExtConstWords.CUT_WORK_ORDER_NO, packBean);
-        MesWorkOrderCut workOrderCut = workOrderCutRepository.getByProperty(packBean);
-
-        if (workOrderCut == null) MesException.throwMesBusiException("裁片工单不存在", workOrderCut);
-        workOrderCut.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue());
-
-        workOrderCutRepository.update(workOrderCut);
 
+        workOrderCutRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "isDeleted", "printStatus"},
+                new Object[]{userName, TimeTool.getNowTime(true), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue() }, packBean);
 
     }