From e68784a7f17654af96d45a3f57b9fbb12de0d4a7 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 07 八月 2025 16:18:02 +0800 Subject: [PATCH] # --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryServiceImpl.java | 5 +++-- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 19 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java index 971f036..c6bec07 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java @@ -388,23 +388,20 @@ InTaskMsgDto inTaskMsgDto = new InTaskMsgDto(); - int sRow = deviceBind.getStartRow(); - int eRow = deviceBind.getEndRow(); int deviceQty = deviceBind.getDeviceQty(); // ===============>>>> 寮�濮嬫墽琛� curRow = deviceBind.getCurrentRow(); - //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿 - for (int i = times; i <= deviceQty * 2; i++) { - int[] locNecessaryParameters = LocUtils.LocNecessaryParameters(deviceBind, curRow, deviceQty); - curRow = locNecessaryParameters[1]; - channel = locNecessaryParameters[2]; - rowCount = locNecessaryParameters[0]; - nearRow = locNecessaryParameters[3]; - break; - } + //鑾峰彇鎺� + int[] locNecessaryParameters = LocUtils.LocNecessaryParameters(deviceBind, curRow, deviceQty); + curRow = locNecessaryParameters[1]; + channel = locNecessaryParameters[2]; + rowCount = locNecessaryParameters[0]; + nearRow = locNecessaryParameters[3]; + + if (nearRow == 0) { throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満"); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryServiceImpl.java index 13530da..702845a 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.exception.BusinessException; +import com.vincent.rsf.server.manager.entity.DeliveryItem; import com.vincent.rsf.server.manager.enums.AsnExceStatus; import com.vincent.rsf.server.manager.mapper.DeliveryMapper; import com.vincent.rsf.server.manager.entity.Delivery; @@ -28,11 +29,11 @@ throw new BusinessException("鏁版嵁閿欒锛氬崟鎹俊鎭笉瀛樺湪锛侊紒"); } deliveries.forEach(delivery -> { - if (delivery.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)){ + if (delivery.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)){ if (!this.removeById(delivery.getId())) { throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒"); } - if (!deliveryItemService.removeById(delivery.getId())) { + if (!deliveryItemService.remove(new LambdaQueryWrapper<DeliveryItem>().eq(DeliveryItem::getDeliveryId,delivery.getId()))) { throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛�1"); } } else { -- Gitblit v1.9.1