diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java index 246ea0a6..2d71e010 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java @@ -163,6 +163,16 @@ public class MesBaseMaterialInfo extends BaseEntity */ private String isExceeded; + private Long filterMaterialId; + + public Long getFilterMaterialId() { + return filterMaterialId; + } + + public void setFilterMaterialId(Long filterMaterialId) { + this.filterMaterialId = filterMaterialId; + } + public BigDecimal getAvailableAmount() { return availableAmount; } diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml index 327c7d2d..846cd6f6 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml @@ -143,9 +143,14 @@ and bmi.low_value_consumable_flag = #{lowValueConsumableFlag} and bmi.always_flag = #{alwaysFlag} and IF(wst.availableAmount >= bmi.safe_stock_amount, '1', '0') = #{isExceeded} - - and exists (select 1 from wms_warehouse_material wwm where wwm.storage_type='1' and wwm.warehouse_id=511 and wwm.storage_id=bmi.material_id) + and exists (select 1 + from (select m1.material_id, m1.material_name, m2.material_id prod_id, m2.material_name prod_name + from mes_material_bom m1 + left join mes_material_bom m2 on m1.parent_id = m2.material_bom_id + where m2.material_id = #{filterMaterialId}) mmb + where mmb.material_id = bmi.material_id) + diff --git a/hw-ui/src/views/mes/materialinfo/selectMaterial.vue b/hw-ui/src/views/mes/materialinfo/selectMaterial.vue index b2ed55d5..01078518 100644 --- a/hw-ui/src/views/mes/materialinfo/selectMaterial.vue +++ b/hw-ui/src/views/mes/materialinfo/selectMaterial.vue @@ -100,6 +100,12 @@ import { export default { name: "Materialinfo", dicts: ['active_flag', 'material_categories','mes_material_bind_flag'], + props: { + filterMaterialId: { + type: [String, Number], + default: null + } +}, data() { return { // 遮罩层 @@ -156,6 +162,19 @@ export default { created() { this.getList(); }, + watch: { + filterMaterialId: { + immediate: true, + handler(newVal) { + if (newVal) { + this.queryParams.filterMaterialId = newVal; + } else { + this.queryParams.filterMaterialId = null; + } + this.getList(); + } + } + }, methods: { /** 查询物料信息列表 */ getList() { diff --git a/hw-ui/src/views/mes/productOrder/index.vue b/hw-ui/src/views/mes/productOrder/index.vue index f9b13efa..a20fef6f 100644 --- a/hw-ui/src/views/mes/productOrder/index.vue +++ b/hw-ui/src/views/mes/productOrder/index.vue @@ -643,6 +643,7 @@ v-for="dict in dict.type.mes_sale_type" :key="dict.value" :label="dict.value" + :disabled="dict.value === '3'" >{{ dict.label }} @@ -656,7 +657,7 @@ @@ -672,7 +673,7 @@ @@ -740,7 +741,13 @@ - + +
确 定 取 消 @@ -1043,6 +1050,7 @@ export default { // 新增: 批量选择生产物料弹窗控制和当前行索引 batchSaleProduceMaterialOpen: false, currentBatchSaleRowIndex: null, + currentBatchSaleMaterialId: null, // 新增：当前批量选择的物料ID }; }, activated() { @@ -1607,20 +1615,28 @@ export default { materialBomList: [] })); - rows.forEach((row, index) => { - getMaterialVisionList(row.materialId).then(response => { - if (response.data && response.data.length !== 0) { - this.$set(this.batchSaleOrders[index], 'materialBomList', response.data); - this.batchSaleOrders[index].materialBomId = response.data[0].materialBomId; - } else { - this.$modal.msgError(row.materialName + "物料未维护BOM信息！"); + if (this.batchSaleForm.batchSaleType === this.MES_SALE_TYPE.MES_SALE_TYPE_EXTERNAL){ + rows.forEach((row, index) => { + getMaterialVisionList(row.materialId).then(response => { + if (response.data && response.data.length !== 0) { + this.$set(this.batchSaleOrders[index], 'materialBomList', response.data); + this.batchSaleOrders[index].materialBomId = response.data[0].materialBomId; + } else { + this.$modal.msgError(row.materialName + "物料未维护BOM信息！"); + this.$set(this.batchSaleOrders[index], 'materialBomList', []); + } + }).catch(error => { + console.error('获取BOM信息失败:', error); this.$set(this.batchSaleOrders[index], 'materialBomList', []); - } - }).catch(error => { - console.error('获取BOM信息失败:', error); - this.$set(this.batchSaleOrders[index], 'materialBomList', []); + }); }); - }); + } + if (this.batchSaleForm.batchSaleType === this.MES_SALE_TYPE.MES_SALE_TYPE_INTERNAL){ + rows.forEach((row, index) => { + this.batchSaleOrders[index].dispatchId = 3; + this.batchSaleOrders[index].materialBomId = null; + }); + } console.log("batchSaleOrders",this.batchSaleOrders) this.$refs.batchSaleOrderRef.clearSelection(); @@ -1674,16 +1690,39 @@ export default { // 新增: 打开批量选择生产物料弹窗 openBatchSaleProduceMaterialDialog(rowIndex) { this.currentBatchSaleRowIndex = rowIndex; - this.batchSaleProduceMaterialOpen = true; + this.currentBatchSaleMaterialId = this.batchSaleOrders[rowIndex].materialId; // 新增 + this.batchSaleProduceMaterialOpen = false; + this.$nextTick(() => { + this.batchSaleProduceMaterialOpen = true; + }); }, // 新增: 批量选择生产物料弹窗确认 submitBatchSaleProduceMaterialForm() { const selectedRow = this.$refs.batchSaleProduceMaterialRef.selectedRow; - if (selectedRow) { - const idx = this.currentBatchSaleRowIndex; - this.$set(this.batchSaleOrders[idx], 'produceMaterialId', selectedRow.materialId); - this.$set(this.batchSaleOrders[idx], 'produceMaterialName', selectedRow.materialName); + const idx = this.currentBatchSaleRowIndex; + if (this.batchSaleForm.batchSaleType === this.MES_SALE_TYPE.MES_SALE_TYPE_EXTERNAL){ + if (selectedRow) { + this.$set(this.batchSaleOrders[idx], 'produceMaterialId', selectedRow.materialId); + this.$set(this.batchSaleOrders[idx], 'produceMaterialName', selectedRow.materialName); + } } + if (this.batchSaleForm.batchSaleType === this.MES_SALE_TYPE.MES_SALE_TYPE_INTERNAL) { + if (selectedRow) { + this.$set(this.batchSaleOrders[idx], 'produceMaterialId', selectedRow.materialId); + this.$set(this.batchSaleOrders[idx], 'produceMaterialName', selectedRow.materialName); + } + getMaterialVisionList(selectedRow.materialId).then(response => { + if (response.data && response.data.length !== 0) { + this.$set(this.batchSaleOrders[idx], 'produceMaterialBomList', response.data); + this.batchSaleOrders[idx].materialBomId = response.data[0].materialBomId; + console.log(this.batchSaleOrders) + } else { + this.$modal.msgError(selectedRow.materialName + "物料未维护BOM信息！"); + this.$set(this.batchSaleOrders[idx], 'produceMaterialBomList', []); + } + }) + } + this.batchSaleProduceMaterialOpen = false; }, }