'物资排序'

pom.xml

@@ -194,7 +194,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>RMS_SUPPLIER</table>
+                        <table>RMS_MATERIAL</table>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/mapper/AmsSaleMaterialMapper.java

@@ -16,4 +16,6 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
 
     // 通过物资编码查询物资id
     BigDecimal getMaterialId(String materialCode);
+    // 得到物资出现次数
+    Integer getMaterialCount(BigDecimal materialId);
 }

src/main/java/com/steerinfo/dil/model/RmsMaterial.java

@@ -10,19 +10,19 @@ import java.util.Date;
 @ApiModel(value="物资")
 public class RmsMaterial implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(MATERIAL_ID,DECIMAL,38)
+     * 主键ID(MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal materialId;
 
     /**
-     * 物资类型ID(MATERIAL_TYPE_ID,DECIMAL,38)
+     * 物资类型ID(MATERIAL_TYPE_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="物资类型ID",required=false)
     private BigDecimal materialTypeId;
 
     /**
-     * 计量单位ID(UNIT_OF_MEASURE_ID,DECIMAL,38)
+     * 计量单位ID(UNIT_OF_MEASURE_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="计量单位ID",required=false)
     private BigDecimal unitOfMeasureId;
@@ -40,13 +40,13 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
     private String materialName;
 
     /**
-     * 规格(MATERIAL_SPECIFICATION,VARCHAR,100)
+     * 规格(MATERIAL_SPECIFICATION,VARCHAR,500)
      */
     @ApiModelProperty(value="规格",required=false)
     private String materialSpecification;
 
     /**
-     * 型号(MATERIAL_MODEL,VARCHAR,100)
+     * 型号(MATERIAL_MODEL,VARCHAR,500)
      */
     @ApiModelProperty(value="型号",required=false)
     private String materialModel;
@@ -99,6 +99,24 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 物资理重(MATERIAL_THEORETICAL_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资理重",required=false)
+    private BigDecimal materialTheoreticalWeight;
+
+    /**
+     * 装卸货优先次序(MATERIAL_ORDER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装卸货优先次序",required=false)
+    private BigDecimal materialOrder;
+
+    /**
+     * 钢材订单中出现次数(MATERIAL_COUNT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="钢材订单中出现次数",required=false)
+    private BigDecimal materialCount;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -231,6 +249,30 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public BigDecimal getMaterialTheoreticalWeight() {
+        return materialTheoreticalWeight;
+    }
+
+    public void setMaterialTheoreticalWeight(BigDecimal materialTheoreticalWeight) {
+        this.materialTheoreticalWeight = materialTheoreticalWeight;
+    }
+
+    public BigDecimal getMaterialOrder() {
+        return materialOrder;
+    }
+
+    public void setMaterialOrder(BigDecimal materialOrder) {
+        this.materialOrder = materialOrder;
+    }
+
+    public BigDecimal getMaterialCount() {
+        return materialCount;
+    }
+
+    public void setMaterialCount(BigDecimal materialCount) {
+        this.materialCount = materialCount;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -252,6 +294,9 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", easMaterialId=").append(easMaterialId);
         sb.append(", deleted=").append(deleted);
+        sb.append(", materialTheoreticalWeight=").append(materialTheoreticalWeight);
+        sb.append(", materialOrder=").append(materialOrder);
+        sb.append(", materialCount=").append(materialCount);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -45,6 +45,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     AmsSaleOrderCarrierMapper amsSaleOrderCarrierMapper;
     @Autowired
     OmstruckOrderMapper omstruckOrderMapper;
+    @Autowired
+    RmsMaterialMapper rmsMaterialMapper;
 
     /**
      * 查询销售订单
@@ -271,6 +273,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                         }
                     }
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);
+                    Integer materialCount = amsSaleMaterialMapper.getMaterialCount(materialId);
+                    RmsMaterial rmsMaterial = new RmsMaterial();
+                    rmsMaterial.setMaterialId(materialId);
+                    if (materialCount == null) {
+                        materialCount = new Integer(0);
+                    }
+                    rmsMaterial.setMaterialCount(new BigDecimal(materialCount + 1));
+                    rmsMaterialMapper.updateByPrimaryKeySelective(rmsMaterial);
                     // 得到金蝶分录主键
                     String easPrimaryId = (String) materialMap.get("easPrimaryId");
                     // 得到物资重量

src/main/resources/com/steerinfo/dil/mapper/AmsSaleMaterialMapper.xml

@@ -503,4 +503,10 @@
         AND RM.DELETED = 0
     </select>
 
+    <select id="getMaterialCount" parameterType="DECIMAL" resultType="java.lang.Integer">
+        SELECT RM.MATERIAL_COUNT AS "materialCount"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_ID = #{materialId}
+    </select>
+
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -2,42 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.RmsMaterialMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsMaterial">
-        <id column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
-        <result column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId"/>
-        <result column="UNIT_OF_MEASURE_ID" jdbcType="DECIMAL" property="unitOfMeasureId"/>
-        <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode"/>
-        <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName"/>
-        <result column="MATERIAL_SPECIFICATION" jdbcType="VARCHAR" property="materialSpecification"/>
-        <result column="MATERIAL_MODEL" jdbcType="VARCHAR" property="materialModel"/>
-        <result column="MATERIAL_LENGTH" jdbcType="DECIMAL" property="materialLength"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="EAS_MATERIAL_ID" jdbcType="VARCHAR" property="easMaterialId"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <id column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+        <result column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId" />
+        <result column="UNIT_OF_MEASURE_ID" jdbcType="DECIMAL" property="unitOfMeasureId" />
+        <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode" />
+        <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
+        <result column="MATERIAL_SPECIFICATION" jdbcType="VARCHAR" property="materialSpecification" />
+        <result column="MATERIAL_MODEL" jdbcType="VARCHAR" property="materialModel" />
+        <result column="MATERIAL_LENGTH" jdbcType="DECIMAL" property="materialLength" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="EAS_MATERIAL_ID" jdbcType="VARCHAR" property="easMaterialId" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="MATERIAL_THEORETICAL_WEIGHT" jdbcType="DECIMAL" property="materialTheoreticalWeight" />
+        <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder" />
+        <result column="MATERIAL_COUNT" jdbcType="DECIMAL" property="materialCount" />
     </resultMap>
     <sql id="columns">
         MATERIAL_ID, MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID, MATERIAL_CODE, MATERIAL_NAME,
     MATERIAL_SPECIFICATION, MATERIAL_MODEL, MATERIAL_LENGTH, INSERT_USERNAME, INSERT_TIME,
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED, MATERIAL_THEORETICAL_WEIGHT,
+    MATERIAL_ORDER, MATERIAL_COUNT
     </sql>
     <sql id="columns_alias">
         t.MATERIAL_ID, t.MATERIAL_TYPE_ID, t.UNIT_OF_MEASURE_ID, t.MATERIAL_CODE, t.MATERIAL_NAME,
     t.MATERIAL_SPECIFICATION, t.MATERIAL_MODEL, t.MATERIAL_LENGTH, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_MATERIAL_ID,
-    t.DELETED
+    t.DELETED, t.MATERIAL_THEORETICAL_WEIGHT, t.MATERIAL_ORDER, t.MATERIAL_COUNT
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM RMS_MATERIAL
+        SELECT <include refid="columns" /> FROM RMS_MATERIAL
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM RMS_MATERIAL t
+        SELECT <include refid="columns_alias" /> FROM RMS_MATERIAL t
     </sql>
     <sql id="where">
         <where>
@@ -86,6 +86,15 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="materialTheoreticalWeight != null">
+                and MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight}
+            </if>
+            <if test="materialOrder != null">
+                and MATERIAL_ORDER = #{materialOrder}
+            </if>
+            <if test="materialCount != null">
+                and MATERIAL_COUNT = #{materialCount}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -135,11 +144,19 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="materialTheoreticalWeight != null">
+                and MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight}
+            </if>
+            <if test="materialOrder != null">
+                and MATERIAL_ORDER = #{materialOrder}
+            </if>
+            <if test="materialCount != null">
+                and MATERIAL_COUNT = #{materialCount}
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from RMS_MATERIAL
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+        delete from RMS_MATERIAL
         where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -187,20 +204,31 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
+        <if test="materialTheoreticalWeight != null">
+            or MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight}
+        </if>
+        <if test="materialOrder != null">
+            or MATERIAL_ORDER = #{materialOrder}
+        </if>
+        <if test="materialCount != null">
+            or MATERIAL_COUNT = #{materialCount}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterial">
         insert into RMS_MATERIAL (MATERIAL_ID, MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID,
                                   MATERIAL_CODE, MATERIAL_NAME, MATERIAL_SPECIFICATION,
                                   MATERIAL_MODEL, MATERIAL_LENGTH, INSERT_USERNAME,
                                   INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                  INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED)
+                                  INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED,
+                                  MATERIAL_THEORETICAL_WEIGHT, MATERIAL_ORDER,
+                                  MATERIAL_COUNT)
         values (#{materialId,jdbcType=DECIMAL}, #{materialTypeId,jdbcType=DECIMAL}, #{unitOfMeasureId,jdbcType=DECIMAL},
-                #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR},
-                #{materialSpecification,jdbcType=VARCHAR},
-                #{materialModel,jdbcType=VARCHAR}, #{materialLength,jdbcType=DECIMAL},
-                #{insertUsername,jdbcType=VARCHAR},
+                #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{materialSpecification,jdbcType=VARCHAR},
+                #{materialModel,jdbcType=VARCHAR}, #{materialLength,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{materialTheoreticalWeight,jdbcType=DECIMAL}, #{materialOrder,jdbcType=DECIMAL},
+                #{materialCount,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
         insert into RMS_MATERIAL
@@ -250,6 +278,15 @@
             <if test="deleted != null">
                 DELETED,
             </if>
+            <if test="materialTheoreticalWeight != null">
+                MATERIAL_THEORETICAL_WEIGHT,
+            </if>
+            <if test="materialOrder != null">
+                MATERIAL_ORDER,
+            </if>
+            <if test="materialCount != null">
+                MATERIAL_COUNT,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialId != null">
@@ -297,24 +334,36 @@
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="materialTheoreticalWeight != null">
+                #{materialTheoreticalWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="materialOrder != null">
+                #{materialOrder,jdbcType=DECIMAL},
+            </if>
+            <if test="materialCount != null">
+                #{materialCount,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsMaterial">
         update RMS_MATERIAL
-        set MATERIAL_TYPE_ID       = #{materialTypeId,jdbcType=DECIMAL},
-            UNIT_OF_MEASURE_ID     = #{unitOfMeasureId,jdbcType=DECIMAL},
-            MATERIAL_CODE          = #{materialCode,jdbcType=VARCHAR},
-            MATERIAL_NAME          = #{materialName,jdbcType=VARCHAR},
+        set MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
+            UNIT_OF_MEASURE_ID = #{unitOfMeasureId,jdbcType=DECIMAL},
+            MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
+            MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
             MATERIAL_SPECIFICATION = #{materialSpecification,jdbcType=VARCHAR},
-            MATERIAL_MODEL         = #{materialModel,jdbcType=VARCHAR},
-            MATERIAL_LENGTH        = #{materialLength,jdbcType=DECIMAL},
-            INSERT_USERNAME        = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME            = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME        = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME            = #{updateTime,jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK   = #{insertUpdateRemark,jdbcType=VARCHAR},
-            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=VARCHAR},
-            DELETED                = #{deleted,jdbcType=DECIMAL}
+            MATERIAL_MODEL = #{materialModel,jdbcType=VARCHAR},
+            MATERIAL_LENGTH = #{materialLength,jdbcType=DECIMAL},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            EAS_MATERIAL_ID = #{easMaterialId,jdbcType=VARCHAR},
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight,jdbcType=DECIMAL},
+            MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
+            MATERIAL_COUNT = #{materialCount,jdbcType=DECIMAL}
         where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
@@ -362,20 +411,29 @@
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="materialTheoreticalWeight != null">
+                MATERIAL_THEORETICAL_WEIGHT = #{materialTheoreticalWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="materialOrder != null">
+                MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
+            </if>
+            <if test="materialCount != null">
+                MATERIAL_COUNT = #{materialCount,jdbcType=DECIMAL},
+            </if>
         </set>
         where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+        <include refid="select" />
         where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into RMS_MATERIAL
@@ -386,99 +444,111 @@
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, EAS_MATERIAL_ID,
-        DELETED)
+        DELETED, MATERIAL_THEORETICAL_WEIGHT,
+        MATERIAL_ORDER, MATERIAL_COUNT)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.materialId,jdbcType=DECIMAL},
         #{item.materialTypeId,jdbcType=DECIMAL}, #{item.unitOfMeasureId,jdbcType=DECIMAL},
-        #{item.materialCode,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR},
-        #{item.materialSpecification,jdbcType=VARCHAR},
+        #{item.materialCode,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR}, #{item.materialSpecification,jdbcType=VARCHAR},
         #{item.materialModel,jdbcType=VARCHAR}, #{item.materialLength,jdbcType=DECIMAL},
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=VARCHAR},
-        #{item.deleted,jdbcType=DECIMAL} from dual
+        #{item.deleted,jdbcType=DECIMAL}, #{item.materialTheoreticalWeight,jdbcType=DECIMAL},
+        #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialCount,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update RMS_MATERIAL
         set
         MATERIAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
         </foreach>
         ,MATERIAL_TYPE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
         </foreach>
         ,UNIT_OF_MEASURE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.unitOfMeasureId,jdbcType=DECIMAL}
         </foreach>
         ,MATERIAL_CODE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.materialCode,jdbcType=VARCHAR}
         </foreach>
         ,MATERIAL_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.materialName,jdbcType=VARCHAR}
         </foreach>
         ,MATERIAL_SPECIFICATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.materialSpecification,jdbcType=VARCHAR}
         </foreach>
         ,MATERIAL_MODEL=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.materialModel,jdbcType=VARCHAR}
         </foreach>
         ,MATERIAL_LENGTH=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.materialLength,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,EAS_MATERIAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
             when #{item.materialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
+        ,MATERIAL_THEORETICAL_WEIGHT=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialTheoreticalWeight,jdbcType=DECIMAL}
+        </foreach>
+        ,MATERIAL_ORDER=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialOrder,jdbcType=DECIMAL}
+        </foreach>
+        ,MATERIAL_COUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialCount,jdbcType=DECIMAL}
+        </foreach>
         where MATERIAL_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.materialId,jdbcType=DECIMAL}
         </foreach>
     </update>
     <delete id="batchDelete" parameterType="java.util.List">
         delete from RMS_MATERIAL
         where MATERIAL_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-
     <!-- 展示物资信息 -->
     <select id="getMaterialList" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *