From 855dbbe0996e62dfbe7552d463888493e8b30758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=98=8A=E5=A4=A9?=
 <15984976+n2319_0@user.noreply.gitee.com>
Date: Fri, 17 Apr 2026 16:58:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=85=E6=96=99=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E8=BE=85=E6=96=99=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gear/mat/domain/MatMaterial.java |  4 ++++
 .../com/gear/mat/domain/bo/MatMaterialBo.java |  5 +++++
 .../com/gear/mat/domain/vo/MatMaterialVo.java |  6 ++++++
 .../service/impl/MatMaterialServiceImpl.java  |  1 +
 .../resources/mapper/MatMaterialMapper.xml    |  1 +
 gear-ui3/src/views/mat/raw/index.vue          | 20 ++++++++++++++++++-
 6 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/gear-mat/src/main/java/com/gear/mat/domain/MatMaterial.java b/gear-mat/src/main/java/com/gear/mat/domain/MatMaterial.java
index 541ce8f..723217e 100644
--- a/gear-mat/src/main/java/com/gear/mat/domain/MatMaterial.java
+++ b/gear-mat/src/main/java/com/gear/mat/domain/MatMaterial.java
@@ -32,6 +32,10 @@ public class MatMaterial extends BaseEntity {
      * 配料名称
      */
     private String materialName;
+    /**
+     * 物料类型：1=辅料，2=原料
+     */
+    private Integer materialType;
     /**
      * 配料规格
      */
diff --git a/gear-mat/src/main/java/com/gear/mat/domain/bo/MatMaterialBo.java b/gear-mat/src/main/java/com/gear/mat/domain/bo/MatMaterialBo.java
index c9baa88..767a92c 100644
--- a/gear-mat/src/main/java/com/gear/mat/domain/bo/MatMaterialBo.java
+++ b/gear-mat/src/main/java/com/gear/mat/domain/bo/MatMaterialBo.java
@@ -32,6 +32,11 @@ public class MatMaterialBo extends BaseEntity {
      */
     private String materialName;
 
+    /**
+     * 物料类型：1=辅料，2=原料
+     */
+    private Integer materialType;
+
     /**
      * 配料规格
      */
diff --git a/gear-mat/src/main/java/com/gear/mat/domain/vo/MatMaterialVo.java b/gear-mat/src/main/java/com/gear/mat/domain/vo/MatMaterialVo.java
index 75dfd5f..832f0eb 100644
--- a/gear-mat/src/main/java/com/gear/mat/domain/vo/MatMaterialVo.java
+++ b/gear-mat/src/main/java/com/gear/mat/domain/vo/MatMaterialVo.java
@@ -34,6 +34,12 @@ public class MatMaterialVo {
     @ExcelProperty(value = "配料名称")
     private String materialName;
 
+    /**
+     * 物料类型：1=辅料，2=原料
+     */
+    @ExcelProperty(value = "物料类型")
+    private Integer materialType;
+
     /**
      * 配料规格
      */
diff --git a/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java b/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java
index 9236fe4..d7b5da0 100644
--- a/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java
+++ b/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java
@@ -75,6 +75,7 @@ public class MatMaterialServiceImpl implements IMatMaterialService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MatMaterial> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getMaterialName()), MatMaterial::getMaterialName, bo.getMaterialName());
+        lqw.eq(bo.getMaterialType() != null, MatMaterial::getMaterialType, bo.getMaterialType());
         lqw.eq(StringUtils.isNotBlank(bo.getSpec()), MatMaterial::getSpec, bo.getSpec());
         lqw.eq(StringUtils.isNotBlank(bo.getModel()), MatMaterial::getModel, bo.getModel());
         lqw.eq(StringUtils.isNotBlank(bo.getFactory()), MatMaterial::getFactory, bo.getFactory());
diff --git a/gear-mat/src/main/resources/mapper/MatMaterialMapper.xml b/gear-mat/src/main/resources/mapper/MatMaterialMapper.xml
index a6de0e0..4ea4c23 100644
--- a/gear-mat/src/main/resources/mapper/MatMaterialMapper.xml
+++ b/gear-mat/src/main/resources/mapper/MatMaterialMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.gear.mat.domain.MatMaterial" id="MatMaterialResult">
         <result property="materialId" column="material_id"/>
         <result property="materialName" column="material_name"/>
+        <result property="materialType" column="material_type"/>
         <result property="spec" column="spec"/>
         <result property="model" column="model"/>
         <result property="factory" column="factory"/>
diff --git a/gear-ui3/src/views/mat/raw/index.vue b/gear-ui3/src/views/mat/raw/index.vue
index fabab6c..8a6f816 100644
--- a/gear-ui3/src/views/mat/raw/index.vue
+++ b/gear-ui3/src/views/mat/raw/index.vue
@@ -13,6 +13,11 @@
       <el-form-item label="厂家" prop="factory">
         <el-input v-model="queryParams.factory" placeholder="请输入厂家" clearable @keyup.enter="handleQuery" />
       </el-form-item>
+      <!-- <el-form-item label="物料类型" prop="materialType">
+        <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" @change="handleQuery" disabled>
+          <el-option label="原料" value="2" />
+        </el-select>
+      </el-form-item> -->
       <!-- <el-form-item label="计量单位 个/公斤/米等" prop="unit">
         <el-input v-model="queryParams.unit" placeholder="请输入计量单位 个/公斤/米等" clearable @keyup.enter="handleQuery" />
       </el-form-item>
@@ -45,6 +50,11 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="配料ID 主键" align="center" prop="materialId" v-if="true" /> -->
       <el-table-column label="配料名称" align="center" prop="materialName" />
+      <el-table-column label="物料类型" align="center" prop="materialType">
+        <template #default="scope">
+          {{ scope.row.materialType === 1 ? '辅料' : '原料' }}
+        </template>
+      </el-table-column>
       <el-table-column label="配料规格" align="center" prop="spec" />
       <el-table-column label="配料型号" align="center" prop="model" />
       <el-table-column label="厂家" align="center" prop="factory" />
@@ -79,6 +89,11 @@
         <el-form-item label="配料名称" prop="materialName">
           <el-input v-model="form.materialName" placeholder="请输入配料名称" />
         </el-form-item>
+        <el-form-item label="物料类型" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择物料类型" disabled>
+            <el-option label="原料" value="2" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="配料规格" prop="spec">
           <el-input v-model="form.spec" placeholder="请输入配料规格" />
         </el-form-item>
@@ -171,7 +186,7 @@
       </template>
     </el-dialog>
 
-    
+
     <Price :materialId="currentMaterialId" ref="priceRef" />
   </div>
 </template>
@@ -232,6 +247,7 @@ const data = reactive({
     factory: undefined,
     unit: undefined,
     currentStock: undefined,
+    materialType: 2, // 固定为原料
   },
   rules: {
   }
@@ -260,6 +276,7 @@ function reset() {
   form.value = {
     materialId: null,
     materialName: null,
+    materialType: 2, // 固定为原料
     spec: null,
     model: null,
     factory: null,
@@ -284,6 +301,7 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
+  queryParams.value.materialType = 2; // 重置后仍为原料
   handleQuery();
 }