From 1c2be9b16e014a3d742a4bf61bade8d40ad7235d Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Sat, 22 Oct 2022 10:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/ext/acs/rest/AcsToWmsController.java  |  8 +++++
 .../wms/ext/acs/service/AcsToWmsService.java  |  9 ++++++
 .../acs/service/impl/AcsToWmsServiceImpl.java | 29 +++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
index 97a2f9f..3777dca 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
@@ -52,4 +52,12 @@ public class AcsToWmsController {
     public ResponseEntity<Object> apply(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK);
     }
+
+    @PostMapping("/towApply")
+    @Log("二次申请任务")
+    @ApiOperation("二次申请任务")
+    @SaCheckPermission("menu:list")
+    public ResponseEntity<Object> towApply(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(acsToWmsService.towApply(whereJson), HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
index a82f446..382ba6d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
@@ -41,4 +41,13 @@ public interface AcsToWmsService {
      * @return JSONObject
      */
     JSONObject apply(JSONObject whereJson);
+
+    /**
+     * ACS客户端--->LMS服务端
+     *  二次任务申请
+     *
+     * @param whereJson 条件
+     * @return JSONObject
+     */
+    JSONObject towApply(JSONObject whereJson);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 0602971..7a0be85 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -357,6 +357,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return null;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject towApply(JSONObject whereJson) {
+        /*
+         * 1.入空载具
+         * 2.出空载具
+         * 3.入物料
+         * 4.出物料
+         */
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
+        WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表
+
+        String task_id = whereJson.getString("task_id");
+
+        JSONObject jsonTask = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0);
+        JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
+        if (StrUtil.equals(jsonTask.getString("acs_task_type"), "1")) {
+            // 根据 point_code2 的类型找对对应的列
+            pointTab.query("region_id = '"+jsonPoint2.getString("region_id")+
+                    "' and block_num = '"+jsonPoint2.getString("block_num")+
+                    "' and col_num = '"+jsonPoint2.getString("col_num")+
+                    "' and point_status = '2' order by in_empty_seq ASC").uniqueResult(0);
+
+        }
+
+
+        return null;
+    }
+
     @LokiLog(type = LokiLogType.ACS_TO_LMS)
     @Transactional(rollbackFor = Exception.class)
     public JSONObject inCreateRegion(JSONObject json) {