From c77fe6d3ad5d9a90ec12fd3e87820f2ab9afc20e Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 13 May 2024 10:40:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/controller/item/vo/ItemPageReqVO.java | 3 +++ .../win/module/eam/dal/mysql/item/ItemMapper.java | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java index ed8c8aa..323a8e0 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemPageReqVO.java @@ -57,6 +57,9 @@ public class ItemPageReqVO extends PageParam { @Schema(description = "价格", example = "4") private BigDecimal price; + @Schema(description = "0：正常查询1查询的库位不包含已存在台账信息") + private String flag; + @Schema(description = "描述") private String describes; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java index 4573fb1..bab8f4c 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/item/ItemMapper.java @@ -25,11 +25,15 @@ import java.util.Map; public interface ItemMapper extends BaseMapperX { default PageResult selectPage(ItemPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ItemDO::getNumber, reqVO.getNumber()) - .eqIfPresent(ItemDO::getAvailable, reqVO.getAvailable()) - .likeIfPresent(ItemDO::getName, reqVO.getName()) - .orderByDesc(ItemDO::getId)); + LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); + wrapperX.eqIfPresent(ItemDO::getNumber, reqVO.getNumber()); + wrapperX.eqIfPresent(ItemDO::getAvailable, reqVO.getAvailable()); + wrapperX.likeIfPresent(ItemDO::getName, reqVO.getName()); + if("1".equals(reqVO.getFlag())){//查询排除有台账的备件 + wrapperX.notInSql(ItemDO::getNumber,"select DISTINCT a.item_number from basic_item_accounts a where a.available = 'TRUE' and a.deleted = 0"); + } + wrapperX.orderByDesc(ItemDO::getId); + return selectPage(reqVO,wrapperX); } default List selectList(ItemExportReqVO reqVO) { From 7ab643d09b744cf842f769a9dc8bf98965956dd9 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 13 May 2024 11:26:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/controller/transaction/vo/TransactionRespVO.java | 5 ++++- .../win/module/eam/enums/transaction/TransactionEnum.java | 1 + .../eam/service/itemaccounts/ItemAccountsServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionRespVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionRespVO.java index 9d556f9..11946a9 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionRespVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionRespVO.java @@ -5,10 +5,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 库存事务 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class TransactionRespVO extends TransactionBaseVO { - + @Schema(description = "创建时间") + private LocalDateTime createTime; } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/enums/transaction/TransactionEnum.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/enums/transaction/TransactionEnum.java index 1ed27ed..3d9f35d 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/enums/transaction/TransactionEnum.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/enums/transaction/TransactionEnum.java @@ -9,6 +9,7 @@ public enum TransactionEnum { ADJUST("ADJUST", "盘点调整"), NEW_IN("NEWIN", "新到货入库"), IN_IN("ININ", "账内入库"), + OUT_IN("OUTIN", "账外入库"), NEW_TURN_IN("NEWTURNIN", "新到货转账内入库"), NEW_TURN_OUT("NEWTURNOUT", "新到货转账内出库"), diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java index 37989fb..c6dd523 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java @@ -413,7 +413,7 @@ public class ItemAccountsServiceImpl implements ItemAccountsService { transactionCreateReqVO.setDescribes("备件导入账内入库");//描述 } if(itemAccountsDO1.getType().equals(ItemAccountStatusEnum.OUT.getCode())){//账外 - transactionCreateReqVO.setInventoryAction(TransactionEnum.IN_IN.getCode()); + transactionCreateReqVO.setInventoryAction(TransactionEnum.OUT_IN.getCode()); transactionCreateReqVO.setDescribes("备件导入账外入库");//描述 } transactionCreateReqVO.setType(itemAccountsDO1.getType());