From 7d38eb503de8e2f1aa89ce85d6a3b154e12824f8 Mon Sep 17 00:00:00 2001
From: Stang <32996823@qq.com>
Date: Tue, 19 Nov 2024 15:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E6=94=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../md/controller/BaseKnifeController.java    | 48 ++++++++++---------
 .../md/controller/WmsOutTaskController.java   |  2 +-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
index a55e8f9..eabf472 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
@@ -89,28 +89,28 @@ public class BaseKnifeController extends BaseController {
      * @return
      */
     @GetMapping("/open/selectBaseKnife")
-    public List<Map<String, Object>> openList() {
-        BaseKnife baseKnife = new BaseKnife();
-        List<BaseKnife> list = baseKnifeService.selectBaseKnifeList(null);
-        List<Map<String, Object>> result = new ArrayList<>();
-        list.forEach(item -> {
-            Map<String, Object> map = new HashMap<>();
-            map.put("gid", item.getBaseKnifeId().toString());
-            map.put("itemCode", item.getKnifeCode());
-            map.put("itemName", item.getKnifeName());
-            map.put("itemUnit", item.getKnifeUnit());
-            map.put("itemType", item.getKnifeType());
-            map.put("areaCode", item.getAreaCode());
-            map.put("knifeLife", "100");
-            map.put("knifeLifeUsed", item.getKnifeLife() == 0 ? null : String.valueOf(100 - item.getKnifeLife()));
-            map.put("knifeLifeLeave", item.getKnifeLife() == 0 ? null : String.valueOf(item.getKnifeLife()));
-            map.put("isLocked", item.getIsLocked());
-            map.put("lockedStartTime", item.getLockedStartTime() == null ? null : item.getLockedStartTime());
-            map.put("lockedEndTime", item.getLockedEndTime() == null ? null : item.getLockedEndTime());
-            map.put("planSheet", item.getPlanSheet() == null ? null : item.getPlanSheet());
-            map.put("outInfoList", item.getOutInfoList());
-            result.add(map);
-        });
+    public TableDataInfo openList(BaseKnife baseKnife) {
+//        BaseKnife baseKnife = new BaseKnife();
+//        List<BaseKnife> list = baseKnifeService.selectBaseKnifeList(null);
+//        List<Map<String, Object>> result = new ArrayList<>();
+//        list.forEach(item -> {
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("gid", item.getBaseKnifeId().toString());
+//            map.put("itemCode", item.getKnifeCode());
+//            map.put("itemName", item.getKnifeName());
+//            map.put("itemUnit", item.getKnifeUnit());
+//            map.put("itemType", item.getKnifeType());
+//            map.put("areaCode", item.getAreaCode());
+//            map.put("knifeLife", "100");
+//            map.put("knifeLifeUsed", item.getKnifeLife() == 0 ? null : String.valueOf(100 - item.getKnifeLife()));
+//            map.put("knifeLifeLeave", item.getKnifeLife() == 0 ? null : String.valueOf(item.getKnifeLife()));
+//            map.put("isLocked", item.getIsLocked());
+//            map.put("lockedStartTime", item.getLockedStartTime() == null ? null : item.getLockedStartTime());
+//            map.put("lockedEndTime", item.getLockedEndTime() == null ? null : item.getLockedEndTime());
+//            map.put("planSheet", item.getPlanSheet() == null ? null : item.getPlanSheet());
+//            map.put("outInfoList", item.getOutInfoList());
+//            result.add(map);
+//        });
 
         // 构建日志
         SysOperLog operLog = new SysOperLog();
@@ -128,7 +128,9 @@ public class BaseKnifeController extends BaseController {
 //        operLog.setJsonResult(JSON.toJSONString(result));
         operLogService.insertOperlog(operLog);
 
-        return result;
+        startPage();
+        List<BaseKnife> list = baseKnifeService.selectBaseKnifeList(baseKnife);
+        return getDataTable(list);
     }
 
     @PostMapping("/open/checkForAlignment")
diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java
index 72e7142..e302a9b 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java
@@ -31,7 +31,7 @@ public class WmsOutTaskController extends BaseController {
     /**
      * 查询出库任务列表
      */
-    @GetMapping("/open/list")
+    @GetMapping("/open/incompleteList")
     public TableDataInfo openList(WmsOutTask wmsOutTask) {
         startPage();
         wmsOutTask.setTaskState("0");