From 12230ad91f07a9afbe72b68ebf0933830b145a95 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Fri, 27 Sep 2024 00:44:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=93=81=E7=89=8C=E3=80=81=E5=8A=A9=E8=AE=B0=E7=A0=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docs/数据库更新记录-首次安装请勿使用.txt  |  10 +-
 .../jsh/erp/datasource/entities/Material.java |  20 +
 .../datasource/entities/MaterialExample.java  | 140 +++
 .../resources/mapper_xml/MaterialMapper.xml   | 990 +++++++++---------
 .../views/material/modules/MaterialModal.vue  |  44 +-
 5 files changed, 712 insertions(+), 492 deletions(-)

diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
index 98580f9fb..60c1c8a10 100644
--- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
+++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
@@ -1602,4 +1602,12 @@ alter table jsh_material_current_stock add current_unit_price decimal(24,6) DEFA
 -- by jishenghua
 -- 给系统参数表增加先审核后打印启用标记，启用后，零售、采购、销售等单据，都需要先审核之后才能进行打印
 -- --------------------------------------------------------
-alter table jsh_system_config add audit_print_flag varchar(1) DEFAULT '0' COMMENT '先审核后打印启用标记，0未启用，1启用' after move_avg_price_flag;
\ No newline at end of file
+alter table jsh_system_config add audit_print_flag varchar(1) DEFAULT '0' COMMENT '先审核后打印启用标记，0未启用，1启用' after move_avg_price_flag;
+
+-- --------------------------------------------------------
+-- 时间 2024年9月27日
+-- by jishenghua
+-- 给商品表增加品牌、助记码字段
+-- --------------------------------------------------------
+alter table jsh_material add brand varchar(100) DEFAULT NULL COMMENT '品牌' after standard;
+alter table jsh_material add mnemonic varchar(100) DEFAULT NULL COMMENT '助记码' after brand;
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Material.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Material.java
index 7ed299a6d..18d488f75 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Material.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Material.java
@@ -15,6 +15,10 @@ public class Material {
 
     private String standard;
 
+    private String brand;
+
+    private String mnemonic;
+
     private String color;
 
     private String unit;
@@ -95,6 +99,22 @@ public class Material {
         this.standard = standard == null ? null : standard.trim();
     }
 
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand == null ? null : brand.trim();
+    }
+
+    public String getMnemonic() {
+        return mnemonic;
+    }
+
+    public void setMnemonic(String mnemonic) {
+        this.mnemonic = mnemonic == null ? null : mnemonic.trim();
+    }
+
     public String getColor() {
         return color;
     }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
index 899d91b3a..902ad7ff0 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
@@ -505,6 +505,146 @@ public class MaterialExample {
             return (Criteria) this;
         }
 
