44838 MES:裁片补片逻辑更新＆裁片报表

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderCutService.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeFg;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCutDetail;
 import io.swagger.annotations.ApiOperation;
@@ -18,7 +19,7 @@ public interface IMesWorkOrderCutService extends IBaseMesService<MesWorkOrderCut
 
     @ApiOperation("生成裁片工单")
     void doGenerateCutWorkOrder(List<Long> workOrderIds, String cutCode, String remark, String organizeCode,
-                                String userName, Integer editionNumber);
+                                String userName, Integer editionNumber, boolean isFree, List<MesCutSchemeFg> mesCutSchemeFgs);
 
     @ApiOperation("分页查询裁片工单明细")
     ListPager<MesWorkOrderCutDetail> queryWorkOrderCutDetailByPager(MesWorkOrderCutDetail workOrderCutDetail, Pager pager);

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderCutService;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeFg;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCutDetail;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.List;
+
 /**
  * 裁片工单
  */
@@ -33,14 +36,14 @@ public class MesWorkOrderCutController extends BaseMesController<MesWorkOrderCut
 
     @PostMapping(value = "/generate")
     @ApiOperation(value = "裁片工单生成", notes = "裁片工单生成")
-    public ResultBean doGenerateCutWorkOrder(Long[] workOrderIds, String cutCode, String remark, Integer editionNumber) {
+    public ResultBean doGenerateCutWorkOrder(Long[] workOrderIds, String cutCode, String remark, Integer editionNumber, boolean isFree, List<MesCutSchemeFg> mesCutSchemeFgs) {
         try {
 
             ValidatorBean.checkNotNull(workOrderIds, "工单不存在");
             ValidatorBean.checkNotNull(cutCode, "裁片方案不存在");
 
             workOrderCutService.doGenerateCutWorkOrder(Arrays.asList(workOrderIds), cutCode, remark,
-                    AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), editionNumber);
+                    AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), editionNumber, isFree, mesCutSchemeFgs);
             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

@@ -21,6 +21,7 @@ import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
 import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
+import cn.hutool.core.stream.CollectorUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,7 +81,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
     @Override
     public void doGenerateCutWorkOrder(List<Long> workOrderIds, String cutCode, String remark, String organizeCode,
-                                       String userName, Integer editionNumber) {
+                                       String userName, Integer editionNumber,  boolean isFree, List<MesCutSchemeFg> mesCutSchemeFgs) {
 
         List<MesWorkOrder> workOrderList = getMesWorkOrders(workOrderIds, organizeCode);
 
@@ -90,7 +91,15 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
         List<MesCutSchemeMaterial> cutSchemeMaterialList = getMesCutSchemeMaterials(cutCode, organizeCode);
 
-        List<MesCutSchemeFg> cutSchemeFgList = getMesCutSchemeFgs(cutCode, organizeCode);
+        List<MesCutSchemeFg> cutSchemeFgList = new ArrayList<>();
+        if (!isFree) {
+            cutSchemeFgList = getMesCutSchemeFgs(cutCode, organizeCode);
+        } else {
+            if (CollectionUtils.isEmpty(mesCutSchemeFgs)) {
+                MesException.throwMesBusiException("未选择裁片成品");
+            }
+            cutSchemeFgList.addAll(mesCutSchemeFgs);
+        }
 
         // 校验工单物料是否已在成品配置中进行维护
         checkWorkOrderPartValid(workOrderList, cutSchemeFgList);
@@ -125,7 +134,12 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
             workOrderCut.setCutWorkOrderNo(cutWorkOrderNo);
             workOrderCut.setOrganizeCode(organizeCode);
-            workOrderCut.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue());
+            // 44838 如果isFree 是 默认已打印
+            Integer printStatus = MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue();
+            if (isFree) {
+                printStatus = MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue();
+            }
+            workOrderCut.setPrintStatus(printStatus);
             workOrderCuttList.add(workOrderCut);
             
             for (MesCutSchemeMaterial cutSchemeMaterial : cutSchemeMaterialList) {