From 71d1d6e7074467d3b936380fdd2b0a6a34229423 Mon Sep 17 00:00:00 2001 From: zxy Date: Thu, 21 May 2026 09:05:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(biz):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/millparamact/vo/MillParamActRespVO.java | 12 ++++++------ .../admin/millparamact/vo/MillParamActSaveReqVO.java | 8 +++----- mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts | 2 -- .../ProStorageInventorySelectDialog.vue | 10 ++++++++-- .../src/views/biz/saledelivery/SaleDeliveryForm.vue | 4 ++-- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActRespVO.java index fbd4f80..4767a2f 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActRespVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActRespVO.java @@ -1,12 +1,12 @@ package com.ningxia.yunxi.chemmes.module.biz.controller.admin.millparamact.vo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; + +import java.time.LocalDate; import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; @Schema(description = "管理后台 - 制粉工序参数实绩 Response VO") @Data @@ -89,4 +89,4 @@ public class MillParamActRespVO { @ExcelProperty("采集日期") private LocalDate collectDate; -} \ No newline at end of file +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActSaveReqVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActSaveReqVO.java index aeeac4d..c4aefda 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActSaveReqVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/millparamact/vo/MillParamActSaveReqVO.java @@ -1,11 +1,9 @@ package com.ningxia.yunxi.chemmes.module.biz.controller.admin.millparamact.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; + +import java.time.LocalDate; import java.time.LocalDateTime; @Schema(description = "管理后台 - 制粉工序参数实绩新增/修改 Request VO") diff --git a/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts b/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts index 66aeaec..f525c74 100644 --- a/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts +++ b/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts @@ -7,8 +7,6 @@ export {} declare global { const DICT_TYPE: typeof import('@/utils/dict')['DICT_TYPE'] const EffectScope: typeof import('vue')['EffectScope'] - const ElMessage: typeof import('element-plus/es')['ElMessage'] - const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const computed: typeof import('vue')['computed'] const createApp: typeof import('vue')['createApp'] const customRef: typeof import('vue')['customRef'] diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue index 54cd8a3..ed164cd 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/prostorageinventory/ProStorageInventorySelectDialog.vue @@ -134,6 +134,7 @@ const queryParams = reactive({ storeHouseId: undefined, storeAreaId: undefined, yardQty: 1, + matName: undefined, }) // 仓储列表（条件：store_type = '3' ） @@ -277,12 +278,17 @@ const handleSave = () => { } /** 打开弹窗 */ -const open = () => { +const open = (params?: { materialName?: string }) => { dialogVisible.value = true + // 重置查询参数 + queryParams.pageNo = 1 + queryParams.storeHouseId = undefined + queryParams.storeAreaId = undefined + queryParams.matName = params?.materialName // 初始化仓储列表 getStoreHouseList() // 执行搜索 - // handleQuery() + getList() } defineExpose({ open, setSelectedIds }) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/SaleDeliveryForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/SaleDeliveryForm.vue index 42708e9..4077e37 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/SaleDeliveryForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/SaleDeliveryForm.vue @@ -651,8 +651,8 @@ const addProductItem = () => { // 设置已选择的ID，以便弹窗打开时自动选中 inventorySelectRef.value.setSelectedIds(selectedIds) - // 打开弹窗 - inventorySelectRef.value.open() + // 打开弹窗，传入产品名称作为查询参数 + inventorySelectRef.value.open({ materialName: formData.materialName }) } /** 处理库存选择 */