From 283481dfceb5d7f8b790855c3fc0601691f4b05a Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Wed, 1 Sep 2021 08:53:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 console/src/main/resources/application-qas.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/console/src/main/resources/application-qas.yml b/console/src/main/resources/application-qas.yml
index 416ee000..f31d312b 100644
--- a/console/src/main/resources/application-qas.yml
+++ b/console/src/main/resources/application-qas.yml
@@ -45,9 +45,9 @@ ftp:
 quartz:
   enabled: true
 
-#打印服务器配置
+#打印服务
 print:
-  server: http://10.10.170.32:8022/print/mesnacprint
+  server: http://172.16.170.163:8022/print/mesnacprint
 
 activeMq:
   sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0

From 2b0ac9057f2f157a8b69006a3d17f0e56a27b47c Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 1 Sep 2021 10:09:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?SFC=E6=89=93=E5=8D=B0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=B8=BB=E8=A7=82=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/common/dto/LabelPrintDto.java   |  6 +++---
 .../common/service/impl/ProdReadyTaskServiceImpl.java | 11 +++++++++++
 common/src/main/resources/mapper/PrintLogMapper.xml   |  7 +++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

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 2a9749f5..257f4702 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
@@ -50,7 +50,7 @@ public class LabelPrintDto implements Serializable {
     //打印张数
     private Integer printNum;
     //是否主观件
-    private String mainPart;
+    private Boolean mainPart;
 
     public String getItemNumber() {
         return itemNumber;
@@ -204,11 +204,11 @@ public class LabelPrintDto implements Serializable {
         this.printNum = printNum;
     }
 
-    public String getMainPart() {
+    public Boolean getMainPart() {
         return mainPart;
     }
 
-    public void setMainPart(String mainPart) {
+    public void setMainPart(Boolean mainPart) {
         this.mainPart = mainPart;
     }
 }
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 373e6b91..3af68b0c 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
@@ -24,6 +24,7 @@ import com.foreverwin.mesnac.common.util.DateUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.dto.BomComponentDto;
 import com.foreverwin.mesnac.meapi.dto.RouterStepDto;
+import com.foreverwin.mesnac.meapi.mapper.CustomFieldsMapper;
 import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper;
 import com.foreverwin.mesnac.meapi.mapper.WorkCenterMapper;
 import com.foreverwin.mesnac.meapi.model.*;
@@ -113,6 +114,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
     private ItemService itemService;
     @Autowired
     private SfcService sfcService;
+    @Autowired
+    private CustomFieldsMapper customFieldsMapper;
+
 
     @Override
     public IPage<ProdReadyTask> selectPage(FrontPage<ProdReadyTask> frontPage, ProdReadyTask prodReadyTask) {
@@ -480,6 +484,13 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             labelPrintDto.setItemNumber(itemNumber);
             labelPrintDto.setWorkOrder(workOrder);
             labelPrintDto.setBlankingSize(sfcDispatchDto.getBlankingSize());
+            // 是否主观件 :辅料类型是9，则为主观件
+            String accessory_type = customFieldsMapper.selectCustomFieldsValue(selectCurrent.getHandle(), "ACCESSORY_TYPE");
+            if ("9".equals(accessory_type)){
+                labelPrintDto.setMainPart(true);
+            }else{
+                labelPrintDto.setMainPart(false);
+            }
             //下道工序
             Router router = routerService.getRouterBySfcBo(HandleEnum.SFC.getHandle(site, sfcServiceById.getSfc()));
             int seq = 0;
diff --git a/common/src/main/resources/mapper/PrintLogMapper.xml b/common/src/main/resources/mapper/PrintLogMapper.xml
index 4e3238c0..439f34b5 100644
--- a/common/src/main/resources/mapper/PrintLogMapper.xml
+++ b/common/src/main/resources/mapper/PrintLogMapper.xml
@@ -567,15 +567,18 @@
         ORDER BY PL.CREATED_DATE_TIME DESC
     </select>
 
-    <!--根据sfcBo，查询当前条码的打印信息-->
+    <!--根据sfc，查询当前条码的打印信息-->
     <select id="findSfcPrintInfoBySfc" resultType="com.foreverwin.mesnac.common.dto.LabelPrintDto">
         SELECT  IM.ITEM , I.ITEM_BO PRINTER, S.SFC, IT.DESCRIPTION ITEM_DESCRIPTION, ZSD.SHOP_ORDER,
-               I.QTY_ON_HAND QTY ,ZSD.BLANKING_SIZE , CF.VALUE DRAWING_REVISION ,CASE WHEN CFA.VALUE = '9' THEN 'true' ELSE 'false' END MAIN_PART
+               I.QTY_ON_HAND QTY ,ZSD.BLANKING_SIZE , CF.VALUE DRAWING_REVISION ,CFB.VALUE WORK_ORDER ,
+               CASE WHEN CFA.VALUE = '9' THEN 'true' ELSE 'false' END MAIN_PART
         FROM INVENTORY I
             LEFT JOIN SFC S ON I.INVENTORY_CONTEXT_GBO = S.HANDLE
             LEFT JOIN
                 (SELECT MAX(STEP_ID),BLANKING_SIZE,SFC,SHOP_ORDER FROM Z_SFC_DISPATCH
                 WHERE SFC = #{sfc} AND SITE = #{site} GROUP BY BLANKING_SIZE ,SFC,SHOP_ORDER) ZSD ON ZSD.SFC = S.SFC
+            LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER AND SO.SITE = #{site}
+            LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'WORK_ORDER'
             LEFT JOIN ITEM IM ON IM.HANDLE = I.ITEM_BO
             LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
             LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = I.ITEM_BO AND CF."ATTRIBUTE" = 'DRAWING_REVISION'