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

3,8,9,2问题修改

Browse Source
This commit is contained in:
z 2025-05-07 11:00:06 +08:00
parent 95a2d2d783
commit 39324e9a47
9 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java
View File

@ -55,7 +55,7 @@ public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
.like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName())
.like(!StringUtils.isEmpty(reqVO.getMaterialName()), ProcessBomDetailDO::getMaterialName, reqVO.getMaterialName())
.like(!StringUtils.isEmpty(reqVO.getOwnerName()), AdminUserDO::getNickname, reqVO.getOwnerName())
.eq(TaskReportDO::getDispatchDetailId,reqVO.getDispatchDetailId());
.eq(!StringUtils.isEmpty(reqVO.getDispatchDetailId()),TaskReportDO::getDispatchDetailId,reqVO.getDispatchDetailId());
return selectPage(reqVO, query);
}

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

@ -533,6 +533,12 @@ const otherSubFormRef = ref()
//计算运费
const yunFei = (event) => {
const totalWeight = formData.value.deliverOrderSubs.reduce((sum, item) => {
const weight = item.weight !== null && item.weight !== undefined ? Number(item.weight) : 0;
return sum + weight;
}, 0);
formData.value.transportWeight=totalWeight
if (formData.value.transportFreightCost && formData.value.transportFreightCost > 0) {
//先将有重量和无重量的进行拆分
let numOne = 0

6
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/boom.vue
View File

@ -69,7 +69,7 @@ const handleSelectionChange = (val: []) => {
selectedRowNowKeys.value = val;
selectedRowBeforeKeys.value = val;
multipleSelection.value = selectedRowBeforeKeys.value
}else{
if(val != null && val.length > 0){
//对比一下，看看多了还是少了，多了selectedRowBeforeKeys.value就添加那个多了的元素，少了selectedRowBeforeKeys.value就移除不同的元素 然后 selectedRowNowKeys.value = val;
@ -101,8 +101,8 @@ const handleSelectionChange = (val: []) => {
multipleSelection.value = selectedRowBeforeKeys.value
selectedRowNowKeys.value = val;
}
}
// if(selectedRowBeforeKeys.value == null || selectedRowBeforeKeys.value.length == 0){

4
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/materialNew.vue
View File

@ -21,7 +21,7 @@
</el-form>
</ContentWrap>
<el-card class="hl-table">
<el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800" @row-click="clickRow">
<el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :reserve-selection="true" :row-key="getRowKeys" min-width="1800" @row-click="clickRow">
<el-table-column type="selection" width="55" :reserve-selection="true" :selectable="row=>chkboxEnable" />
<!-- <el-table-column prop="no" label="序号" min-width="120" align="center" /> -->
<el-table-column label="序号" type="index" min-width="120" align="center" />
@ -120,7 +120,7 @@ const open = async (planId: number) => {
queryReqVo.taskId = planId
formLoading.value = true
const data = await PlanTaskBomApi.getMaterialPlanTaskBomNew(queryReqVo)
const data = await PlanTaskBomApi.getMaterialPlanTaskBom(queryReqVo)
list.value = data.list
total.value = data.total

7
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
View File

@ -320,7 +320,7 @@ style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货
<el-form-item :prop="`${scope.$index}.unqualifiedCount`" class="mb-0px!" :rules="subOutSourceMatFormRules.unqualifiedCount">
<el-input-number
style="width: 100%" v-model="scope.row.unqualifiedCount" placeholder="不合格数量"
@change="handleEstimatedPrice" :min="0" :precision="2" />
@change="handleEstimatedPrice" @blur="repairable(scope.row.unqualifiedCount,scope.row)" :min="0" :precision="2" />
</el-form-item>
</template>
</el-table-column>
@ -609,6 +609,11 @@ const matOpenFormRef = ref()
// }
// })
// }
const repairable = (event,row) => {
if (event==0){
row.repairable=3
}
}
const handleSelectedMaterialPlanMat = (arr) => {
// 创建一个 Set 来存储现有的 matId
debugger

8
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue
View File

@ -719,7 +719,7 @@ const onAddItem = () => {
materialCode: undefined,
compositionId: undefined,
bomEditStatus: 3,
spec: undefined,
spec: "A",
unit: '21',
blueprintNo: undefined,
amount: undefined,
@ -738,10 +738,14 @@ const onDeleteItem = async (index) => {
}
const onChangeType = (row, val) => {
if (val==2){
row.spec = "A"
}else{
row.spec =undefined
}
row.materialId = undefined
row.materialName = undefined
row.materialCode = undefined
row.spec = undefined
row.unit = undefined
}

6
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/boomDialog.vue
View File

@ -19,8 +19,8 @@
<el-card class="hl-card">
<!-- 列表 -->
<ContentWrap>
<el-table ref="multipleTable" v-loading="loading" :data="list" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" @row-click="clickRow" selection>
<el-table-column type="selection" width="40" />
<el-table ref="multipleTable" v-loading="loading" :data="list" class="hl-table" @selection-change="handleSelectionChange" :reserve-selection="true" :row-key="getRowKeys" @row-click="clickRow" selection>
<el-table-column type="selection" :reserve-selection="true" width="40" />
<el-table-column label="零件名称" align="center" prop="materialName" />
<el-table-column label="规格/型号" align="center" prop="boomSpec" />
<el-table-column label="材质" align="center" prop="compositionName" />
@ -81,7 +81,7 @@ const queryParams:any = reactive({
//指定key值,数据更新之后保留之前选中的数据
const getRowKeys = (row) => {
return row.matId
return row.id
}
const queryFormRef = ref() // 搜索的表单

2
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue
View File

@ -21,7 +21,7 @@
</el-form>
</ContentWrap>
<el-card class="hl-table">
<el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" @row-click="clickRow" :selection="true" :reserve-selection="true" min-width="1800" >
<el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" @row-click="clickRow" :selection="true" :reserve-selection="true" min-width="1800" >
<el-table-column type="selection" width="55" :reserve-selection="true" :selectable="row=>chkboxEnable" />
<!-- <el-table-column prop="no" label="序号" min-width="120" align="center" /> -->
<el-table-column label="序号" type="index" min-width="120" align="center" />

4
mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materialsNew.vue
View File

@ -23,7 +23,7 @@
</el-form>
</ContentWrap>
<el-card class="hl-table">
<el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800" @row-click="clickRow">
<el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" :reserve-selection="true" min-width="1800" @row-click="clickRow">
<el-table-column type="selection" width="55" v-if="chkboxEnable" :reserve-selection="true" :selectable="row=>chkboxEnable" />
<!-- <el-table-column prop="no" label="序号" min-width="120" align="center" /> -->
<el-table-column label="序号" type="index" min-width="120" align="center" />
@ -83,7 +83,7 @@ const clickRow = (row: any) => {
}
//指定key值,数据更新之后保留之前选中的数据
const getRowKeys = (row) => {
return row.matId
return `${row.whId}_${row.matCode}_${row.pnId}`
}
const queryReqVo: any = reactive({