Browse Source

bug修改

master
parent
commit
97be80b15b
  1. 3
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanBaseVO.java
  2. 3
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExcelVO.java
  3. 4
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanExportReqVO.java
  4. 3
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/vo/CountadjustPlanPageReqVO.java
  5. 4
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/countadjustPlan/CountadjustPlanDO.java
  6. 4
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/counRecord/CountRecordMainServiceImpl.java
  7. 2
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countadjustPlan/CountadjustPlanServiceImpl.java

3
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 枚举") @Schema(description = "盘点备件的类型A、B、C 枚举")
private String classification; private String classification;
@Schema(description = "库位类型")
private String type;
@Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895") @Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895")
private String isInAccount; private String isInAccount;

3
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 枚举") @ExcelProperty("盘点备件的类型A、B、C 枚举")
private String classification; private String classification;
@ExcelProperty("库位类型")
private String type;
@ExcelProperty("是否账内库TRUE账内FALSE账外") @ExcelProperty("是否账内库TRUE账内FALSE账外")
private String isInAccount; private String isInAccount;

4
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; package com.win.module.eam.controller.countadjustPlan.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
@ -21,6 +22,9 @@ public class CountadjustPlanExportReqVO {
@Schema(description = "盘点备件的类型A、B、C 枚举") @Schema(description = "盘点备件的类型A、B、C 枚举")
private String classification; private String classification;
@Schema(description = "库位类型")
private String type;
@Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895") @Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895")
private String isInAccount; private String isInAccount;

3
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 枚举") @Schema(description = "盘点备件的类型A、B、C 枚举")
private String classification; private String classification;
@Schema(description = "库位类型")
private String type;
@Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895") @Schema(description = "是否账内库TRUE账内FALSE账外", example = "19895")
private String isInAccount; private String isInAccount;

4
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 {
* 盘点备件的类型ABC 枚举 * 盘点备件的类型ABC 枚举
*/ */
private String classification; private String classification;
/**
* 是否账内库TRUE账内FALSE账外
*/
private String type;
/** /**
* 是否账内库TRUE账内FALSE账外 * 是否账内库TRUE账内FALSE账外
*/ */

4
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.setLocationNumber(countRecordDetailDO.getLocationNumber());
transactionCreateReqVO.setAreaNumber(countRecordDetailDO.getAreaNumber()); transactionCreateReqVO.setAreaNumber(countRecordDetailDO.getAreaNumber());
QueryWrapper<CountadjustPlanDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<CountadjustPlanDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("number", countRecordMainDO.getRequestNumber()); queryWrapper.eq("number", countJobMainDO.getNumber());
CountadjustPlanDO countadjustPlanDO =countadjustPlanMapper.selectOne(queryWrapper); CountadjustPlanDO countadjustPlanDO =countadjustPlanMapper.selectOne(queryWrapper);
transactionCreateReqVO.setIsInAccount(countadjustPlanDO.getIsInAccount()); transactionCreateReqVO.setType(countadjustPlanDO.getType());
transactionCreateReqVO.setInventoryAction(TransactionEnum.ADJUST.getCode()); transactionCreateReqVO.setInventoryAction(TransactionEnum.ADJUST.getCode());
list.add(transactionCreateReqVO); list.add(transactionCreateReqVO);
try{ try{

2
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); countJobMainMapper.insert(countJobMainDO);
//根据盘点计划查询盘点工单的子表中的备件数据 //根据盘点计划查询盘点工单的子表中的备件数据
QueryWrapper<ItemAccountsDO> itemAccountsDOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ItemAccountsDO> 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.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()); itemAccountsDOQueryWrapper.eq("available", BooleanTypeEnum.Y.getCode());
List<ItemAccountsDO> itemAccountsDOList = itemAccountsMapper.selectList(itemAccountsDOQueryWrapper); List<ItemAccountsDO> itemAccountsDOList = itemAccountsMapper.selectList(itemAccountsDOQueryWrapper);

Loading…
Cancel
Save