From edff6b89a24a8ac11e791544de4c143b711f3527 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 28 Dec 2022 16:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/controller/ReportController.java  | 15 +++++++++++++++
 .../mesnac/anomaly/mapper/ReportMapper.java   |  6 ++++++
 .../mesnac/anomaly/service/ReportService.java |  7 +++++++
 .../service/impl/ReportServiceImpl.java       | 13 +++++++++++++
 .../main/resources/mapper/ReportMapper.xml    | 19 +++++++++++++++++++
 .../meapi/controller/InventoryController.java | 18 ++++++++++++++++++
 6 files changed, 78 insertions(+)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index 61f252ba..8af5e438 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -613,6 +613,21 @@ public class ReportController {
         }
     }
 
+    /**
+     *
+     * 上下料表维护
+     * @param
+     * @return
+     */
+    @GetMapping("/inventoryTableSave")
+    public R inventoryTableSave(@RequestParam(required = false) Map paramMap){
+        try {
+            return R.ok(reportService.inventoryTableSave(paramMap));
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+
     /**
      * 工时看板
      * @param
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
index d1756f23..fe5edea4 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
@@ -322,4 +322,10 @@ public interface ReportMapper {
 
     List<Map<String, String>>  totalWorkingHoursCompletedThisYear(String workCenter);
 
+    /**
+     * 上下料表维护
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> inventoryTableSave(Map paramMap);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
index bf283295..69e1c893 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
@@ -313,4 +313,11 @@ public interface ReportService {
      * @return
      */
     Map<String, Object> projectScheduleReportBoard(Map paramMap);
+
+    /**
+     * 上下料表维护
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> inventoryTableSave(Map paramMap);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
index 190faf6e..6aa32011 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
@@ -1773,6 +1773,19 @@ public class ReportServiceImpl implements ReportService {
         return result;
     }
 
+    /**
+     * 上下料表维护
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> inventoryTableSave(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.inventoryTableSave(paramMap);
+    }
+
     /**
      * 工时统计报表
      * @param paramMap
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index f0d06e2b..9fbc9610 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -3288,6 +3288,25 @@ SELECT zab.CREATED_DATE_TIME,
         GROUP BY M_MONTH.MONTH
         ORDER BY MONTH_MONTH
     </select>
+    <select id="inventoryTableSave" resultType="java.util.Map">
+        SELECT itY.HANDLE "handle",
+        ity.INVENTORY_ID "inventoryId",     --批次号
+        s.SFC,
+        i.ITEM           "item",            --物料编号
+        it.DESCRIPTION   "itemDescription", --物料描述
+        ity.QTY_ON_HAND  "qtyOnHand",
+        itY.ORIGINAL_QTY "originalQty"
+        FROM INVENTORY ity
+                 LEFT JOIN SFC s ON s.HANDLE = ity.INVENTORY_CONTEXT_GBO AND s.SITE = ity.SITE
+                 LEFT JOIN ITEM i ON i.HANDLE = ity.ITEM_BO
+                 LEFT JOIN ITEM_T it ON it.ITEM_BO = ity.ITEM_BO AND it.LOCALE = 'zh'
+        <where>
+            ity.SITE = #{site}
+            <if test="inventoryId != null and inventoryId != ''">
+                AND ity.INVENTORY_ID = #{inventoryId}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java
index 3199a0e6..fcdeec76 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java
@@ -160,4 +160,22 @@ public class InventoryController {
         return R.failed("一个条码匹配多个数据！");
     }
 
+    /**
+     * 批量保存批次号List
+     * @param inventoryList
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("saveInventoryList")
+    public R saveInventoryList(@RequestBody List<Inventory> inventoryList) {
+        try {
+            for (Inventory inventory : inventoryList) {
+                inventoryService.saveOrUpdate(inventory);
+            }
+        } catch (Exception e) {
+            return R.failed("保存数据失败：" + e.getMessage());
+        }
+        return R.ok("保存数据成功");
+    }
+
 }
\ No newline at end of file