From f19fd77be60dc1bbc066589bca64a74664d3857b Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 16 Aug 2024 11:12:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=8B=E6=8C=81=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E9=87=8D=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/controller/SlitterPdaController.java  |  6 +++++
 .../tasks/slitter/service/SlitterService.java |  2 ++
 .../service/impl/SlitterServiceImpl.java      | 24 +++++++++++++++++++
 3 files changed, 32 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 94b770996..758986e84 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
@@ -157,4 +157,10 @@ public class SlitterPdaController {
     public ResponseEntity<Object> doStockAreaUnbinding(@RequestBody JSONObject param) {
         return new ResponseEntity<>(slitterDevices.doStockAreaUnbinding(param), HttpStatus.OK);
     }
+    @PostMapping("/doSubRollWeightBinding")
+    @Log("手持子卷重量绑定")
+    @SaIgnore
+    public ResponseEntity<Object> doSubRollWeightBinding(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterDevices.doSubRollWeightBinding(param), HttpStatus.OK);
+    }
 }
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 bc25be663..e78eade45 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
@@ -249,4 +249,6 @@ public interface SlitterService {
      * @return /
      */
     JSONObject markingFoilSlittingToCache(JSONObject param);
+
+    JSONObject doSubRollWeightBinding(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 cc4423499..d06888fa5 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
@@ -1,6 +1,7 @@
 package org.nl.b_lms.sch.tasks.slitter.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
@@ -1563,4 +1564,27 @@ public class SlitterServiceImpl implements SlitterService {
         }
         return res;
     }
+
+    @Override
+    public JSONObject doSubRollWeightBinding(JSONObject param) {
+        log.info("手持维护重量 - {}", param);
+        //container_name: 子卷号, roll_weight: 子卷重量, paper_weight：纸管重量
+        String containerName = param.getString("container_name");
+        Assert.notBlank(containerName, "子卷号不能为空!");
+        String rollWeight = param.getString("roll_weight");
+        String paperWeight = param.getString("paper_weight");
+        PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
+        if (ObjectUtil.isNotEmpty(rollWeight)) {
+            plan.setWeight(rollWeight);
+        }
+        if (ObjectUtil.isNotEmpty(paperWeight)) {
+            plan.setPaper_weight(paperWeight);
+        }
+        TaskUtils.updateOptMessageBySlitterPlan(plan);
+        slittingproductionplanService.updateById(plan);
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "重量更新成功!");
+        return res;
+    }
 }