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

入库单问题修改

Browse Source
This commit is contained in:
z 2025-01-10 15:01:06 +08:00
parent 686371be13
commit fb0a55eba5
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
View File

@ -103,8 +103,10 @@ public class StorageController {
// 获取最新的出入库信息 // 获取最新的出入库信息
StorageDO targetDo = storageService.getStorage(updateReqVO.getId()); StorageDO targetDo = storageService.getStorage(updateReqVO.getId());
int beforeStatus = updateReqVO.getBeforeStatus(); int beforeStatus=0;
if (updateReqVO.getStockType()==2){
beforeStatus = updateReqVO.getBeforeStatus();
}
targetDo.setStatus(updateReqVO.getStatus()); targetDo.setStatus(updateReqVO.getStatus());
// 提交或者作废时记录相关操作人 // 提交或者作废时记录相关操作人

12
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
View File

@ -277,10 +277,10 @@ private TaskReportMapper taskReportMapper;
LambdaQueryWrapper<PlanTaskDO> planTaskWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlanTaskDO> planTaskWrapper = new LambdaQueryWrapper<>();
planTaskWrapper.eq(PlanTaskDO::getProjectPlanId, id); planTaskWrapper.eq(PlanTaskDO::getProjectPlanId, id);
List<PlanTaskDO> planTaskDOS = planTaskMapper.selectList(planTaskWrapper); List<PlanTaskDO> planTaskDOS = planTaskMapper.selectList(planTaskWrapper);
if (planTaskDOS==null){ if (planTaskDOS==null||planTaskDOS.size()==0){
return false; return false;
} }
if (list==null){ if (list==null||list.size()==0){
return false; return false;
} }
for (PlanTaskDO taskDO : planTaskDOS) { for (PlanTaskDO taskDO : planTaskDOS) {
@ -288,7 +288,7 @@ private TaskReportMapper taskReportMapper;
LambdaQueryWrapper<PlanTaskBomDO> taskBomDOWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlanTaskBomDO> taskBomDOWrapper = new LambdaQueryWrapper<>();
taskBomDOWrapper.eq(PlanTaskBomDO::getTaskId, taskDO.getId()); taskBomDOWrapper.eq(PlanTaskBomDO::getTaskId, taskDO.getId());
List<PlanTaskBomDO> planTaskBomDOS = planTaskBomMapper.selectList(taskBomDOWrapper); List<PlanTaskBomDO> planTaskBomDOS = planTaskBomMapper.selectList(taskBomDOWrapper);
if (planTaskBomDOS==null){ if (planTaskBomDOS==null||planTaskBomDOS.size()==0){
return false; return false;
} }
for (PlanTaskBomDO planTaskBomDO : planTaskBomDOS) { for (PlanTaskBomDO planTaskBomDO : planTaskBomDOS) {
@ -303,8 +303,8 @@ private TaskReportMapper taskReportMapper;
} }
if (flag){ if (flag){
LambdaQueryWrapper<TaskDispatchDO> taskDispatchDOWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TaskDispatchDO> taskDispatchDOWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TaskDispatchDO::getTaskId,taskDO.getId()); taskDispatchDOWrapper.eq(TaskDispatchDO::getTaskId,taskDO.getId());
queryWrapper.ne(TaskDispatchDO::getDispatchStatus, TaskDispatchStatusEnum.TERMINATE.getCode()); taskDispatchDOWrapper.ne(TaskDispatchDO::getDispatchStatus, TaskDispatchStatusEnum.TERMINATE.getCode());
List<TaskDispatchDO> taskList = taskDispatchMapper.selectList(taskDispatchDOWrapper); List<TaskDispatchDO> taskList = taskDispatchMapper.selectList(taskDispatchDOWrapper);
list.addAll(taskList); list.addAll(taskList);
} }
@ -313,7 +313,7 @@ private TaskReportMapper taskReportMapper;
LambdaQueryWrapper<TaskDispatchDetailDO> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TaskDispatchDetailDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId()); wrapper.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId());
List<TaskDispatchDetailDO> detailDOS = taskDispatchDetailMapper.selectList(wrapper); List<TaskDispatchDetailDO> detailDOS = taskDispatchDetailMapper.selectList(wrapper);
if (detailDOS==null){ if (detailDOS==null||detailDOS.size()==0){
return false; return false;
} }
for (TaskDispatchDetailDO detailDO : detailDOS) { for (TaskDispatchDetailDO detailDO : detailDOS) {

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.chanko.yunxi.mes.module.heli.service.purchaseorder; package com.chanko.yunxi.mes.module.heli.service.purchaseorder;
import cn.hutool.core.util.ObjectUtil;
import com.chanko.yunxi.mes.framework.security.core.LoginUser; import com.chanko.yunxi.mes.framework.security.core.LoginUser;
import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.OrderYfSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.OrderYfSaveReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.plan.vo.PlanPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.plan.vo.PlanPageReqVO;
@ -210,7 +211,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
@Override @Override
public PageResult<PurchaseOrderDO> getPurchaseOrderPageByStatus(PurchaseOrderPageReqVO pageReqVO) { public PageResult<PurchaseOrderDO> getPurchaseOrderPageByStatus(PurchaseOrderPageReqVO pageReqVO) {
if (ObjectUtil.isNotEmpty(pageReqVO.getStatus())&&pageReqVO.getStatus()==2){
pageReqVO.setAuditor(getLoginUser().getId()); pageReqVO.setAuditor(getLoginUser().getId());
}
return purchaseOrderMapper.selectPageByStatus(pageReqVO); return purchaseOrderMapper.selectPageByStatus(pageReqVO);
} }
} }

1
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
View File

@ -425,7 +425,6 @@ const handleClick = (event) => {
const getList = async (arrMat) => { const getList = async (arrMat) => {
let flag=true let flag=true
let whName='' let whName=''
console.log(formData.value.whId)
for (let i = 0; i < whList.value.length; i++) { for (let i = 0; i < whList.value.length; i++) {
console.log(whList.value[i].id) console.log(whList.value[i].id)
if (whList.value[i].id==formData.value.whId){ if (whList.value[i].id==formData.value.whId){