licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报工补充代码及入库不查对应库区库存问题

Browse Source
This commit is contained in:
Ledo 2025-03-05 23:33:15 +08:00
parent 254ab45896
commit 111b101e4c
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageMaterialMapper.java
View File

@ -48,6 +48,7 @@ public interface StorageMaterialMapper extends BaseMapperX<StorageMaterialDO> {
query.selectAll(StorageMaterialDO.class) query.selectAll(StorageMaterialDO.class)
.select("ifnull(sum(t.storage_ok_qty),0) mat_rest") .select("ifnull(sum(t.storage_ok_qty),0) mat_rest")
.select("count(t.id) num") .select("count(t.id) num")
.orderByDesc(StorageMaterialDO::getId); .orderByDesc(StorageMaterialDO::getId);
query.like(!StringUtils.isEmpty(reqVO.getMatType()),StorageMaterialDO::getMatType, reqVO.getMatType()) query.like(!StringUtils.isEmpty(reqVO.getMatType()),StorageMaterialDO::getMatType, reqVO.getMatType())
@ -55,8 +56,9 @@ public interface StorageMaterialMapper extends BaseMapperX<StorageMaterialDO> {
.like(!StringUtils.isEmpty(reqVO.getMatName()), StorageMaterialDO::getMatName, reqVO.getMatName()) .like(!StringUtils.isEmpty(reqVO.getMatName()), StorageMaterialDO::getMatName, reqVO.getMatName())
.like(!StringUtils.isEmpty(reqVO.getMatCode()), StorageMaterialDO::getMatCode, reqVO.getMatCode()) .like(!StringUtils.isEmpty(reqVO.getMatCode()), StorageMaterialDO::getMatCode, reqVO.getMatCode())
.like(!StringUtils.isEmpty(reqVO.getLotNo()),StorageMaterialDO::getLotNo, reqVO.getLotNo()) .like(!StringUtils.isEmpty(reqVO.getLotNo()),StorageMaterialDO::getLotNo, reqVO.getLotNo())
.eq(reqVO.getWhId()!=null,StorageMaterialDO::getWhId,reqVO.getWhId())
.groupBy(StorageMaterialDO::getId).orderByDesc(StorageMaterialDO::getId); .groupBy(StorageMaterialDO::getId).orderByDesc(StorageMaterialDO::getId);
return selectPage(reqVO,query); return selectPage(reqVO,query);
} }
} }

13
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
View File

@ -82,13 +82,14 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
.eq(TaskDispatchDetailDO::getProcedureStatus, 2); .eq(TaskDispatchDetailDO::getProcedureStatus, 2);
return selectOne(query); return selectOne(query);
} }
default TaskDispatchDetailDO selectNoReportBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){ default List<TaskDispatchDetailDO> selectNoReportBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){
MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>(); MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(TaskDispatchDetailDO.class).leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId) query.selectAll(TaskDispatchDetailDO.class)
.eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1) .select("a.is_report as isReport")
.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) .leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
.eq(ProcedureDO::getIsReport,0); .lt(TaskDispatchDetailDO::getSort,taskDispatchDetailDO.getSort())
return selectOne(query); .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId());
return selectList(query);
} }
default PageResult<TaskDispatchDetailDO> selectPageGroup(YgjxPageReqVO pageReqVO) { default PageResult<TaskDispatchDetailDO> selectPageGroup(YgjxPageReqVO pageReqVO) {
MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>(); MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();

23
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -363,22 +363,25 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
@Override @Override
public TaskDispatchDetailDO getTaskDispatchDetail(TaskDispatchDetailPageReqVO pageReqVO){ public TaskDispatchDetailDO getTaskDispatchDetail(TaskDispatchDetailPageReqVO pageReqVO){
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectGet(pageReqVO); TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectGet(pageReqVO);
if (taskDispatchDetailDO.getSort()!=null&&taskDispatchDetailDO.getSort() != 1){ if (taskDispatchDetailDO.getSort()!=null&&taskDispatchDetailDO.getSort() != 1){
// TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectOne(new LambdaQueryWrapperX<TaskDispatchDetailDO>() // TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectOne(new LambdaQueryWrapperX<TaskDispatchDetailDO>()
// .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1) // .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1)
// .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) // .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId())
// .eq(TaskDispatchDetailDO::getProcedureStatus, 2) // .eq(TaskDispatchDetailDO::getProcedureStatus, 2)
// ); // );
TaskDispatchDetailDO taskDispatchDetailDO2 = taskDispatchDetailMapper.selectNoReportBeforeDo(taskDispatchDetailDO); taskDispatchDetailDO.setBeforeProcedureStatus(1);
if (taskDispatchDetailDO2 != null){ List<TaskDispatchDetailDO> taskDispatchDetailDO2 = taskDispatchDetailMapper.selectNoReportBeforeDo(taskDispatchDetailDO);
taskDispatchDetailDO.setBeforeProcedureStatus(1); List<TaskDispatchDetailDO> filteredList = taskDispatchDetailDO2.stream()
}else{ .filter(task -> task.getProcedureStatus() != 2) // 筛选product不为"2"的记录
TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO); .collect(Collectors.toList());
if (taskDispatchDetailDO1 == null){ if(CollUtil.isNotEmpty(filteredList)){
//查不出来上一道工序已完工就代表它没完成 //如果他之前的数据有未完成的且是需要报工的
taskDispatchDetailDO.setBeforeProcedureStatus(0); for (TaskDispatchDetailDO dispatchDetailDO : filteredList) {
}else{ if (dispatchDetailDO.getIsReport() != 0){
taskDispatchDetailDO.setBeforeProcedureStatus(1); taskDispatchDetailDO.setBeforeProcedureStatus(0);
break;
}
} }
} }
}else{ }else{