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

物料重量计算公式

Browse Source
This commit is contained in:
zxy 2026-01-21 15:06:44 +08:00
parent b2e1c3ca71
commit 77aaad9d59
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/formal/FormalMapper.java
View File

@ -9,6 +9,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.formal.FormalDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.chanko.yunxi.mes.module.heli.controller.admin.formal.vo.*; import com.chanko.yunxi.mes.module.heli.controller.admin.formal.vo.*;
@ -25,7 +26,7 @@ public interface FormalMapper extends BaseMapperX<FormalDO> {
query.selectAll(FormalDO.class) query.selectAll(FormalDO.class)
.select("u.nickname as creatorName") .select("u.nickname as creatorName")
.leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, FormalDO::getCreator) .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, FormalDO::getCreator)
.eq(reqVO.getMatType() != null, FormalDO::getMatType, reqVO.getMatType()) .eq(ObjectUtils.isNotEmpty(reqVO.getMatType()), FormalDO::getMatType, reqVO.getMatType())
.eq(reqVO.getFormal() != null, FormalDO::getFormal, reqVO.getFormal()) .eq(reqVO.getFormal() != null, FormalDO::getFormal, reqVO.getFormal())
.eq(reqVO.getStatus() != null, FormalDO::getStatus, reqVO.getStatus()) .eq(reqVO.getStatus() != null, FormalDO::getStatus, reqVO.getStatus())
.disableSubLogicDel(); .disableSubLogicDel();

2
mes-ui/mes-ui-admin-vue3/src/views/heli/formal/FormalForm.vue
View File

@ -8,7 +8,7 @@
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="物料类型" prop="matType"> <el-form-item label="物料类型" prop="matType">
<el-select v-model="formData.matType" placeholder="请选择物料类型" disabled> <el-select v-model="formData.matType" placeholder="请选择物料类型" :disabled="formType === 'update'" >
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_FOR_MAT_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.HELI_FOR_MAT_TYPE)"
:key="dict.value" :key="dict.value"

2
mes-ui/mes-ui-admin-vue3/src/views/heli/formal/index.vue
View File

@ -84,7 +84,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table" height="500" border>
<!-- <el-table-column label="自增字段，唯一" align="center" prop="id" />--> <!-- <el-table-column label="自增字段，唯一" align="center" prop="id" />-->
<el-table-column type="index" width="100" fixed label="序号" align="center" /> <el-table-column type="index" width="100" fixed label="序号" align="center" />
<el-table-column label="物料类型" align="center" prop="matType" > <el-table-column label="物料类型" align="center" prop="matType" >