From cca9e80cda5e59cf0480347dca93a97224bbb17e Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 7 Jun 2024 09:23:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BA=B8=E7=AE=A1=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=89=A3=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/slitter/controller/SlitterController.java  |  7 ++++---
 .../slitter/service/impl/SlitterServiceImpl.java     | 12 ++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java
index c1125a354..037f008a8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java
@@ -72,9 +72,10 @@ public class SlitterController {
     public ResponseEntity<Object> create6(@RequestBody JSONObject entity){
         return new ResponseEntity<>(slitterService.mesGetFinishWeighingOfWasteFoil(entity), HttpStatus.CREATED);
     }
-    @PostMapping("/test7")
-    @Log("1111")
-    public ResponseEntity<Object> create7(@RequestBody JSONObject entity){
+    @PostMapping("/calPaperNum")
+    @Log("扣除纸管库存")
+    @SaIgnore
+    public ResponseEntity<Object> calPaperNum(@RequestBody JSONObject entity){
         return new ResponseEntity<>(slitterService.acsToReduceTube(entity), HttpStatus.CREATED);
     }
 }
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 9d197bcf7..a65ce06fa 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
@@ -45,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -707,13 +708,20 @@ public class SlitterServiceImpl implements SlitterService {
             throw new BadRequestException("设备：" + param.getString("device_code") + "排数不能为空");
         }
         BstIvtStockingivt device = stockingivtService.getPointByCode(param.getString("device_code"), false);
+        MdPbPapervehicle mdPbPapervehicle = papervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, device.getVehicle_code())
+                .eq(MdPbPapervehicle::getRow_num, param.getString("row_num")));
+        int qty = mdPbPapervehicle.getQty().intValue();
+        if (qty <= 0) {
+            throw new BadRequestException("当前物料数量为0!");
+        }
+
         UpdateWrapper<MdPbPapervehicle> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("vehicle_code", device.getVehicle_code())
                 .eq("row_num", param.getString("row_num"))
                 .setSql("qty=qty-1");
-        papervehicleService.update(updateWrapper);
+
         JSONObject res = new JSONObject();
-        res.put("code", HttpStatus.HTTP_OK);
+        res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "请求成功!");
         return res;
     }