From 97be80b15bcee78c8f25ae43bd61a1dea2806dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 10 May 2024 17:26:26 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/countadjustPlan/vo/CountadjustPlanBaseVO.java | 3 +++ .../controller/countadjustPlan/vo/CountadjustPlanExcelVO.java | 3 +++ .../countadjustPlan/vo/CountadjustPlanExportReqVO.java | 4 ++++ .../countadjustPlan/vo/CountadjustPlanPageReqVO.java | 3 +++ .../eam/dal/dataobject/countadjustPlan/CountadjustPlanDO.java | 4 ++++ .../eam/service/counRecord/CountRecordMainServiceImpl.java | 4 ++-- .../service/countadjustPlan/CountadjustPlanServiceImpl.java | 2 +- 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanBaseVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanBaseVO.java index 334371b..5ea7f09 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanBaseVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanBaseVO.java @@ -23,6 +23,9 @@ public class CountadjustPlanBaseVO { @Schema(description = "盘点备件的类型A、B、C 枚举") private String classification; + @Schema(description = "库位类型") + private String type; + @Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895") private String isInAccount; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExcelVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExcelVO.java index a090238..b605f44 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExcelVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExcelVO.java @@ -28,6 +28,9 @@ public class CountadjustPlanExcelVO { @ExcelProperty("盘点备件的类型A、B、C 枚举") private String classification; + @ExcelProperty("库位类型") + private String type; + @ExcelProperty("是否账内库TRUE账内FALSE账外") private String isInAccount; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExportReqVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExportReqVO.java index 35d0bc4..a8066b1 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExportReqVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExportReqVO.java @@ -1,5 +1,6 @@ package com.win.module.eam.controller.countadjustPlan.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -21,6 +22,9 @@ public class CountadjustPlanExportReqVO { @Schema(description = "盘点备件的类型A、B、C 枚举") private String classification; + @Schema(description = "库位类型") + private String type; + @Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895") private String isInAccount; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanPageReqVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanPageReqVO.java index 2155ff1..41de7fe 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanPageReqVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanPageReqVO.java @@ -23,6 +23,9 @@ public class CountadjustPlanPageReqVO extends PageParam { @Schema(description = "盘点备件的类型A、B、C 枚举") private String classification; + @Schema(description = "库位类型") + private String type; + @Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895") private String isInAccount; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/countadjustPlan/CountadjustPlanDO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/countadjustPlan/CountadjustPlanDO.java index 64e4b5f..60686d4 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/countadjustPlan/CountadjustPlanDO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/countadjustPlan/CountadjustPlanDO.java @@ -37,6 +37,10 @@ public class CountadjustPlanDO extends BaseDO { * 盘点备件的类型A、B、C 枚举 */ private String classification; + /** + * 是否账内库TRUE账内FALSE账外 + */ + private String type; /** * 是否账内库TRUE账内FALSE账外 */ diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/counRecord/CountRecordMainServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/counRecord/CountRecordMainServiceImpl.java index 5d8f51e..d3cf70a 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/counRecord/CountRecordMainServiceImpl.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/counRecord/CountRecordMainServiceImpl.java @@ -147,9 +147,9 @@ public class CountRecordMainServiceImpl implements CountRecordMainService { transactionCreateReqVO.setLocationNumber(countRecordDetailDO.getLocationNumber()); transactionCreateReqVO.setAreaNumber(countRecordDetailDO.getAreaNumber()); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("number", countRecordMainDO.getRequestNumber()); + queryWrapper.eq("number", countJobMainDO.getNumber()); CountadjustPlanDO countadjustPlanDO =countadjustPlanMapper.selectOne(queryWrapper); - transactionCreateReqVO.setIsInAccount(countadjustPlanDO.getIsInAccount()); + transactionCreateReqVO.setType(countadjustPlanDO.getType()); transactionCreateReqVO.setInventoryAction(TransactionEnum.ADJUST.getCode()); list.add(transactionCreateReqVO); try{ diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countadjustPlan/CountadjustPlanServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countadjustPlan/CountadjustPlanServiceImpl.java index a296ae5..8db1f3e 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countadjustPlan/CountadjustPlanServiceImpl.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countadjustPlan/CountadjustPlanServiceImpl.java @@ -66,7 +66,7 @@ public class CountadjustPlanServiceImpl implements CountadjustPlanService { countJobMainMapper.insert(countJobMainDO); //根据盘点计划查询盘点工单的子表中的备件数据 QueryWrapper itemAccountsDOQueryWrapper = new QueryWrapper<>(); - itemAccountsDOQueryWrapper.eq("is_in_account", countadjustPlan.getIsInAccount()); + itemAccountsDOQueryWrapper.eq("type", countadjustPlan.getType()); itemAccountsDOQueryWrapper.inSql("item_number", "SELECT number FROM `basic_item` WHERE number=basic_item_accounts.item_number AND classification='"+ countadjustPlan.getClassification() + "'"); itemAccountsDOQueryWrapper.eq("available", BooleanTypeEnum.Y.getCode()); List itemAccountsDOList = itemAccountsMapper.selectList(itemAccountsDOQueryWrapper);