From 3886dce826f0d141eecba692f49bbfcdbfc9c076 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 29 Jun 2024 17:34:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=BA=B8=E7=AE=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index 9842b51b5..48bbb2d7e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -239,7 +239,7 @@ public class SlitterTaskUtil { .mapToObj(String::valueOf) .toArray(String[]::new); param.put("to_material", String.join(",", material_codes)); - param.put("to_spec", String.join(",", material_codes)); + param.put("to_spec", String.join(",", material_specs)); param.put("to_qty", String.join(",", qtysStr)); param.put("device_code", material_specs); } From 964ce2a306eeabce6ef54c31fba8af0031f7094e Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 29 Jun 2024 18:12:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=A4=87=E8=B4=A7=E7=BA=B8=E7=AE=A1?= =?UTF-8?q?=E6=89=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/service/impl/SlitterServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 6005d5ccf..e11a6f492 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 @@ -756,7 +756,13 @@ public class SlitterServiceImpl implements SlitterService { updateWrapper.eq("vehicle_code", device.getVehicle_code()) .eq("row_num", param.getString("row_num")) .setSql("qty=qty-1"); - + papervehicleService.update(updateWrapper); + // 检查更新后的 qty 是否为 0，然后删除相应的记录 + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.eq("vehicle_code", device.getVehicle_code()) + .eq("row_num", param.getString("row_num")) + .eq("qty", "0"); + papervehicleService.remove(deleteWrapper); JSONObject res = new JSONObject(); res.put("status", HttpStatus.HTTP_OK); res.put("message", "请求成功!");