From e030a2d92c0e4f48031c48c97bb0e224dc222da8 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 5 Aug 2024 16:04:57 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=89=8B=E6=8C=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2-=E4=BA=BA=E5=B7=A5=E6=94=BE?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProductOutTwoController.java   |  7 ++++
 .../pda/service/ProductOutTwoService.java     |  9 +++++
 .../impl/ProductOutTwoServiceImpl.java        | 34 +++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
index 8ec74c83b..0489c1180 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
@@ -61,4 +61,11 @@ public class ProductOutTwoController {
         return new ResponseEntity<>(productOutTwoService.queryBoxIvt(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/confirmPass")
+    @Log("捆扎点位放行")
+    @SaIgnore
+    public ResponseEntity<Object> confirmPass(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(productOutTwoService.confirmPass(whereJson), HttpStatus.OK);
+    }
+
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
index 588e7e248..e398aa233 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
@@ -56,4 +56,13 @@ public interface ProductOutTwoService {
      * @return JSONObject： 返回前端参数
      */
     JSONObject queryBoxIvt(JSONObject whereJson);
+
+    /**
+     * 捆扎点位放行
+     * @param whereJson {
+     *                  point_code: 点位编码
+     * }
+     * @return JSONObject： 返回前端参数
+     */
+    JSONObject confirmPass(JSONObject whereJson);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
index e43f3f506..56c9a11aa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
@@ -1,6 +1,7 @@
 package org.nl.b_lms.pda.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -10,6 +11,8 @@ import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound;
 import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pda.st.service.impl.ProductionOutServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -116,4 +119,35 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService {
         return jo;
 
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject confirmPass(JSONObject whereJson) {
+        WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
+
+        if (ObjectUtil.isEmpty(whereJson.getString("point_code"))) {
+            throw new BadRequestException("点位不能为空!");
+        }
+
+        // 通知acs可离开
+        WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
+        JSONArray action_rows = new JSONArray();
+        JSONObject action_jo = new JSONObject();
+        action_jo.put("device_code", whereJson.getString("point_code"));
+        action_jo.put("code", "to_command");
+        action_jo.put("product_area", "BLK");
+        action_jo.put("value", "26");
+        action_rows.add(action_jo);
+        wmsToAcsService.action(action_rows);
+
+        // 更新点位载具、数量
+        JSONObject pointDao = pointTab.query("point_code = '" + whereJson.getString("point_code") + "'").uniqueResult(0);
+        pointDao.put("vehicle_code", "");
+        pointDao.put("vehicle_qty", 0);
+        WQLObject.getWQLObject("sch_base_point").update(pointDao);
+
+        JSONObject result = new JSONObject();
+        result.put("message", "成功放行!");
+        return result;
+    }
 }