From 2ef860727fa76cb30f5574f5890c2fc93dff4532 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 4 Apr 2025 19:58:42 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=8F=8D=E9=A6=88=E9=87=8D=E9=87=8F?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=BA=E7=A9=BA=E6=89=8D=E5=8F=AF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20fix:=20=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=94=B9=E4=B8=BAfor=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/SlitterDownTrussTask.java | 10 ++++++++-- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 14 +++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java index 4e6f4caa4..380582f5d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java @@ -127,7 +127,10 @@ public class SlitterDownTrussTask extends AbstractAcsTask { TaskUtils.updateOptMessageBySlitterPlan(downPlan); }); log.info("即将下卷的上下轴的子卷号数据4：{}", downPlans); - slittingproductionplanService.updateBatchById(downPlans); +// slittingproductionplanService.updateBatchById(downPlans); + for (int i = 0; i < downPlans.size(); i++) { + slittingproductionplanService.updateById(downPlans.get(i)); + } // 获取气胀轴编码 // 筛选上下轴各一条 PdmBiSlittingproductionplan upPlan = downPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null); @@ -159,7 +162,10 @@ public class SlitterDownTrussTask extends AbstractAcsTask { p1.setUpdate_optname(SecurityUtils.getCurrentNickName()); p1.setUpdate_optid(SecurityUtils.getCurrentUserId()); }); - slittingproductionplanService.updateBatchById(plans); +// slittingproductionplanService.updateBatchById(plans); + for (int i = 0; i < plans.size(); i++) { + slittingproductionplanService.updateById(plans.get(i)); + } // 设备禁用 point1.setUp_qzzno(""); point1.setDown_qzzno(""); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 1c5ab8bcb..e605c2fa5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -2476,13 +2476,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject res = new JSONObject(); String subVolume = param.getString("sub_volume"); String weight = param.getString("weight1"); - PdmBiSlittingproductionplan containerName = slittingproductionplanService.getByContainerName(subVolume); - if (ObjectUtil.isEmpty(containerName)) { - throw new BadRequestException("子卷号[" + subVolume + "]对应的分切计划不存在!"); - } - if (ObjectUtil.isNotEmpty(containerName.getWeight())) { - throw new BadRequestException("子卷号[" + subVolume + "]不允许重复更新重量!"); - } +// PdmBiSlittingproductionplan containerName = slittingproductionplanService.getByContainerName(subVolume); +// if (ObjectUtil.isEmpty(containerName)) { +// throw new BadRequestException("子卷号[" + subVolume + "]对应的分切计划不存在!"); +// } +// if (ObjectUtil.isNotEmpty(containerName.getWeight())) { +// throw new BadRequestException("子卷号[" + subVolume + "]不允许重复更新重量!"); +// } LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); updateWrapper.set(PdmBiSlittingproductionplan::getWeight, NumberUtil.round(weight, 2).toString()) .eq(PdmBiSlittingproductionplan::getContainer_name, subVolume);