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-10-30 16:36:21 +08:00
parent 5f02acff84
commit a38727d8f0
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java
View File

@ -247,6 +247,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
.select(MaterialPlanDO::getBrief, MaterialPlanDO::getCustomerId, MaterialPlanDO::getProjectId, MaterialPlanDO::getProjectNameSim) .select(MaterialPlanDO::getBrief, MaterialPlanDO::getCustomerId, MaterialPlanDO::getProjectId, MaterialPlanDO::getProjectNameSim)
.leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId) .leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId)
.leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId) .leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId)
.leftJoin(ProjectOrderDO.class,"pro",ProjectOrderDO::getId,MaterialPlanDO::getProjectId)
.leftJoin(ProjectOrderSubDO.class,"sub",ProjectOrderSubDO::getId,MaterialPlanBoomDO::getProjectPlanSubId) .leftJoin(ProjectOrderSubDO.class,"sub",ProjectOrderSubDO::getId,MaterialPlanBoomDO::getProjectPlanSubId)
.leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId) .leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId)
.leftJoin(ProcedureDO.class, "c", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId) .leftJoin(ProcedureDO.class, "c", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId)

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java
View File

@ -223,7 +223,9 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
// ).or().like(ProcedureDO::getName, pageReqVO.getSubOrDetailName())); // ).or().like(ProcedureDO::getName, pageReqVO.getSubOrDetailName()));
// } // }
if (pageReqVO.getSubOrDetailName() != null && !pageReqVO.getSubOrDetailName().trim().equals("")){ if (pageReqVO.getSubOrDetailName() != null && !pageReqVO.getSubOrDetailName().trim().equals("")){
query.and( e ->e.eq(ProjectOrderDO::getProjectName, pageReqVO.getSubOrDetailName()).or().eq( query.and( e ->e.like(PurchaseOrderNoDetailDO::getBoomName, pageReqVO.getSubOrDetailName()).or().like(
ProcessBomDetailDO::getBlueprintNo, pageReqVO.getSubOrDetailName()
).or().like(ProcedureDO::getName, pageReqVO.getSubOrDetailName()).or().eq(ProjectOrderDO::getProjectName, pageReqVO.getSubOrDetailName()).or().eq(
ProjectOrderSubDO::getName, pageReqVO.getSubOrDetailName() ProjectOrderSubDO::getName, pageReqVO.getSubOrDetailName()
).or().eq(ProcessBomDetailDO::getMaterialName, pageReqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, pageReqVO.getSubOrDetailName())); ).or().eq(ProcessBomDetailDO::getMaterialName, pageReqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, pageReqVO.getSubOrDetailName()));
// query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')"); // query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')");
@ -294,4 +296,4 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
.orderByDesc(PurchaseOrderNoDetailDO::getCreateTime); .orderByDesc(PurchaseOrderNoDetailDO::getCreateTime);
return selectPage(pageReqVO, query); return selectPage(pageReqVO, query);
} }
} }

2
mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
View File

@ -154,7 +154,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="重量(T)" prop="transportWeight" > <el-form-item label="重量(T)" prop="transportWeight" >
<el-input :disabled="detailDisabled" v-model="formData.transportWeight" class="!w-250px" /> <el-input :disabled="detailDisabled || formData.deliverStatus == 2" v-model="formData.transportWeight" class="!w-250px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">