From 35a550c0399b589d8a3c40957fc8074468f9bd39 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 7 Jan 2025 17:18:33 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AD=90=E5=8D=B7=E9=87=8D?=
 =?UTF-8?q?=E9=87=8F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/controller/SlitterPdaController.java      |  6 ++++++
 .../sch/tasks/slitter/service/SlitterService.java |  7 +++++++
 .../slitter/service/impl/SlitterServiceImpl.java  | 15 +++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
index 82956087b..c4cf60834 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
@@ -163,6 +163,12 @@ public class SlitterPdaController {
     public ResponseEntity<Object> doSubRollWeightBinding(@RequestBody JSONObject param) {
         return new ResponseEntity<>(slitterDevices.doSubRollWeightBinding(param), HttpStatus.OK);
     }
+    @PostMapping("/doSubRollWeightBindingTip")
+    @Log("手持子卷重量绑定提示")
+    @SaIgnore
+    public ResponseEntity<Object> doSubRollWeightBindingTip(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterDevices.doSubRollWeightBindingTip(param), HttpStatus.OK);
+    }
     @PostMapping("/doUpShaftToSlitter")
     @Log("手持分切机上气胀轴")
     @SaIgnore
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
index 453732827..303107d37 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
@@ -291,4 +291,11 @@ public interface SlitterService {
      * @return
      */
     JSONObject doUpShaftToSlitterByDeviceTip(JSONObject param);
+
+    /**
+     * 子卷维护重量提示
+     * @param param
+     * @return
+     */
+    JSONObject doSubRollWeightBindingTip(JSONObject param);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index ea6aecb3b..544a588f9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -1869,4 +1869,19 @@ public class SlitterServiceImpl implements SlitterService {
         res.put("tip", tips.stream().collect(Collectors.joining(",")));
         return res;
     }
+
+    @Override
+    public JSONObject doSubRollWeightBindingTip(JSONObject param) {
+        log.info("手持维护重量 - {}", param);
+        //container_name: 子卷号
+        String containerName = param.getString("container_name");
+        Assert.notBlank(containerName, "子卷号不能为空!");
+        PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
+        String rollWeight = "子卷毛重：【" + plan.getWeight() + "】";
+        String paperWeight = "纸管重量：【" + plan.getPaper_weight() + "】";
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("tip", "系统记录的重量数值：" + rollWeight + ", " + paperWeight);
+        return res;
+    }
 }