From efffcf2c6af5639f6043db5dc7020bc7d22246bf Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 20 Nov 2024 12:17:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A8=A1=E5=9D=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/enums/PurchaseTaskStatusEnum.java | 1 - .../bonus/material/ma/controller/MachineController.java | 2 +- .../material/purchase/domain/dto/PurchaseQueryDto.java | 4 ++-- .../service/impl/PurchaseCheckInfoServiceImpl.java | 8 +++++--- .../mapper/material/purchase/PurchaseCheckInfoMapper.xml | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java index 3846f5a7..4096a158 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java @@ -16,7 +16,6 @@ public enum PurchaseTaskStatusEnum { TO_BIND_AFTER_REJECT(13, "待绑定(驳回后)"), TO_STORE_AFTER_REJECT(14, "待入库(驳回后)"), IN_STORE(19, "已入库"), - TASK_TO_START(20, "入库待开始"), TASK_IN_PROGRESS(21, "入库进行中"), TASK_FINISHED(22, "入库已完成"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java index a01cfd8a..cd045ebb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java @@ -44,7 +44,7 @@ public class MachineController extends BaseController { * 查询机具设备管理列表 */ @ApiOperation(value = "查询机具设备管理列表1") - @RequiresPermissions("ma:machine:list") + //@RequiresPermissions("ma:machine:list") @GetMapping("/list") public TableDataInfo list(Machine machine) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java index b4104621..04f822f9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java @@ -37,8 +37,8 @@ public class PurchaseQueryDto { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; -// @ApiModelProperty(value = "外层任务状态") -// private Integer taskStatus; + @ApiModelProperty(value = "外层任务状态") + private Integer taskStatus; @ApiModelProperty(value = "关键字") private String keyWord; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 82e40764..d2fc7644 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -144,7 +144,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { (o.getStatus().equals(PurchaseTaskStatusEnum.TO_BIND.getStatus()) || o.getStatus().equals(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus())))).collect(Collectors.toList()); OptionalInt minStatus = purchaseCheckDetails.stream().mapToInt(PurchaseCheckDetails::getStatus).min(); if (isAllowPartTransfer) { - purchaseCheckDetails = purchaseCheckDetails.stream().filter(o -> purchaseQueryDto.getStatusList().contains(o.getStatus())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(purchaseQueryDto.getStatusList())) { + purchaseCheckDetails = purchaseCheckDetails.stream().filter(o -> purchaseQueryDto.getStatusList().contains(o.getStatus())).collect(Collectors.toList()); + } purchaseInfo.setPurchaseMaTypeName(purchaseCheckDetailsMapper.selectMaTypeNameByTaskAndStatusList(purchaseInfo.getTaskId(), purchaseQueryDto.getStatusList())); } else { purchaseInfo.setPurchaseMaTypeName(purchaseCheckDetailsMapper.selectMaTypeNameByTaskAndStatusList(purchaseInfo.getTaskId(), new ArrayList<>())); @@ -220,7 +222,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId()); String taskCode = genderTaskCode(thisMonthMaxOrder); TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId(), - PurchaseTaskStatusEnum.TASK_TO_START.getStatus(), + PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus(), purchaseCheckInfo.getPurchaseCheckInfo().getCompanyId(), thisMonthMaxOrder + 1, taskCode); tmTask.setCreateTime(DateUtils.getNowDate()); tmTaskMapper.insertTmTask(tmTask); @@ -317,7 +319,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { tmTaskMapper.updateTmTask(new TmTask() .setTaskId(details.getTaskId()) .setTaskType(TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId()) - .setTaskStatus(PurchaseTaskStatusEnum.TASK_TO_START.getStatus())); + .setTaskStatus(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus())); extractedFile(details); } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml index d6d5e0c8..0fc90673 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml @@ -139,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pci.purchaser = #{purchaser} and pci.supplier_id = #{supplierId} and pci.tax_rate = #{taxRate} + and t.task_status = #{taskStatus} and ( t.code like concat('%', #{keyWord}, '%') or