From 96c44aa9e1de80363c379ee2c18d92b165895dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com> Date: Thu, 29 May 2025 10:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=88=A4=E6=96=AD=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=8E=A5=E5=8F=A3(=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=A5=E5=BA=93=E5=8C=BA=E5=88=86=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=85=A5=E5=BA=93=E5=8F=AA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=93=E5=BA=93=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/ReqValidateComponentExistenceDto.java | 4 ++++ .../service/impl/EbikeComponentServiceImpl.java | 15 +++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqValidateComponentExistenceDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqValidateComponentExistenceDto.java index c1d7af05..22540c58 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqValidateComponentExistenceDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqValidateComponentExistenceDto.java @@ -13,4 +13,8 @@ public class ReqValidateComponentExistenceDto { * 部件类型编号 如代表电池，头盔等 */ private String componentType; + /** + * 是否新增入库 + */ + private Boolean isNew = false; } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java index 23842ee9..380dfed9 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java @@ -545,14 +545,19 @@ public class EbikeComponentServiceImpl implements EbikeComponentService { return JsonResult.success(resComponentOutRecordInfoDto); } - + /** + * 根据部件编号 和部件类型验证仓库中是否已经存在 + * @params + * @return + */ @Override public JsonResult validateComponentExistence(ReqValidateComponentExistenceDto params) { try { String componentCode = params.getComponentCode(); String componentType = params.getComponentType(); + Boolean isNew = params.getIsNew(); // 检查是否存在重复记录 - boolean duplicateEntry = isDuplicateEntry(componentCode, componentType); + boolean duplicateEntry = isDuplicateEntry(componentCode, componentType,isNew); // 返回成功响应 return JsonResult.success(duplicateEntry); } catch (Exception e) { @@ -808,11 +813,13 @@ public class EbikeComponentServiceImpl implements EbikeComponentService { ebikeComponentOutRecords.setState("2"); ebikeComponentOutRecordsMapper.update(ebikeComponentOutRecords); } - public boolean isDuplicateEntry(String itemCode,String componentType) { + public boolean isDuplicateEntry(String itemCode,String componentType,Boolean isNew) { QueryWrapper query = new QueryWrapper(); query.eq("item_code", itemCode); query.eq("component_type", componentType); - query.eq("state", 1); // 假设 1 表示已已入库 + if(!isNew){ + query.eq("state", 1); // 假设 1 表示已已入库 + } long count = ebikeComponentInventoryMapper.selectCountByQuery(query); // 查询符合条件的记录数 return count > 0; // 如果记录数大于 0，说明已经存在重复入库 }