From 2838ab4a7e2b011a003d3292b5a48fb7ac7383d1 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Thu, 26 Aug 2021 14:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/service/impl/PrintLogServiceImpl.java       | 4 ++--
 common/src/main/resources/mapper/PrintLogMapper.xml           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java
index aff0d58d..064e6a7d 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java
@@ -115,6 +115,7 @@ public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> i
     @Override
     public void sfcLabelPrint(Map<String,Object> map) {
         Integer qty = (Integer) map.get("qty");
+        String itemBo = (String) map.get("itemBo");
         List<LabelPrintDto> labelPrintDtoList = (List<LabelPrintDto>) map.get("labelPrintDtoList");
 
         // 解决无法获取list中对象的问题
@@ -143,8 +144,8 @@ public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> i
             printLogService.updateById(printLog1);
         }else{
             labelPrintDto.setQty(BigDecimal.valueOf(qty));
-            printLog.setCreateUser(labelPrintDto.getPrintTemplate());
             printLog.setPrintParam(JSON.toJSONString(labelPrintDto));
+            printLog.setItemBo(itemBo);
             printLog.setItem(labelPrintDto.getItem());
             printLog.setPrintName(labelPrintDto.getPrinter());
             printLog.setPrintTemplate(labelPrintDto.getPrintTemplate());
@@ -170,7 +171,6 @@ public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> i
         if (code != 0){
             throw BusinessException.build(msg);
         }
-
     }
 
 }
\ No newline at end of file
diff --git a/common/src/main/resources/mapper/PrintLogMapper.xml b/common/src/main/resources/mapper/PrintLogMapper.xml
index 05471fe5..35ec6f7b 100644
--- a/common/src/main/resources/mapper/PrintLogMapper.xml
+++ b/common/src/main/resources/mapper/PrintLogMapper.xml
@@ -569,7 +569,7 @@
 
     <!--根据sfcBo，查询当前条码的打印信息-->
     <select id="findSfcPrintInfoBySfc" resultType="com.foreverwin.mesnac.common.dto.LabelPrintDto">
-        SELECT  IM.ITEM ,S.SFC, IT.DESCRIPTION ITEM_DESCRIPTION, ZSD.SHOP_ORDER,
+        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
         FROM INVENTORY I
             LEFT JOIN SFC S ON I.INVENTORY_CONTEXT_GBO = S.HANDLE