From a21cfdf96c6c21c45740bbeebd363a63712b69d8 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Fri, 16 Sep 2022 21:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=8D=95=E8=A1=8C=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E4=BB=93=E5=BA=93=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WmRtIssueLineController.java   | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtIssueLineController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtIssueLineController.java
index 0d4a19c..9a5d57e 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtIssueLineController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtIssueLineController.java
@@ -2,6 +2,14 @@ package com.ktg.mes.wm.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.wm.domain.WmStorageArea;
+import com.ktg.mes.wm.domain.WmStorageLocation;
+import com.ktg.mes.wm.domain.WmWarehouse;
+import com.ktg.mes.wm.service.IWmStorageAreaService;
+import com.ktg.mes.wm.service.IWmStorageLocationService;
+import com.ktg.mes.wm.service.IWmWarehouseService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +42,15 @@ public class WmRtIssueLineController extends BaseController
     @Autowired
     private IWmRtIssueLineService wmRtIssueLineService;
 
+    @Autowired
+    private IWmWarehouseService wmWarehouseService;
+
+    @Autowired
+    private IWmStorageLocationService wmStorageLocationService;
+
+    @Autowired
+    private IWmStorageAreaService wmStorageAreaService;
+
     /**
      * 查询生产退料单行列表
      */
@@ -77,6 +94,21 @@ public class WmRtIssueLineController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody WmRtIssueLine wmRtIssueLine)
     {
+        if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId());
+            wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode());
+            wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName());
+        }
+        if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){
+            WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId());
+            wmRtIssueLine.setLocationCode(location.getLocationCode());
+            wmRtIssueLine.setLocationName(location.getLocationName());
+        }
+        if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){
+            WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId());
+            wmRtIssueLine.setAreaCode(area.getAreaCode());
+            wmRtIssueLine.setAreaName(area.getAreaName());
+        }
         return toAjax(wmRtIssueLineService.insertWmRtIssueLine(wmRtIssueLine));
     }
 
@@ -88,6 +120,21 @@ public class WmRtIssueLineController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody WmRtIssueLine wmRtIssueLine)
     {
+        if(StringUtils.isNotNull(wmRtIssueLine.getWarehouseId())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmRtIssueLine.getWarehouseId());
+            wmRtIssueLine.setWarehouseCode(warehouse.getWarehouseCode());
+            wmRtIssueLine.setWarehouseName(warehouse.getWarehouseName());
+        }
+        if(StringUtils.isNotNull(wmRtIssueLine.getLocationId())){
+            WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmRtIssueLine.getLocationId());
+            wmRtIssueLine.setLocationCode(location.getLocationCode());
+            wmRtIssueLine.setLocationName(location.getLocationName());
+        }
+        if(StringUtils.isNotNull(wmRtIssueLine.getAreaId())){
+            WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmRtIssueLine.getAreaId());
+            wmRtIssueLine.setAreaCode(area.getAreaCode());
+            wmRtIssueLine.setAreaName(area.getAreaName());
+        }
         return toAjax(wmRtIssueLineService.updateWmRtIssueLine(wmRtIssueLine));
     }
 
@@ -99,7 +146,6 @@ public class WmRtIssueLineController extends BaseController
 	@DeleteMapping("/{lineIds}")
     public AjaxResult remove(@PathVariable Long[] lineIds)
     {
-
         return toAjax(wmRtIssueLineService.deleteWmRtIssueLineByLineIds(lineIds));
     }
 }