From dff2f324cc1cf8985f0216063b745a88e34bfcd5 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sun, 9 Oct 2022 18:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/pda/mps/rest/EmptyTubeController.java | 27 ++++++++++++-------
 .../wms/pda/mps/service/EmptyTubeService.java | 21 +++++++++++++++
 .../service/impl/EmptyTubeServiceImpl.java    | 25 +++++++++++++++++
 3 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 nladmin-system/src/main/java/org/nl/wms/pda/mps/service/EmptyTubeService.java
 create mode 100644 nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyTubeServiceImpl.java

diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java
index c5352d3d0..0e8d6499c 100644
--- a/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java
+++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java
@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.wms.pda.mps.service.BakingService;
-import org.nl.wms.pda.mps.service.RawFoilService;
+import org.nl.wms.pda.mps.service.EmptyTubeService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,17 +17,24 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "烘烤工序")
-@RequestMapping("api/pda/baking")
+@Api(tags = "空管入库")
+@RequestMapping("api/pda/empty")
 @Slf4j
-public class BakingController {
+public class EmptyTubeController {
 
-    private final BakingService bakingService;
+    private final EmptyTubeService emptyTubeService;
 
-    @PostMapping("/ovenInAndOut")
-    @Log("烘箱出入")
-    @ApiOperation("烘箱出入")
-    public ResponseEntity<Object> queryRawFoil(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(bakingService.ovenInAndOut(whereJson), HttpStatus.OK);
+    @PostMapping("/queryMaterialInfo")
+    @Log("空纸管库设备物料初始化查询")
+    @ApiOperation("空纸管库设备物料初始化查询")
+    public ResponseEntity<Object> queryMaterialInfo(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(emptyTubeService.queryMaterialInfo(whereJson), HttpStatus.OK);
+    }
+
+    @PostMapping("/confirm")
+    @Log("入库确认")
+    @ApiOperation("入库确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(emptyTubeService.confirm(whereJson), HttpStatus.OK);
     }
 }
diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/EmptyTubeService.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/EmptyTubeService.java
new file mode 100644
index 000000000..448fa30c3
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/EmptyTubeService.java
@@ -0,0 +1,21 @@
+package org.nl.wms.pda.mps.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+public interface EmptyTubeService {
+
+    /**
+     * 空纸管库设备物料初始化查询
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject queryMaterialInfo(JSONObject whereJson);
+
+    /**
+     * 入库确认
+     * @param whereJson /
+     * @return JSONObject
+     */
+    JSONObject confirm(JSONObject whereJson);
+
+}
diff --git a/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyTubeServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyTubeServiceImpl.java
new file mode 100644
index 000000000..5b77c860b
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyTubeServiceImpl.java
@@ -0,0 +1,25 @@
+package org.nl.wms.pda.mps.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.wms.pda.mps.service.BakingService;
+import org.nl.wms.pda.mps.service.EmptyTubeService;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class EmptyTubeServiceImpl implements EmptyTubeService {
+
+
+    @Override
+    public JSONObject queryMaterialInfo(JSONObject whereJson) {
+        JSONObject result = new JSONObject();
+        result.put("code", "1");
+        result.put("desc", "查询成功");
+        return result;
+    }
+
+
+}