+        public Criteria andBrandIsNull() {
+            addCriterion("brand is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIsNotNull() {
+            addCriterion("brand is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandEqualTo(String value) {
+            addCriterion("brand =", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotEqualTo(String value) {
+            addCriterion("brand <>", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandGreaterThan(String value) {
+            addCriterion("brand >", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandGreaterThanOrEqualTo(String value) {
+            addCriterion("brand >=", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandLessThan(String value) {
+            addCriterion("brand <", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandLessThanOrEqualTo(String value) {
+            addCriterion("brand <=", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandLike(String value) {
+            addCriterion("brand like", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotLike(String value) {
+            addCriterion("brand not like", value, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIn(List<String> values) {
+            addCriterion("brand in", values, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotIn(List<String> values) {
+            addCriterion("brand not in", values, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandBetween(String value1, String value2) {
+            addCriterion("brand between", value1, value2, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandNotBetween(String value1, String value2) {
+            addCriterion("brand not between", value1, value2, "brand");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicIsNull() {
+            addCriterion("mnemonic is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicIsNotNull() {
+            addCriterion("mnemonic is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicEqualTo(String value) {
+            addCriterion("mnemonic =", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicNotEqualTo(String value) {
+            addCriterion("mnemonic <>", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicGreaterThan(String value) {
+            addCriterion("mnemonic >", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicGreaterThanOrEqualTo(String value) {
+            addCriterion("mnemonic >=", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicLessThan(String value) {
+            addCriterion("mnemonic <", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicLessThanOrEqualTo(String value) {
+            addCriterion("mnemonic <=", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicLike(String value) {
+            addCriterion("mnemonic like", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicNotLike(String value) {
+            addCriterion("mnemonic not like", value, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicIn(List<String> values) {
+            addCriterion("mnemonic in", values, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicNotIn(List<String> values) {
+            addCriterion("mnemonic not in", values, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicBetween(String value1, String value2) {
+            addCriterion("mnemonic between", value1, value2, "mnemonic");
+            return (Criteria) this;
+        }
+
+        public Criteria andMnemonicNotBetween(String value1, String value2) {
+            addCriterion("mnemonic not between", value1, value2, "mnemonic");
+            return (Criteria) this;
+        }
+
         public Criteria andColorIsNull() {
             addCriterion("color is null");
             return (Criteria) this;
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapper.xml
index 63a8a13ab..7befbf0c7 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapper.xml
@@ -1,480 +1,512 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.MaterialMapper">
-  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Material">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="category_id" jdbcType="BIGINT" property="categoryId" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="mfrs" jdbcType="VARCHAR" property="mfrs" />
-    <result column="model" jdbcType="VARCHAR" property="model" />
-    <result column="standard" jdbcType="VARCHAR" property="standard" />
-    <result column="color" jdbcType="VARCHAR" property="color" />
-    <result column="unit" jdbcType="VARCHAR" property="unit" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="img_name" jdbcType="VARCHAR" property="imgName" />
-    <result column="unit_id" jdbcType="BIGINT" property="unitId" />
-    <result column="expiry_num" jdbcType="INTEGER" property="expiryNum" />
-    <result column="weight" jdbcType="DECIMAL" property="weight" />
-    <result column="enabled" jdbcType="BIT" property="enabled" />
-    <result column="other_field1" jdbcType="VARCHAR" property="otherField1" />
-    <result column="other_field2" jdbcType="VARCHAR" property="otherField2" />
-    <result column="other_field3" jdbcType="VARCHAR" property="otherField3" />
-    <result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" />
-    <result column="enable_batch_number" jdbcType="VARCHAR" property="enableBatchNumber" />
-    <result column="position" jdbcType="VARCHAR" property="position" />
-    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
-    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, category_id, name, mfrs, model, standard, color, unit, remark, img_name, unit_id, 
-    expiry_num, weight, enabled, other_field1, other_field2, other_field3, enable_serial_number, 
-    enable_batch_number, position, tenant_id, delete_flag
-  </sql>
-  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from jsh_material
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from jsh_material
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from jsh_material
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample">
-    delete from jsh_material
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Material">
-    insert into jsh_material (id, category_id, name, 
-      mfrs, model, standard, 
-      color, unit, remark, 
-      img_name, unit_id, expiry_num, 
-      weight, enabled, other_field1, 
-      other_field2, other_field3, enable_serial_number, 
-      enable_batch_number, position, tenant_id, 
-      delete_flag)
-    values (#{id,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
-      #{mfrs,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, 
-      #{color,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
-      #{imgName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT}, #{expiryNum,jdbcType=INTEGER}, 
-      #{weight,jdbcType=DECIMAL}, #{enabled,jdbcType=BIT}, #{otherField1,jdbcType=VARCHAR}, 
-      #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR}, #{enableSerialNumber,jdbcType=VARCHAR}, 
-      #{enableBatchNumber,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
-      #{deleteFlag,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material">
-    insert into jsh_material
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="categoryId != null">
-        category_id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="mfrs != null">
-        mfrs,
-      </if>
-      <if test="model != null">
-        model,
-      </if>
-      <if test="standard != null">
-        standard,
-      </if>
-      <if test="color != null">
-        color,
-      </if>
-      <if test="unit != null">
-        unit,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="imgName != null">
-        img_name,
-      </if>
-      <if test="unitId != null">
-        unit_id,
-      </if>
-      <if test="expiryNum != null">
-        expiry_num,
-      </if>
-      <if test="weight != null">
-        weight,
-      </if>
-      <if test="enabled != null">
-        enabled,
-      </if>
-      <if test="otherField1 != null">
-        other_field1,
-      </if>
-      <if test="otherField2 != null">
-        other_field2,
-      </if>
-      <if test="otherField3 != null">
-        other_field3,
-      </if>
-      <if test="enableSerialNumber != null">
-        enable_serial_number,
-      </if>
-      <if test="enableBatchNumber != null">
-        enable_batch_number,
-      </if>
-      <if test="position != null">
-        position,
-      </if>
-      <if test="tenantId != null">
-        tenant_id,
-      </if>
-      <if test="deleteFlag != null">
-        delete_flag,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="categoryId != null">
-        #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="mfrs != null">
-        #{mfrs,jdbcType=VARCHAR},
-      </if>
-      <if test="model != null">
-        #{model,jdbcType=VARCHAR},
-      </if>
-      <if test="standard != null">
-        #{standard,jdbcType=VARCHAR},
-      </if>
-      <if test="color != null">
-        #{color,jdbcType=VARCHAR},
-      </if>
-      <if test="unit != null">
-        #{unit,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="imgName != null">
-        #{imgName,jdbcType=VARCHAR},
-      </if>
-      <if test="unitId != null">
-        #{unitId,jdbcType=BIGINT},
-      </if>
-      <if test="expiryNum != null">
-        #{expiryNum,jdbcType=INTEGER},
-      </if>
-      <if test="weight != null">
-        #{weight,jdbcType=DECIMAL},
-      </if>
-      <if test="enabled != null">
-        #{enabled,jdbcType=BIT},
-      </if>
-      <if test="otherField1 != null">
-        #{otherField1,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField2 != null">
-        #{otherField2,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField3 != null">
-        #{otherField3,jdbcType=VARCHAR},
-      </if>
-      <if test="enableSerialNumber != null">
-        #{enableSerialNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="enableBatchNumber != null">
-        #{enableBatchNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        #{tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="deleteFlag != null">
-        #{deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultType="java.lang.Long">
-    select count(*) from jsh_material
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update jsh_material
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.categoryId != null">
-        category_id = #{record.categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.mfrs != null">
-        mfrs = #{record.mfrs,jdbcType=VARCHAR},
-      </if>
-      <if test="record.model != null">
-        model = #{record.model,jdbcType=VARCHAR},
-      </if>
-      <if test="record.standard != null">
-        standard = #{record.standard,jdbcType=VARCHAR},
-      </if>
-      <if test="record.color != null">
-        color = #{record.color,jdbcType=VARCHAR},
-      </if>
-      <if test="record.unit != null">
-        unit = #{record.unit,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remark != null">
-        remark = #{record.remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.imgName != null">
-        img_name = #{record.imgName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.unitId != null">
-        unit_id = #{record.unitId,jdbcType=BIGINT},
-      </if>
-      <if test="record.expiryNum != null">
-        expiry_num = #{record.expiryNum,jdbcType=INTEGER},
-      </if>
-      <if test="record.weight != null">
-        weight = #{record.weight,jdbcType=DECIMAL},
-      </if>
-      <if test="record.enabled != null">
-        enabled = #{record.enabled,jdbcType=BIT},
-      </if>
-      <if test="record.otherField1 != null">
-        other_field1 = #{record.otherField1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otherField2 != null">
-        other_field2 = #{record.otherField2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otherField3 != null">
-        other_field3 = #{record.otherField3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.enableSerialNumber != null">
-        enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.enableBatchNumber != null">
-        enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.position != null">
-        position = #{record.position,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tenantId != null">
-        tenant_id = #{record.tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="record.deleteFlag != null">
-        delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update jsh_material
-    set id = #{record.id,jdbcType=BIGINT},
-      category_id = #{record.categoryId,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      mfrs = #{record.mfrs,jdbcType=VARCHAR},
-      model = #{record.model,jdbcType=VARCHAR},
-      standard = #{record.standard,jdbcType=VARCHAR},
-      color = #{record.color,jdbcType=VARCHAR},
-      unit = #{record.unit,jdbcType=VARCHAR},
-      remark = #{record.remark,jdbcType=VARCHAR},
-      img_name = #{record.imgName,jdbcType=VARCHAR},
-      unit_id = #{record.unitId,jdbcType=BIGINT},
-      expiry_num = #{record.expiryNum,jdbcType=INTEGER},
-      weight = #{record.weight,jdbcType=DECIMAL},
-      enabled = #{record.enabled,jdbcType=BIT},
-      other_field1 = #{record.otherField1,jdbcType=VARCHAR},
-      other_field2 = #{record.otherField2,jdbcType=VARCHAR},
-      other_field3 = #{record.otherField3,jdbcType=VARCHAR},
-      enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR},
-      enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR},
-      position = #{record.position,jdbcType=VARCHAR},
-      tenant_id = #{record.tenantId,jdbcType=BIGINT},
-      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Material">
-    update jsh_material
-    <set>
-      <if test="categoryId != null">
-        category_id = #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="mfrs != null">
-        mfrs = #{mfrs,jdbcType=VARCHAR},
-      </if>
-      <if test="model != null">
-        model = #{model,jdbcType=VARCHAR},
-      </if>
-      <if test="standard != null">
-        standard = #{standard,jdbcType=VARCHAR},
-      </if>
-      <if test="color != null">
-        color = #{color,jdbcType=VARCHAR},
-      </if>
-      <if test="unit != null">
-        unit = #{unit,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="imgName != null">
-        img_name = #{imgName,jdbcType=VARCHAR},
-      </if>
-      <if test="unitId != null">
-        unit_id = #{unitId,jdbcType=BIGINT},
-      </if>
-      <if test="expiryNum != null">
-        expiry_num = #{expiryNum,jdbcType=INTEGER},
-      </if>
-      <if test="weight != null">
-        weight = #{weight,jdbcType=DECIMAL},
-      </if>
-      <if test="enabled != null">
-        enabled = #{enabled,jdbcType=BIT},
-      </if>
-      <if test="otherField1 != null">
-        other_field1 = #{otherField1,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField2 != null">
-        other_field2 = #{otherField2,jdbcType=VARCHAR},
-      </if>
-      <if test="otherField3 != null">
-        other_field3 = #{otherField3,jdbcType=VARCHAR},
-      </if>
-      <if test="enableSerialNumber != null">
-        enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="enableBatchNumber != null">
-        enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        position = #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        tenant_id = #{tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="deleteFlag != null">
-        delete_flag = #{deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Material">
-    update jsh_material
-    set category_id = #{categoryId,jdbcType=BIGINT},
-      name = #{name,jdbcType=VARCHAR},
-      mfrs = #{mfrs,jdbcType=VARCHAR},
-      model = #{model,jdbcType=VARCHAR},
-      standard = #{standard,jdbcType=VARCHAR},
-      color = #{color,jdbcType=VARCHAR},
-      unit = #{unit,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      img_name = #{imgName,jdbcType=VARCHAR},
-      unit_id = #{unitId,jdbcType=BIGINT},
-      expiry_num = #{expiryNum,jdbcType=INTEGER},
-      weight = #{weight,jdbcType=DECIMAL},
-      enabled = #{enabled,jdbcType=BIT},
-      other_field1 = #{otherField1,jdbcType=VARCHAR},
-      other_field2 = #{otherField2,jdbcType=VARCHAR},
-      other_field3 = #{otherField3,jdbcType=VARCHAR},
-      enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR},
-      enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR},
-      position = #{position,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT},
-      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jsh.erp.datasource.mappers.MaterialMapper">
+  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Material">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="category_id" jdbcType="BIGINT" property="categoryId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="mfrs" jdbcType="VARCHAR" property="mfrs" />
+    <result column="model" jdbcType="VARCHAR" property="model" />
+    <result column="standard" jdbcType="VARCHAR" property="standard" />
+    <result column="brand" jdbcType="VARCHAR" property="brand" />
+    <result column="mnemonic" jdbcType="VARCHAR" property="mnemonic" />
+    <result column="color" jdbcType="VARCHAR" property="color" />
+    <result column="unit" jdbcType="VARCHAR" property="unit" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="img_name" jdbcType="VARCHAR" property="imgName" />
+    <result column="unit_id" jdbcType="BIGINT" property="unitId" />
+    <result column="expiry_num" jdbcType="INTEGER" property="expiryNum" />
+    <result column="weight" jdbcType="DECIMAL" property="weight" />
+    <result column="enabled" jdbcType="BIT" property="enabled" />
+    <result column="other_field1" jdbcType="VARCHAR" property="otherField1" />
+    <result column="other_field2" jdbcType="VARCHAR" property="otherField2" />
+    <result column="other_field3" jdbcType="VARCHAR" property="otherField3" />
+    <result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" />
+    <result column="enable_batch_number" jdbcType="VARCHAR" property="enableBatchNumber" />
+    <result column="position" jdbcType="VARCHAR" property="position" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, category_id, name, mfrs, model, standard, brand, mnemonic, color, unit, remark, 
+    img_name, unit_id, expiry_num, weight, enabled, other_field1, other_field2, other_field3, 
+    enable_serial_number, enable_batch_number, position, tenant_id, delete_flag
+  </sql>
+  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from jsh_material
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from jsh_material
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from jsh_material
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample">
+    delete from jsh_material
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Material">
+    insert into jsh_material (id, category_id, name, 
+      mfrs, model, standard, 
+      brand, mnemonic, color, 
+      unit, remark, img_name, 
+      unit_id, expiry_num, weight, 
+      enabled, other_field1, other_field2, 
+      other_field3, enable_serial_number, enable_batch_number, 
+      position, tenant_id, delete_flag
+      )
+    values (#{id,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
+      #{mfrs,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, 
+      #{brand,jdbcType=VARCHAR}, #{mnemonic,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, 
+      #{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{imgName,jdbcType=VARCHAR}, 
+      #{unitId,jdbcType=BIGINT}, #{expiryNum,jdbcType=INTEGER}, #{weight,jdbcType=DECIMAL}, 
+      #{enabled,jdbcType=BIT}, #{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, 
+      #{otherField3,jdbcType=VARCHAR}, #{enableSerialNumber,jdbcType=VARCHAR}, #{enableBatchNumber,jdbcType=VARCHAR}, 
+      #{position,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material">
+    insert into jsh_material
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="categoryId != null">
+        category_id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="mfrs != null">
+        mfrs,
+      </if>
+      <if test="model != null">
+        model,
+      </if>
+      <if test="standard != null">
+        standard,
+      </if>
+      <if test="brand != null">
+        brand,
+      </if>
+      <if test="mnemonic != null">
+        mnemonic,
+      </if>
+      <if test="color != null">
+        color,
+      </if>
+      <if test="unit != null">
+        unit,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="imgName != null">
+        img_name,
+      </if>
+      <if test="unitId != null">
+        unit_id,
+      </if>
+      <if test="expiryNum != null">
+        expiry_num,
+      </if>
+      <if test="weight != null">
+        weight,
+      </if>
+      <if test="enabled != null">
+        enabled,
+      </if>
+      <if test="otherField1 != null">
+        other_field1,
+      </if>
+      <if test="otherField2 != null">
+        other_field2,
+      </if>
+      <if test="otherField3 != null">
+        other_field3,
+      </if>
+      <if test="enableSerialNumber != null">
+        enable_serial_number,
+      </if>
+      <if test="enableBatchNumber != null">
+        enable_batch_number,
+      </if>
+      <if test="position != null">
+        position,
+      </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="categoryId != null">
+        #{categoryId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="mfrs != null">
+        #{mfrs,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="standard != null">
+        #{standard,jdbcType=VARCHAR},
+      </if>
+      <if test="brand != null">
+        #{brand,jdbcType=VARCHAR},
+      </if>
+      <if test="mnemonic != null">
+        #{mnemonic,jdbcType=VARCHAR},
+      </if>
+      <if test="color != null">
+        #{color,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null">
+        #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="imgName != null">
+        #{imgName,jdbcType=VARCHAR},
+      </if>
+      <if test="unitId != null">
+        #{unitId,jdbcType=BIGINT},
+      </if>
+      <if test="expiryNum != null">
+        #{expiryNum,jdbcType=INTEGER},
+      </if>
+      <if test="weight != null">
+        #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="enabled != null">
+        #{enabled,jdbcType=BIT},
+      </if>
+      <if test="otherField1 != null">
+        #{otherField1,jdbcType=VARCHAR},
+      </if>
+      <if test="otherField2 != null">
+        #{otherField2,jdbcType=VARCHAR},
+      </if>
+      <if test="otherField3 != null">
+        #{otherField3,jdbcType=VARCHAR},
+      </if>
+      <if test="enableSerialNumber != null">
+        #{enableSerialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="enableBatchNumber != null">
+        #{enableBatchNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultType="java.lang.Long">
+    select count(*) from jsh_material
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update jsh_material
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.categoryId != null">
+        category_id = #{record.categoryId,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mfrs != null">
+        mfrs = #{record.mfrs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null">
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.standard != null">
+        standard = #{record.standard,jdbcType=VARCHAR},
+      </if>
+      <if test="record.brand != null">
+        brand = #{record.brand,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mnemonic != null">
+        mnemonic = #{record.mnemonic,jdbcType=VARCHAR},
+      </if>
+      <if test="record.color != null">
+        color = #{record.color,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unit != null">
+        unit = #{record.unit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.imgName != null">
+        img_name = #{record.imgName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unitId != null">
+        unit_id = #{record.unitId,jdbcType=BIGINT},
+      </if>
+      <if test="record.expiryNum != null">
+        expiry_num = #{record.expiryNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.weight != null">
+        weight = #{record.weight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.enabled != null">
+        enabled = #{record.enabled,jdbcType=BIT},
+      </if>
+      <if test="record.otherField1 != null">
+        other_field1 = #{record.otherField1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.otherField2 != null">
+        other_field2 = #{record.otherField2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.otherField3 != null">
+        other_field3 = #{record.otherField3,jdbcType=VARCHAR},
+      </if>
+      <if test="record.enableSerialNumber != null">
+        enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.enableBatchNumber != null">
+        enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.position != null">
+        position = #{record.position,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
+      <if test="record.deleteFlag != null">
+        delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update jsh_material
+    set id = #{record.id,jdbcType=BIGINT},
+      category_id = #{record.categoryId,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      mfrs = #{record.mfrs,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      standard = #{record.standard,jdbcType=VARCHAR},
+      brand = #{record.brand,jdbcType=VARCHAR},
+      mnemonic = #{record.mnemonic,jdbcType=VARCHAR},
+      color = #{record.color,jdbcType=VARCHAR},
+      unit = #{record.unit,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      img_name = #{record.imgName,jdbcType=VARCHAR},
+      unit_id = #{record.unitId,jdbcType=BIGINT},
+      expiry_num = #{record.expiryNum,jdbcType=INTEGER},
+      weight = #{record.weight,jdbcType=DECIMAL},
+      enabled = #{record.enabled,jdbcType=BIT},
+      other_field1 = #{record.otherField1,jdbcType=VARCHAR},
+      other_field2 = #{record.otherField2,jdbcType=VARCHAR},
+      other_field3 = #{record.otherField3,jdbcType=VARCHAR},
+      enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR},
+      enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR},
+      position = #{record.position,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Material">
+    update jsh_material
+    <set>
+      <if test="categoryId != null">
+        category_id = #{categoryId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="mfrs != null">
+        mfrs = #{mfrs,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="standard != null">
+        standard = #{standard,jdbcType=VARCHAR},
+      </if>
+      <if test="brand != null">
+        brand = #{brand,jdbcType=VARCHAR},
+      </if>
+      <if test="mnemonic != null">
+        mnemonic = #{mnemonic,jdbcType=VARCHAR},
+      </if>
+      <if test="color != null">
+        color = #{color,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null">
+        unit = #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="imgName != null">
+        img_name = #{imgName,jdbcType=VARCHAR},
+      </if>
+      <if test="unitId != null">
+        unit_id = #{unitId,jdbcType=BIGINT},
+      </if>
+      <if test="expiryNum != null">
+        expiry_num = #{expiryNum,jdbcType=INTEGER},
+      </if>
+      <if test="weight != null">
+        weight = #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="enabled != null">
+        enabled = #{enabled,jdbcType=BIT},
+      </if>
+      <if test="otherField1 != null">
+        other_field1 = #{otherField1,jdbcType=VARCHAR},
+      </if>
+      <if test="otherField2 != null">
+        other_field2 = #{otherField2,jdbcType=VARCHAR},
+      </if>
+      <if test="otherField3 != null">
+        other_field3 = #{otherField3,jdbcType=VARCHAR},
+      </if>
+      <if test="enableSerialNumber != null">
+        enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="enableBatchNumber != null">
+        enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        position = #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Material">
+    update jsh_material
+    set category_id = #{categoryId,jdbcType=BIGINT},
+      name = #{name,jdbcType=VARCHAR},
+      mfrs = #{mfrs,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      standard = #{standard,jdbcType=VARCHAR},
+      brand = #{brand,jdbcType=VARCHAR},
+      mnemonic = #{mnemonic,jdbcType=VARCHAR},
+      color = #{color,jdbcType=VARCHAR},
+      unit = #{unit,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      img_name = #{imgName,jdbcType=VARCHAR},
+      unit_id = #{unitId,jdbcType=BIGINT},
+      expiry_num = #{expiryNum,jdbcType=INTEGER},
+      weight = #{weight,jdbcType=DECIMAL},
+      enabled = #{enabled,jdbcType=BIT},
+      other_field1 = #{otherField1,jdbcType=VARCHAR},
+      other_field2 = #{otherField2,jdbcType=VARCHAR},
+      other_field3 = #{otherField3,jdbcType=VARCHAR},
+      enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR},
+      enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR},
+      position = #{position,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 457af289a..3a85963e0 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -69,6 +69,28 @@
                   <a-input placeholder="请输入颜色" v-decorator.trim="[ 'color' ]" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="品牌" data-step="5" data-title="品牌"
+                             data-intro="请填写商品的品牌">
+                  <a-input placeholder="请输入品牌" v-decorator.trim="[ 'brand' ]" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="助记码" data-step="5" data-title="助记码"
+                             data-intro="请填写商品的助记码">
+                  <a-input placeholder="请输入助记码" v-decorator.trim="[ 'mnemonic' ]" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="类别"
+                             data-step="8" data-title="类别" data-intro="类别需要在【商品类别】页面进行录入，录入之后在此处进行调用">
+                  <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
+                                 :treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别">
+                  </a-tree-select>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基础重量" data-step="6" data-title="基础重量"
                   data-intro="请填写基本单位对应的重量，用于计算按重量分摊费用时单据中各行商品分摊的费用成本">
@@ -82,11 +104,15 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="类别"
-                  data-step="8" data-title="类别" data-intro="类别需要在【商品类别】页面进行录入，录入之后在此处进行调用">
-                  <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
-                                 :treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别">
-                  </a-tree-select>
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓位货架" data-step="11" data-title="仓位货架"
+                             data-intro="仓位货架指的是仓库中的仓位和货架号，主要适用于仓库较大的场景，方便查找商品的准确位置">
+                  <a-input style="width: 100%" placeholder="请输入仓位货架" v-decorator.trim="[ 'position' ]" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="制造商" data-step="5" data-title="制造商"
+                             data-intro="请填写商品的制造商，一般适用于制造行业">
+                  <a-input placeholder="请输入制造商" v-decorator.trim="[ 'mfrs' ]" />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -113,14 +139,8 @@
                   </a-tooltip>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓位货架" data-step="11" data-title="仓位货架"
-                  data-intro="仓位货架指的是仓库中的仓位和货架号，主要适用于仓库较大的场景，方便查找商品的准确位置">
-                  <a-input style="width: 100%" placeholder="请输入仓位货架" v-decorator.trim="[ 'position' ]" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-if="!model.id">
-                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="多属性" data-step="12" data-title="多属性"
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多属性" data-step="12" data-title="多属性"
                   data-intro="多属性是针对的sku商品（比如服装、鞋帽行业），此处开关如果启用就可以在下方进行多sku的配置，配置具体的颜色、尺码之类的组合">
                   <a-tooltip title="多属性针对服装、鞋帽等行业，需要先录入单位才能激活此处输入框">
                     <a-tag class="tag-info" v-if="!manySkuStatus">需要先录入单位才能激活</a-tag>