bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购模块优化

This commit is contained in:
sxu 2024-11-20 12:17:37 +08:00
parent dcfb7fad06
commit efffcf2c6a
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
View File

@ -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, "入库已完成");

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
View File

@ -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)
{

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java
View File

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

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -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) {
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);
}
}

1
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
View File

@ -139,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
<if test="supplierId != null "> and pci.supplier_id = #{supplierId}</if>
<if test="taxRate != null "> and pci.tax_rate = #{taxRate}</if>
<if test="taskStatus != null "> and t.task_status = #{taskStatus}</if>
<if test="keyWord != null and keyWord != ''">
and (
t.code like concat('%', #{keyWord}, '%') or