Merge branch 'master' of http://dev.ccwin-in.com:3000/tianhe_java/tianhe

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;
 

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;
 }

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<ItemDO> {
 
     default PageResult<ItemDO> selectPage(ItemPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ItemDO>()
+        LambdaQueryWrapperX<ItemDO> wrapperX = new LambdaQueryWrapperX<>();
-                .eqIfPresent(ItemDO::getNumber, reqVO.getNumber())
+        wrapperX.eqIfPresent(ItemDO::getNumber, reqVO.getNumber());
-                .eqIfPresent(ItemDO::getAvailable, reqVO.getAvailable())
+        wrapperX.eqIfPresent(ItemDO::getAvailable, reqVO.getAvailable());
-                .likeIfPresent(ItemDO::getName, reqVO.getName())
+        wrapperX.likeIfPresent(ItemDO::getName, reqVO.getName());
-                .orderByDesc(ItemDO::getId));
+        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<ItemDO> selectList(ItemExportReqVO reqVO) {

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", "新到货转账内出库"),
 

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());