From d6c73742213581d45d532f8ffc8152c50a80c088 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Wed, 25 Aug 2021 16:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E6=A3=80=E5=88=9B=E5=BB=BA=E6=96=B0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=88=90=E5=93=81=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/constant/Constants.java     |  2 ++
 .../mesnac/common/dto/LabelPrintDto.java      |  9 ++++++++
 .../impl/InspectionTaskServiceImpl.java       |  4 ++--
 .../impl/ProdReadyTaskServiceImpl.java        | 22 ++++++++++++-------
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
index 6e0c84f9..468d8fb6 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
@@ -177,6 +177,8 @@ public interface Constants {
     // 余料标签
     String PRINT_TYPE_EXM = "EXM";
 
+    // 成品标签
+    String PRINT_TYPE_PRODUCT = "PRODUCT";
     /**
      * 刀具状态，Y-使用，N-报废/删除
      */
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java
index 4c084ac3..9a63900e 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java
@@ -29,6 +29,7 @@ public class LabelPrintDto implements Serializable {
     private String label;
 
     //在制品标签参数
+    private String shopOrder;
     //工作指令
     private String workOrder;
     //图纸版本号
@@ -44,6 +45,14 @@ public class LabelPrintDto implements Serializable {
     //打印张数
     private Integer printNum;
 
+    public String getShopOrder() {
+        return shopOrder;
+    }
+
+    public void setShopOrder(String shopOrder) {
+        this.shopOrder = shopOrder;
+    }
+
     public String getSite() {
         return site;
     }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
index 0bbf7397..91ecd55f 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
@@ -287,8 +287,8 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         task.setSite(site);
         task.setCategory(category);
         task.setTaskNo(taskNo);
-        task.setStatus(Constants.INSPECTION_TASK_STATUS_COMPLETE);
-        task.setResrce(Constants.RSESULT_OK);
+        task.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
+        task.setResult(null);
         task.setDescription("专检检验任务");
         task.setInspectionItemBo( null);
         task.setShopOrder(shopOrder);
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index 2260324e..1dd3f23e 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -36,6 +36,7 @@ import com.foreverwin.modular.core.util.FrontPage;
 import com.sap.me.messaging.MessageTypeBOHandle;
 import com.sap.me.user.UserGroupBOHandle;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.jms.core.JmsMessagingTemplate;
@@ -45,7 +46,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 /**
  * <p>
@@ -68,6 +68,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
     public static final String STATUS_CANCEL = "CANCEL";
     public static final String MESSAGE_TYPE_WLZB = "WLZB";
     @Autowired
+    @Qualifier("defaultJmsTemplate")
     private JmsMessagingTemplate jmsTemplate;
     @Value("${print.server}")
     private String printServer;
@@ -441,7 +442,13 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         PrintLog printTag = new PrintLog();
 
         String resrce = sfcDispatchDto.getResrce();
+        String shopOrder = sfcDispatchDto.getShopOrder();
+        String factory = customFieldsService.getCustomFieldsValue(HandleEnum.SHOP_ORDER.getHandle(site, shopOrder), CustomFieldConstant.SO_FACTORY);
         String printName = customFieldsService.getCustomFieldsValue(HandleEnum.RESOURCE.getHandle(site, resrce), CustomFieldConstant.RESRCE_CUSTOM_FIELD_PRINT_NAME);
+        String type=Constants.PRINT_TYPE_SFC;
+        if (StringUtil.notBlank(factory)&&factory.equals("6100")){
+            type=Constants.PRINT_TYPE_PRODUCT;
+        }
         if (StringUtil.isBlank(printName)) {
             throw new BaseException("资源" + resrce + "维护的打印机不能为空");
         }
@@ -451,14 +458,15 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         queryWrapper.eq(PrintLog.SFC, prodReadyTask.getSfc());
         queryWrapper.eq(PrintLog.STEP_ID, prodReadyTask.getStepId());
         queryWrapper.eq(PrintLog.RESRCE, prodReadyTask.getResrce());
-        queryWrapper.eq(PrintLog.CATEGORY, Constants.PRINT_TYPE_SFC);
-        queryWrapper.eq(PrintLog.CATEGORY, Constants.PRINT_TYPE_SFC);
+        queryWrapper.eq(PrintLog.CATEGORY, type);
+        queryWrapper.eq(PrintLog.PRINT_TEMPLATE, type);
         List<PrintLog> printLogList = printLogService.list(queryWrapper);
         if (printLogList.isEmpty()) {
             //打印参数
             LabelPrintDto labelPrintDto = new LabelPrintDto();
             labelPrintDto.setPrinter(printName);
-            labelPrintDto.setPrintTemplate(Constants.PRINT_TYPE_SFC);
+            labelPrintDto.setPrintTemplate(type);
+            labelPrintDto.setShopOrder(shopOrder);
             labelPrintDto.setItem(selectCurrent.getItem());
             labelPrintDto.setItemDescription(selectCurrent.getDescription());
             labelPrintDto.setSfc(prodReadyTask.getSfc());
@@ -482,16 +490,15 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             if (seq != stepOperationList.size() - 1) {
                 RouterStepDto stepOperation = stepOperationList.get(seq + 1);
                 labelPrintDto.setOperation(stepOperation.getOperationDesc());
-
             }
             labelPrintDtoList.add(labelPrintDto);
             printData = JSON.toJSONString(labelPrintDtoList);
             //打印记录
             printTag.setHandle(UUID.randomUUID().toString());
             printTag.setPrintName(printName);
-            printTag.setPrintTemplate(Constants.PRINT_TYPE_SFC);
+            printTag.setPrintTemplate(type);
             printTag.setSite(site);
-            printTag.setCategory(Constants.PRINT_TYPE_SFC);
+            printTag.setCategory(type);
             printTag.setPrintParam(JSON.toJSONString(labelPrintDtoList));
             printTag.setSfc(prodReadyTask.getSfc());
             printTag.setResrce(prodReadyTask.getResrce());
@@ -677,7 +684,6 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         messageObject.put("RESOURCE", resource);
         messageObject.put("RESOURCE_TYPE", resourceType);
         String causeMessage = null;
-        jmsTemplate.getJmsTemplate().setReceiveTimeout(TimeUnit.SECONDS.toMillis(30));
         String message = jmsTemplate.convertSendAndReceive(queue, messageObject.toString(), String.class);
 
         if (StringUtil.isBlank(message)) {