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-05-29 10:59:17 +08:00
parent d41e4e2c61
commit fe556cfc6c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
View File

@ -164,7 +164,7 @@
<!-- </div> --> <!-- </div> -->
</td> </td>
<td colspan="1" style="max-width: 90px;min-width: 90px">{{ item.compositionName }} </td> <td colspan="1" style="max-width: 90px;min-width: 90px">{{ item.compositionName }} </td>
<td colspan="2" style="max-width: 180px;min-width: 200px">{{equipInit.find((equip) => equip.id == item.equipId)?.name}} </td> <td colspan="2" style="max-width: 180px;min-width: 200px">{{equipInit.find((equip) => equip.id == item.deviceModel)?.name}} </td>
<td colspan="1" style="max-width: 60px;min-width: 60px">{{item.amount}} </td> <td colspan="1" style="max-width: 60px;min-width: 60px">{{item.amount}} </td>
<td colspan="1" style="max-width: 60px;min-width: 60px">{{}} </td> <td colspan="1" style="max-width: 60px;min-width: 60px">{{}} </td>
</tr> </tr>

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

@ -475,6 +475,7 @@ const getList = async (arrMat) => {
break; break;
} }
} }
console.log("库位1"+pnList.value)
arrMat.forEach((row) => { arrMat.forEach((row) => {
if ( if (
formData.value.matItemDOList.filter( formData.value.matItemDOList.filter(
@ -493,6 +494,8 @@ const getList = async (arrMat) => {
} }
row.pnlist = ref([]) row.pnlist = ref([])
row.pnlist = pnList.value.filter((pn) => pn.rg_id == row.rgId) row.pnlist = pnList.value.filter((pn) => pn.rg_id == row.rgId)
console.log("库位"+pnList.value)
console.log("库位长度"+pnList.value.length)
if (row.pnlist.length == 1) { if (row.pnlist.length == 1) {
row.pnId = row.pnlist[0].id row.pnId = row.pnlist[0].id
}else if (pnList.value.length == 0) { }else if (pnList.value.length == 0) {
@ -835,7 +838,7 @@ const handleWh = async (wid) => {
const dataPnList = await PnApi.getSimpList() const dataPnList = await PnApi.getSimpList()
rgList.value = dataRgList.filter((rg) => rg.wh_id == wid) rgList.value = dataRgList.filter((rg) => rg.wh_id == wid)
pnList.value = dataPnList.filter((pn) => pn.wh_id == wid) pnList.value = dataPnList.filter((pn) => pn.wh_id == wid)
console.log("1")
formData.value.matItemDOList.forEach((item) => { formData.value.matItemDOList.forEach((item) => {
item.rgId = '' item.rgId = ''
item.pnId = '' item.pnId = ''
@ -948,7 +951,12 @@ onMounted(async () => {
if (whList.value.length==1){ if (whList.value.length==1){
formData.value.whId = whList.value[0].id; formData.value.whId = whList.value[0].id;
const dataRgList = await RgApi.getSimpList()
rgList.value = dataRgList.filter((rg) => rg.wh_id == formData.value.whId)
// 获得库区列表
const dataPnList = await PnApi.getSimpList()
pnList.value = dataPnList.filter((pn) => pn.wh_id == formData.value.whId)
} }
// formData.value.whId = Math.min.apply(Math, whList.value.map(function(i) {return i.id})); // formData.value.whId = Math.min.apply(Math, whList.value.map(function(i) {return i.id}));
@ -971,6 +979,7 @@ onMounted(async () => {
// 获得库区列表 // 获得库区列表
const dataPnList = await PnApi.getSimpList() const dataPnList = await PnApi.getSimpList()
pnList.value = dataPnList.filter((pn) => pn.wh_id == formData.value.whId) pnList.value = dataPnList.filter((pn) => pn.wh_id == formData.value.whId)
// 获取库存物料列表信息 // 获取库存物料列表信息