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-10-10 01:12:47 +08:00
parent 0c167b4e0a
commit 1041e97ce5
2 changed files with 3 additions and 2 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/service/plansubdetail/PlanSubDetailServiceImpl.java
View File

@ -303,8 +303,8 @@ public class PlanSubDetailServiceImpl implements PlanSubDetailService {
if (planSubDetailMapper.selectCount(wrapper)>0) return CommonResult.error(400,"该子项目存在多时间段派工,不允许从中间修改！"); if (planSubDetailMapper.selectCount(wrapper)>0) return CommonResult.error(400,"该子项目存在多时间段派工,不允许从中间修改！");
LambdaQueryWrapper<PlanSubDetailDO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlanSubDetailDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PlanSubDetailDO::getProjectSubId,updateReqVO.getProjectSubId()); queryWrapper.eq(PlanSubDetailDO::getProjectSubId,updateReqVO.getProjectSubId());
// queryWrapper.eq(PlanSubDetailDO::getTwoDimOwner,updateReqVO.getTwoDimOwner()); queryWrapper.eq(PlanSubDetailDO::getTwoDimOwner,updateReqVO.getTwoDimOwner());
queryWrapper.eq(PlanSubDetailDO::getSubType,updateReqVO.getSubType()); queryWrapper.eq(PlanSubDetailDO::getSubType,updateReqVO.getSubType()); //注释原因，这样只考虑这个类型的了
if (ObjectUtil.isNotEmpty(updateReqVO.getId())){ if (ObjectUtil.isNotEmpty(updateReqVO.getId())){
queryWrapper.ne(PlanSubDetailDO::getId,updateReqVO.getId()); queryWrapper.ne(PlanSubDetailDO::getId,updateReqVO.getId());
} }

1
mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue
View File

@ -627,6 +627,7 @@ const currentRow = ref(null)
const insertList = ref([]) const insertList = ref([])
const beforeList = ref([]) const beforeList = ref([])
const modification = async (row) => { const modification = async (row) => {
beforeList.value = []
var data = row as unknown as PlansubdetailApi.PlanSubDetailVO var data = row as unknown as PlansubdetailApi.PlanSubDetailVO
const res = await PlansubdetailApi.modificationPlanSubDetail(data) const res = await PlansubdetailApi.modificationPlanSubDetail(data)
if (res.list) { if (res.list) {