From bd5ae21530de5aeca857fe81a251c9ec4c030143 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 27 Jul 2023 15:33:37 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=82=A8=E6=96=99=E4=BB=93=E9=87=8D?= =?UTF-8?q?=E9=87=8F=E4=B8=8A=E7=BA=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda_manage/pda/controller/PdaWashController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java index cb9b3b1a..6a88c70b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java @@ -31,6 +31,8 @@ import org.nl.wms.scheduler_manage.service.extendtask.wash.WashSendMaterialQZTas import org.nl.wms.scheduler_manage.service.extendtask.wash.WashSendMaterialTask; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; +import org.nl.wms.system_manage.service.param.ISysParamService; +import org.nl.wms.system_manage.service.param.dao.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -68,6 +70,8 @@ public class PdaWashController { private WashSendMaterialTask washSendMaterialTask; @Autowired private WashSendMaterialQZTask washSendMaterialQZTask; + @Autowired + private ISysParamService paramService; @PostMapping("/specList") @SaIgnore @@ -172,8 +176,12 @@ public class PdaWashController { throw new BadRequestException("选择的储料仓必须是相同物料"); } double sum = list.stream().mapToDouble(a->a.getDeviceinstor_weight().doubleValue()).sum(); + Param one = paramService.getOne(new QueryWrapper().eq("code", "LIMIT_WEIGHT")); + if (one!=null && StringUtils.isNotEmpty(one.getValue())){ + LIMIT_WEIGHT = Double.valueOf(one.getValue()); + } if (sum>LIMIT_WEIGHT){ - throw new BadRequestException("选择的储料仓必物料总重量大于150公斤"); + throw new BadRequestException("选择的储料仓必物料总重量大于"+LIMIT_WEIGHT+"公斤"); } return list; }