From 3793f279bc9331e3c08c0f74faa92b936858cc39 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Sat, 17 Sep 2022 22:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=8A=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ktg/mes/wm/domain/tx/RtIssueTxBean.java   | 48 +++++++++++++++++++
 .../service/impl/StorageCoreServiceImpl.java  |  1 +
 .../resources/mapper/wm/WmRtIssueMapper.xml   |  3 ++
 3 files changed, 52 insertions(+)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/tx/RtIssueTxBean.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/tx/RtIssueTxBean.java
index 481e77b..dd83e32 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/tx/RtIssueTxBean.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/tx/RtIssueTxBean.java
@@ -57,6 +57,18 @@ public class RtIssueTxBean extends BaseEntity {
     /** 库位名称 */
     private String areaName;
 
+    /** 供应商ID */
+    private Long vendorId;
+
+    /** 供应商编号 */
+    private String vendorCode;
+
+    /** 供应商名称 */
+    private String vendorName;
+
+    /** 供应商简称 */
+    private String vendorNick;
+
     /** 单据类型 */
     private String sourceDocType;
 
@@ -204,6 +216,38 @@ public class RtIssueTxBean extends BaseEntity {
         this.areaName = areaName;
     }
 
+    public Long getVendorId() {
+        return vendorId;
+    }
+
+    public void setVendorId(Long vendorId) {
+        this.vendorId = vendorId;
+    }
+
+    public String getVendorCode() {
+        return vendorCode;
+    }
+
+    public void setVendorCode(String vendorCode) {
+        this.vendorCode = vendorCode;
+    }
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    public String getVendorNick() {
+        return vendorNick;
+    }
+
+    public void setVendorNick(String vendorNick) {
+        this.vendorNick = vendorNick;
+    }
+
     public String getSourceDocType() {
         return sourceDocType;
     }
@@ -271,6 +315,10 @@ public class RtIssueTxBean extends BaseEntity {
                 ", areaId=" + areaId +
                 ", areaCode='" + areaCode + '\'' +
                 ", areaName='" + areaName + '\'' +
+                ", vendorId=" + vendorId +
+                ", vendorCode='" + vendorCode + '\'' +
+                ", vendorName='" + vendorName + '\'' +
+                ", vendorNick='" + vendorNick + '\'' +
                 ", sourceDocType='" + sourceDocType + '\'' +
                 ", sourceDocId=" + sourceDocId +
                 ", sourceDocCode='" + sourceDocCode + '\'' +
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/StorageCoreServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/StorageCoreServiceImpl.java
index 4e516ad..f585be3 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/StorageCoreServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/StorageCoreServiceImpl.java
@@ -146,6 +146,7 @@ public class StorageCoreServiceImpl implements IStorageCoreService {
             transaction_in.setMaterialStockId(null);
             //设置入库相关联的出库事务ID
             transaction_in.setRelatedTransactionId(transaction_out.getTransactionId());
+
             wmTransactionService.processTransaction(transaction_in);
         }
     }
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmRtIssueMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmRtIssueMapper.xml
index d8b848a..d1adefe 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmRtIssueMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmRtIssueMapper.xml
@@ -103,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                irl.`warehouse_id`,irl.`warehouse_code`,irl.`warehouse_name`,
                irl.`location_id`,irl.`location_code`,irl.`location_name`,
                irl.`area_id`,irl.`area_code`,irl.`area_name`,
+               ms.vendor_id as vendorId,ms.vendor_code as vendorCode,ms.vendor_name as vendorName,ms.vendor_nick as vendorNick,
                'RTISSUE' AS source_doc_type,ir.`rt_id` AS source_doc_id,
                ir.`rt_code` AS source_doc_code,
                irl.`line_id` AS source_doc_line_id,
@@ -111,6 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM wm_rt_issue ir
                  LEFT JOIN wm_rt_issue_line irl
                            ON ir.rt_id = irl.rt_id
+                 left join wm_material_stock ms
+                           on irl.material_stock_id = ms.material_stock_id
         WHERE ir.rt_id = #{rtId}
     </select>