From a436683e0017428d697b7e4a59f17595e64ba2e0 Mon Sep 17 00:00:00 2001 From: yanyang Date: Fri, 31 Mar 2023 10:27:55 +0800 Subject: [PATCH] =?UTF-8?q?slot=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WoPackagingBoxSubstrateController.java | 10 +++++++--- .../service/impl/WoPackagingBoxServiceBizImpl.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java index abea93d..f91a449 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java @@ -253,6 +253,13 @@ public class WoPackagingBoxSubstrateController { @LogOperation("合箱") public Result insertSubstrate(@RequestBody ChangePackingBoxDTO dto){ + //验证包装箱是否为存在 + String packagingBoxId = dto.getPackagingBoxId(); + QueryWrapper boxQueryWrapper = new QueryWrapper<>(); + boxQueryWrapper.eq(StringUtils.isNotBlank(packagingBoxId), WoPackagingBox.BOX_NO, packagingBoxId); + if(woPackagingBoxMapper.selectCount(boxQueryWrapper)== 0){ + return new Result().error(1,"该包装箱不存在,请重新输入"); + } //验证模组是否存在 QueryWrapper substrateQueryWrapper1 = new QueryWrapper<>(); substrateQueryWrapper1.eq(WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, dto.getWoSubstrateId()); @@ -274,9 +281,6 @@ public class WoPackagingBoxSubstrateController { } //验证该模组的线体、功率等级是否BoxID的线体、功率等级一致，一致，保存成功，数据发生更新。不一致，则显示保存失败，数据不发生更新 - String packagingBoxId = dto.getPackagingBoxId(); - QueryWrapper boxQueryWrapper = new QueryWrapper<>(); - boxQueryWrapper.eq(StringUtils.isNotBlank(packagingBoxId), WoPackagingBox.BOX_NO, packagingBoxId); WoPackagingBox box = woPackagingBoxMapper.selectList(boxQueryWrapper).get(0); if((substrate.getLineBody()==box.getLineBody()) && (substrate.getPowerLevel().equals(box.getPowerLevel())) ) diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java index 02bdf31..e4f19f7 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java @@ -142,7 +142,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo()); - wrapper.orderByDesc(WoPackagingBoxSubstrate.CREATE_TIME); + wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT); List woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper); dto.setSubstrateList(woPackagingBoxSubstrateList); return dto;