新增打印工单打印队列

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.pcn.api.busi;
 
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel;
+import cn.estsh.i3plus.pojo.mes.bean.MesPrintQueue;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut;
@@ -24,4 +25,7 @@ public interface IMesProduceSnPrintService {
 
     @ApiOperation(value = "裁片工单查询")
     List<MesWorkOrderCut> findMesWorkOrderCut(MesWorkOrderCut workOrderCut);
+
+    @ApiOperation(value = "打印队列查询")
+    List<MesPrintQueue> findMesPrintQueueList(MesPrintQueue printQueue);
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/printqueue/IPrintQueueStrategyService.java

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.printqueue;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPrintQueue;
+
+import java.util.List;
+
+/**
+ * @Description : 根据不同的打印队列类型数据，封装不同的数据来源  content 是打印模板，dataList
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2024/6/6 16:39
+ * @Modify:
+ **/
+public interface IPrintQueueStrategyService {
+
+    /**
+     * @param model
+     * @return List<MesPrintQueue>
+     */
+    List<MesPrintQueue> execute(MesPrintQueue model);
+}

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/printqueue/strategy/PrintQueueDispatchService.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.printqueue.strategy;
+
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.repository.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-yfai
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2024-09-23 11:08
+ */
+@Service
+public class PrintQueueDispatchService {
+
+    @Autowired
+    private MesLabelTemplateRepository labelTemplateRepository;
+
+    @Autowired
+    private MesLabelTemplateParamRepository labelTemplateParamRepository;
+
+    public MesLabelTemplate getLabelTemplate(String templateCode, String organizeCode) {
+        DdlPackBean templatePackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(templateCode, MesPcnExtConstWords.TEMPLATE_CODE, templatePackBean);
+        MesLabelTemplate mesLabelTemplate = labelTemplateRepository.getByProperty(templatePackBean);
+        if (mesLabelTemplate != null) {
+            //级联获取labelTemplateParam
+            DdlPackBean templateParamPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+            DdlPreparedPack.getNumEqualPack(mesLabelTemplate.getId(), "templateId", templateParamPackBean);
+            List<MesLabelTemplateParam> params = labelTemplateParamRepository.findByHqlWhere(templateParamPackBean);
+            mesLabelTemplate.setLabelTemplateParamList(params);
+        }
+        return mesLabelTemplate;
+    }
+
+}

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackageSnSaveStepService.java

@@ -25,14 +25,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description : 保存裁片工单包装条码工步

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutSaveStepService.java

@@ -36,6 +36,9 @@ public class MesWorkOrderCutSaveStepService extends BaseStepService {
     @Override
     public StepResult execute(StationRequestBean reqBean) {
 
+        //保存开模记录工步
+        ((IStepService) SpringContextsUtil.getBean("mesMouldRecordGenerateStepService")).executeInState(reqBean);
+
         //保存裁片工单条码工步
         ((IStepService) SpringContextsUtil.getBean("mesWorkOrderCutProductSnSaveStepService")).executeInState(reqBean);
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.ext.mes.pcn.pojo.util;
 
+import io.swagger.annotations.ApiParam;
+
 /**
  * @Description :
  * @Reference :
@@ -551,4 +553,15 @@ public class MesPcnExtConstWords {
 
     // 打印队列类型
     public static final String PRINT_QUEUE_TYPE = "printQueueType";
+
+    // 车型名称
+    public static final String CAR_MODEL_NAME = "carModelName";
+    // VIN_CODE
+    public static final String VIN_CODE = "vinCode";
+    // VIN_CODE 后四位
+    public static final String VIN_CODE_AFTER_FOUR = "vinCodeAfterFour";
+    // 工单标识
+    public static final String ORDER_FLAG = "orderFlag";
+    // 重打印
+    public static final String REPRINT = "reprint";
 }