From 79f3dde7663ff517debda169413e83924bfbba4c Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 25 Jul 2022 15:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pro/controller/ProTaskIssueMobController.java  | 14 +++++++++++++-
 .../java/com/ktg/mes/wm/domain/WmIssueHeader.java  | 11 ++++++++++-
 .../resources/mapper/wm/WmIssueHeaderMapper.xml    |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java
index 002c999..71dc6fd 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java
@@ -18,7 +18,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/mobile/pro/taskissue")
@@ -69,7 +71,17 @@ public class ProTaskIssueMobController extends BaseController {
 
         List<WmIssueHeader> issueList = wmIssueHeaderService.selectWmIssueHeaderList(param);
 
-        return AjaxResult.success(issueList);
+        List<WmIssueLine> lines = new ArrayList<WmIssueLine>();
+        if(CollUtil.isNotEmpty(issueList)){
+            WmIssueLine p = new WmIssueLine();
+            for (WmIssueHeader header: issueList
+                 ) {
+                p.setIssueId(header.getIssueId());
+                lines.addAll(wmIssueLineService.selectWmIssueLineList(p));
+            }
+        }
+
+        return AjaxResult.success(lines);
     }
 
     /**
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java
index 43e6b9a..329b0b0 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java
@@ -161,7 +161,15 @@ public class WmIssueHeader extends BaseEntity
         this.workorderId = workorderId;
     }
 
-    public Long getWorkorderId() 
+    public String getWorkstationName() {
+        return workstationName;
+    }
+
+    public void setWorkstationName(String workstationName) {
+        this.workstationName = workstationName;
+    }
+
+    public Long getWorkorderId()
     {
         return workorderId;
     }
@@ -336,6 +344,7 @@ public class WmIssueHeader extends BaseEntity
             .append("issueName", getIssueName())
             .append("workstationId", getWorkstationId())
             .append("workstationCode", getWorkstationCode())
+                .append("workstationName", getWorkstationName())
             .append("workorderId", getWorkorderId())
             .append("workorderCode", getWorkorderCode())
             .append("taskId", getTaskId())
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
index a964ffb..b84a9d0 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWmIssueHeaderVo">
-        select issue_id, issue_code, issue_name, workstation_id, workstation_code, workorder_id, workorder_code, task_id, task_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, issue_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_header
+        select issue_id, issue_code, issue_name, workstation_id, workstation_code,workstation_name, workorder_id, workorder_code, task_id, task_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, issue_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_header
     </sql>
 
     <select id="selectWmIssueHeaderList" parameterType="WmIssueHeader" resultMap="WmIssueHeaderResult">