Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

pom.xml

@@ -117,7 +117,7 @@
 <!--                        <param>WMSP_INBOUND_CORRECT_RESULT</param>-->
 <!--                        <param>WMSP_INBOUND_DRIVING_RESULT</param>-->
 <!--                        <param>WMSP_GRID_MATERIAL</param>-->
-                        <param>WMSP_RESTACK_MAKE_TYPE_RESULT</param>
+                        <param>RMS_STACKING</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/WmspOutboundResultController.java

@@ -493,5 +493,6 @@ public class WmspOutboundResultController extends BaseRESTfulController {
     public  RESTfulResult insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map){
         return success();
     }
+
 }
 

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

@@ -86,6 +86,18 @@ public class RmsStacking implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="垛位位置",required=false)
     private BigDecimal stackingArrival;
 
+    /**
+     * 垛位最大层数(STACKING_MAX_LAYERS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="垛位最大层数",required=false)
+    private BigDecimal stackingMaxLayers;
+
+    /**
+     * 垛位启用状态(STACKING_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="垛位启用状态",required=false)
+    private BigDecimal stackingStatus;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -202,6 +214,22 @@ public class RmsStacking implements IBasePO<BigDecimal> {
         this.stackingArrival = stackingArrival;
     }
 
+    public BigDecimal getStackingMaxLayers() {
+        return stackingMaxLayers;
+    }
+
+    public void setStackingMaxLayers(BigDecimal stackingMaxLayers) {
+        this.stackingMaxLayers = stackingMaxLayers;
+    }
+
+    public BigDecimal getStackingStatus() {
+        return stackingStatus;
+    }
+
+    public void setStackingStatus(BigDecimal stackingStatus) {
+        this.stackingStatus = stackingStatus;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -221,6 +249,8 @@ public class RmsStacking implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", stackingArrival=").append(stackingArrival);
+        sb.append(", stackingMaxLayers=").append(stackingMaxLayers);
+        sb.append(", stackingStatus=").append(stackingStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IRmsStackingService.java

@@ -30,4 +30,5 @@ public interface IRmsStackingService {
 
     // 计算并更新垛位
     Map<String,Object> getStackingToUpdate(Integer materialNumber,BigDecimal warehouseId,String personnelJobNumber);
+    Integer updateStackingStatus(BigDecimal stackingId,BigDecimal stackingStatus);
 }

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

@@ -141,4 +141,16 @@ public class RmsStackingServiceImpl  implements IRmsStackingService {
     public String selectStackNo(BigDecimal stackingId) {
         return rmsStackingMapper.selectStackNo(stackingId);
     }
+
+    /*
+    * 堆垛原则问题，一旦某垛位堆满，则编辑某垛位启用状态
+    * 启用：0  未启用：1
+    *当一个垛位满时，再从中拿出几件，也不改变垛位的启用状态；只有当垛位为空时，才改变状态
+     */
+    @Override
+    public  Integer updateStackingStatus(BigDecimal stackingId,BigDecimal stackingStatus){
+      RmsStacking rmsStacking = rmsStackingMapper.selectByPrimaryKey(stackingId);
+      rmsStacking.setStackingStatus(stackingStatus);
+      return rmsStackingMapper.updateByPrimaryKeySelective(rmsStacking);
+    }
 }

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

@@ -1,265 +1,300 @@
 <?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.steerinfo.dil.mapper.RmsStackingMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsStacking">
-        <id column="STACKING_ID" jdbcType="DECIMAL" property="stackingId" />
-        <result column="STACKING_NO" jdbcType="VARCHAR" property="stackingNo" />
-        <result column="STACKING_SEQUENCE" jdbcType="DECIMAL" property="stackingSequence" />
-        <result column="STACKING_REMARKS" jdbcType="VARCHAR" property="stackingRemarks" />
-        <result column="STACKING_TYPE" jdbcType="DECIMAL" property="stackingType" />
-        <result column="STACKING_MATERIAL_NUMBER" jdbcType="DECIMAL" property="stackingMaterialNumber" />
-        <result column="STACKING_REMAIN_NUMBER" jdbcType="DECIMAL" property="stackingRemainNumber" />
-        <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="STACKING_ARRIVAL" jdbcType="DECIMAL" property="stackingArrival" />
-    </resultMap>
-    <sql id="columns">
-    STACKING_ID, STACKING_NO, STACKING_SEQUENCE, STACKING_REMARKS, STACKING_TYPE, STACKING_MATERIAL_NUMBER,
-    STACKING_REMAIN_NUMBER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, STACKING_ARRIVAL
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsStacking">
+    <id column="STACKING_ID" jdbcType="DECIMAL" property="stackingId" />
+    <result column="STACKING_NO" jdbcType="VARCHAR" property="stackingNo" />
+    <result column="STACKING_SEQUENCE" jdbcType="DECIMAL" property="stackingSequence" />
+    <result column="STACKING_REMARKS" jdbcType="VARCHAR" property="stackingRemarks" />
+    <result column="STACKING_TYPE" jdbcType="DECIMAL" property="stackingType" />
+    <result column="STACKING_MATERIAL_NUMBER" jdbcType="DECIMAL" property="stackingMaterialNumber" />
+    <result column="STACKING_REMAIN_NUMBER" jdbcType="DECIMAL" property="stackingRemainNumber" />
+    <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="STACKING_ARRIVAL" jdbcType="DECIMAL" property="stackingArrival" />
+    <result column="STACKING_MAX_LAYERS" jdbcType="DECIMAL" property="stackingMaxLayers" />
+    <result column="STACKING_STATUS" jdbcType="DECIMAL" property="stackingStatus" />
+  </resultMap>
+  <sql id="columns">
+    STACKING_ID, STACKING_NO, STACKING_SEQUENCE, STACKING_REMARKS, STACKING_TYPE, STACKING_MATERIAL_NUMBER, 
+    STACKING_REMAIN_NUMBER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    INSERT_UPDATE_REMARK, STACKING_ARRIVAL, STACKING_MAX_LAYERS, STACKING_STATUS
   </sql>
-    <sql id="columns_alias">
-    t.STACKING_ID, t.STACKING_NO, t.STACKING_SEQUENCE, t.STACKING_REMARKS, t.STACKING_TYPE,
-    t.STACKING_MATERIAL_NUMBER, t.STACKING_REMAIN_NUMBER, t.INSERT_USERNAME, t.INSERT_TIME,
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.STACKING_ARRIVAL
+  <sql id="columns_alias">
+    t.STACKING_ID, t.STACKING_NO, t.STACKING_SEQUENCE, t.STACKING_REMARKS, t.STACKING_TYPE, 
+    t.STACKING_MATERIAL_NUMBER, t.STACKING_REMAIN_NUMBER, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.STACKING_ARRIVAL, t.STACKING_MAX_LAYERS, 
+    t.STACKING_STATUS
   </sql>
-    <sql id="select">
-        SELECT <include refid="columns" /> FROM RMS_STACKING
-    </sql>
-    <sql id="select_alias">
-        SELECT <include refid="columns_alias" /> FROM RMS_STACKING t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="stackingId != null">
-                and STACKING_ID = #{stackingId}
-            </if>
-            <if test="stackingNo != null and stackingNo != ''">
-                and STACKING_NO = #{stackingNo}
-            </if>
-            <if test="stackingSequence != null">
-                and STACKING_SEQUENCE = #{stackingSequence}
-            </if>
-            <if test="stackingRemarks != null and stackingRemarks != ''">
-                and STACKING_REMARKS = #{stackingRemarks}
-            </if>
-            <if test="stackingType != null">
-                and STACKING_TYPE = #{stackingType}
-            </if>
-            <if test="stackingMaterialNumber != null">
-                and STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber}
-            </if>
-            <if test="stackingRemainNumber != null">
-                and STACKING_REMAIN_NUMBER = #{stackingRemainNumber}
-            </if>
-            <if test="insertUsername != null and insertUsername != ''">
-                and INSERT_USERNAME = #{insertUsername}
-            </if>
-            <if test="insertTime != null">
-                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-            </if>
-            <if test="updateUsername != null and updateUsername != ''">
-                and UPDATE_USERNAME = #{updateUsername}
-            </if>
-            <if test="updateTime != null">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-            </if>
-            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-            </if>
-            <if test="stackingArrival != null">
-                and STACKING_ARRIVAL = #{stackingArrival}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="stackingId != null">
-                and STACKING_ID = #{stackingId}
-            </if>
-            <if test="stackingNo != null and stackingNo != ''">
-                and STACKING_NO LIKE '%${stackingNo}%'
-            </if>
-            <if test="stackingSequence != null">
-                and STACKING_SEQUENCE = #{stackingSequence}
-            </if>
-            <if test="stackingRemarks != null and stackingRemarks != ''">
-                and STACKING_REMARKS LIKE '%${stackingRemarks}%'
-            </if>
-            <if test="stackingType != null">
-                and STACKING_TYPE = #{stackingType}
-            </if>
-            <if test="stackingMaterialNumber != null">
-                and STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber}
-            </if>
-            <if test="stackingRemainNumber != null">
-                and STACKING_REMAIN_NUMBER = #{stackingRemainNumber}
-            </if>
-            <if test="insertUsername != null and insertUsername != ''">
-                and INSERT_USERNAME LIKE '%${insertUsername}%'
-            </if>
-            <if test="insertTime != null">
-                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-            </if>
-            <if test="updateUsername != null and updateUsername != ''">
-                and UPDATE_USERNAME LIKE '%${updateUsername}%'
-            </if>
-            <if test="updateTime != null">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-            </if>
-            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-            </if>
-            <if test="stackingArrival != null">
-                and STACKING_ARRIVAL = #{stackingArrival}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_STACKING
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_STACKING t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="stackingId != null">
+        and STACKING_ID = #{stackingId}
+      </if>
+      <if test="stackingNo != null and stackingNo != ''">
+        and STACKING_NO = #{stackingNo}
+      </if>
+      <if test="stackingSequence != null">
+        and STACKING_SEQUENCE = #{stackingSequence}
+      </if>
+      <if test="stackingRemarks != null and stackingRemarks != ''">
+        and STACKING_REMARKS = #{stackingRemarks}
+      </if>
+      <if test="stackingType != null">
+        and STACKING_TYPE = #{stackingType}
+      </if>
+      <if test="stackingMaterialNumber != null">
+        and STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber}
+      </if>
+      <if test="stackingRemainNumber != null">
+        and STACKING_REMAIN_NUMBER = #{stackingRemainNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="stackingArrival != null">
+        and STACKING_ARRIVAL = #{stackingArrival}
+      </if>
+      <if test="stackingMaxLayers != null">
+        and STACKING_MAX_LAYERS = #{stackingMaxLayers}
+      </if>
+      <if test="stackingStatus != null">
+        and STACKING_STATUS = #{stackingStatus}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="stackingId != null">
+        and STACKING_ID = #{stackingId}
+      </if>
+      <if test="stackingNo != null and stackingNo != ''">
+        and STACKING_NO LIKE '%${stackingNo}%'
+      </if>
+      <if test="stackingSequence != null">
+        and STACKING_SEQUENCE = #{stackingSequence}
+      </if>
+      <if test="stackingRemarks != null and stackingRemarks != ''">
+        and STACKING_REMARKS LIKE '%${stackingRemarks}%'
+      </if>
+      <if test="stackingType != null">
+        and STACKING_TYPE = #{stackingType}
+      </if>
+      <if test="stackingMaterialNumber != null">
+        and STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber}
+      </if>
+      <if test="stackingRemainNumber != null">
+        and STACKING_REMAIN_NUMBER = #{stackingRemainNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="stackingArrival != null">
+        and STACKING_ARRIVAL = #{stackingArrival}
+      </if>
+      <if test="stackingMaxLayers != null">
+        and STACKING_MAX_LAYERS = #{stackingMaxLayers}
+      </if>
+      <if test="stackingStatus != null">
+        and STACKING_STATUS = #{stackingStatus}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
     delete from RMS_STACKING
     where STACKING_ID = #{stackingId,jdbcType=DECIMAL}
   </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from RMS_STACKING
-        where 1!=1
-        <if test="stackingNo != null and stackingNo != ''">
-            or STACKING_NO = #{stackingNo}
-        </if>
-        <if test="stackingSequence != null">
-            or STACKING_SEQUENCE = #{stackingSequence}
-        </if>
-        <if test="stackingRemarks != null and stackingRemarks != ''">
-            or STACKING_REMARKS = #{stackingRemarks}
-        </if>
-        <if test="stackingType != null">
-            or STACKING_TYPE = #{stackingType}
-        </if>
-        <if test="stackingMaterialNumber != null">
-            or STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber}
-        </if>
-        <if test="stackingRemainNumber != null">
-            or STACKING_REMAIN_NUMBER = #{stackingRemainNumber}
-        </if>
-        <if test="insertUsername != null and insertUsername != ''">
-            or INSERT_USERNAME = #{insertUsername}
-        </if>
-        <if test="insertTime != null">
-            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-        </if>
-        <if test="updateUsername != null and updateUsername != ''">
-            or UPDATE_USERNAME = #{updateUsername}
-        </if>
-        <if test="updateTime != null">
-            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-        </if>
-        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-        </if>
-        <if test="stackingArrival != null">
-            or STACKING_ARRIVAL = #{stackingArrival}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.RmsStacking">
-    insert into RMS_STACKING (STACKING_ID, STACKING_NO, STACKING_SEQUENCE,
-      STACKING_REMARKS, STACKING_TYPE, STACKING_MATERIAL_NUMBER,
-      STACKING_REMAIN_NUMBER, INSERT_USERNAME, INSERT_TIME,
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-      STACKING_ARRIVAL)
-    values (#{stackingId,jdbcType=DECIMAL}, #{stackingNo,jdbcType=VARCHAR}, #{stackingSequence,jdbcType=DECIMAL},
-      #{stackingRemarks,jdbcType=VARCHAR}, #{stackingType,jdbcType=DECIMAL}, #{stackingMaterialNumber,jdbcType=DECIMAL},
-      #{stackingRemainNumber,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
-      #{stackingArrival,jdbcType=DECIMAL})
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_STACKING
+    where 1!=1 
+      <if test="stackingNo != null and stackingNo != ''">
+        or STACKING_NO = #{stackingNo}
+      </if>
+      <if test="stackingSequence != null">
+        or STACKING_SEQUENCE = #{stackingSequence}
+      </if>
+      <if test="stackingRemarks != null and stackingRemarks != ''">
+        or STACKING_REMARKS = #{stackingRemarks}
+      </if>
+      <if test="stackingType != null">
+        or STACKING_TYPE = #{stackingType}
+      </if>
+      <if test="stackingMaterialNumber != null">
+        or STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber}
+      </if>
+      <if test="stackingRemainNumber != null">
+        or STACKING_REMAIN_NUMBER = #{stackingRemainNumber}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="stackingArrival != null">
+        or STACKING_ARRIVAL = #{stackingArrival}
+      </if>
+      <if test="stackingMaxLayers != null">
+        or STACKING_MAX_LAYERS = #{stackingMaxLayers}
+      </if>
+      <if test="stackingStatus != null">
+        or STACKING_STATUS = #{stackingStatus}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsStacking">
+    insert into RMS_STACKING (STACKING_ID, STACKING_NO, STACKING_SEQUENCE, 
+      STACKING_REMARKS, STACKING_TYPE, STACKING_MATERIAL_NUMBER, 
+      STACKING_REMAIN_NUMBER, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      STACKING_ARRIVAL, STACKING_MAX_LAYERS, STACKING_STATUS
+      )
+    values (#{stackingId,jdbcType=DECIMAL}, #{stackingNo,jdbcType=VARCHAR}, #{stackingSequence,jdbcType=DECIMAL}, 
+      #{stackingRemarks,jdbcType=VARCHAR}, #{stackingType,jdbcType=DECIMAL}, #{stackingMaterialNumber,jdbcType=DECIMAL}, 
+      #{stackingRemainNumber,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{stackingArrival,jdbcType=DECIMAL}, #{stackingMaxLayers,jdbcType=DECIMAL}, #{stackingStatus,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsStacking">
+    insert into RMS_STACKING
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="stackingId != null">
+        STACKING_ID,
+      </if>
+      <if test="stackingNo != null">
+        STACKING_NO,
+      </if>
+      <if test="stackingSequence != null">
+        STACKING_SEQUENCE,
+      </if>
+      <if test="stackingRemarks != null">
+        STACKING_REMARKS,
+      </if>
+      <if test="stackingType != null">
+        STACKING_TYPE,
+      </if>
+      <if test="stackingMaterialNumber != null">
+        STACKING_MATERIAL_NUMBER,
+      </if>
+      <if test="stackingRemainNumber != null">
+        STACKING_REMAIN_NUMBER,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="stackingArrival != null">
+        STACKING_ARRIVAL,
+      </if>
+      <if test="stackingMaxLayers != null">
+        STACKING_MAX_LAYERS,
+      </if>
+      <if test="stackingStatus != null">
+        STACKING_STATUS,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="stackingId != null">
+        #{stackingId,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingNo != null">
+        #{stackingNo,jdbcType=VARCHAR},
+      </if>
+      <if test="stackingSequence != null">
+        #{stackingSequence,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingRemarks != null">
+        #{stackingRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="stackingType != null">
+        #{stackingType,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingMaterialNumber != null">
+        #{stackingMaterialNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingRemainNumber != null">
+        #{stackingRemainNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="stackingArrival != null">
+        #{stackingArrival,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingMaxLayers != null">
+        #{stackingMaxLayers,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingStatus != null">
+        #{stackingStatus,jdbcType=DECIMAL},
+      </if>
+    </trim>
   </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsStacking">
-        insert into RMS_STACKING
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stackingId != null">
-                STACKING_ID,
-            </if>
-            <if test="stackingNo != null">
-                STACKING_NO,
-            </if>
-            <if test="stackingSequence != null">
-                STACKING_SEQUENCE,
-            </if>
-            <if test="stackingRemarks != null">
-                STACKING_REMARKS,
-            </if>
-            <if test="stackingType != null">
-                STACKING_TYPE,
-            </if>
-            <if test="stackingMaterialNumber != null">
-                STACKING_MATERIAL_NUMBER,
-            </if>
-            <if test="stackingRemainNumber != null">
-                STACKING_REMAIN_NUMBER,
-            </if>
-            <if test="insertUsername != null">
-                INSERT_USERNAME,
-            </if>
-            <if test="insertTime != null">
-                INSERT_TIME,
-            </if>
-            <if test="updateUsername != null">
-                UPDATE_USERNAME,
-            </if>
-            <if test="updateTime != null">
-                UPDATE_TIME,
-            </if>
-            <if test="insertUpdateRemark != null">
-                INSERT_UPDATE_REMARK,
-            </if>
-            <if test="stackingArrival != null">
-                STACKING_ARRIVAL,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stackingId != null">
-                #{stackingId,jdbcType=DECIMAL},
-            </if>
-            <if test="stackingNo != null">
-                #{stackingNo,jdbcType=VARCHAR},
-            </if>
-            <if test="stackingSequence != null">
-                #{stackingSequence,jdbcType=DECIMAL},
-            </if>
-            <if test="stackingRemarks != null">
-                #{stackingRemarks,jdbcType=VARCHAR},
-            </if>
-            <if test="stackingType != null">
-                #{stackingType,jdbcType=DECIMAL},
-            </if>
-            <if test="stackingMaterialNumber != null">
-                #{stackingMaterialNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="stackingRemainNumber != null">
-                #{stackingRemainNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="insertUsername != null">
-                #{insertUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="insertTime != null">
-                #{insertTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUsername != null">
-                #{updateUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="insertUpdateRemark != null">
-                #{insertUpdateRemark,jdbcType=VARCHAR},
-            </if>
-            <if test="stackingArrival != null">
-                #{stackingArrival,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsStacking">
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsStacking">
     update RMS_STACKING
     set STACKING_NO = #{stackingNo,jdbcType=VARCHAR},
       STACKING_SEQUENCE = #{stackingSequence,jdbcType=DECIMAL},
@@ -272,158 +307,174 @@
       UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      STACKING_ARRIVAL = #{stackingArrival,jdbcType=DECIMAL}
+      STACKING_ARRIVAL = #{stackingArrival,jdbcType=DECIMAL},
+      STACKING_MAX_LAYERS = #{stackingMaxLayers,jdbcType=DECIMAL},
+      STACKING_STATUS = #{stackingStatus,jdbcType=DECIMAL}
     where STACKING_ID = #{stackingId,jdbcType=DECIMAL}
   </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsStacking">
-        update RMS_STACKING
-        <set>
-            <if test="stackingNo != null">
-                STACKING_NO = #{stackingNo,jdbcType=VARCHAR},
-            </if>
-            <if test="stackingSequence != null">
-                STACKING_SEQUENCE = #{stackingSequence,jdbcType=DECIMAL},
-            </if>
-            <if test="stackingRemarks != null">
-                STACKING_REMARKS = #{stackingRemarks,jdbcType=VARCHAR},
-            </if>
-            <if test="stackingType != null">
-                STACKING_TYPE = #{stackingType,jdbcType=DECIMAL},
-            </if>
-            <if test="stackingMaterialNumber != null">
-                STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="stackingRemainNumber != null">
-                STACKING_REMAIN_NUMBER = #{stackingRemainNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="insertUsername != null">
-                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="insertTime != null">
-                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUsername != null">
-                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime != null">
-                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="insertUpdateRemark != null">
-                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-            </if>
-            <if test="stackingArrival != null">
-                STACKING_ARRIVAL = #{stackingArrival,jdbcType=DECIMAL},
-            </if>
-        </set>
-        where STACKING_ID = #{stackingId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
-        <include refid="select" />
-        where STACKING_ID = #{stackingId,jdbcType=DECIMAL}
-    </select>
-    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select" />
-        <include refid="where" />
-    </select>
-    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select" />
-        <include refid="whereLike" />
-    </select>
-    <insert id="batchInsert" parameterType="java.util.List">
-        insert into RMS_STACKING
-        (STACKING_ID,
-        STACKING_NO, STACKING_SEQUENCE,
-        STACKING_REMARKS, STACKING_TYPE,
-        STACKING_MATERIAL_NUMBER, STACKING_REMAIN_NUMBER,
-        INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, STACKING_ARRIVAL
-        )
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.stackingId,jdbcType=DECIMAL},
-        #{item.stackingNo,jdbcType=VARCHAR}, #{item.stackingSequence,jdbcType=DECIMAL},
-        #{item.stackingRemarks,jdbcType=VARCHAR}, #{item.stackingType,jdbcType=DECIMAL},
-        #{item.stackingMaterialNumber,jdbcType=DECIMAL}, #{item.stackingRemainNumber,jdbcType=DECIMAL},
-        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.stackingArrival,jdbcType=DECIMAL}
-        from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update RMS_STACKING
-        set
-        STACKING_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingId,jdbcType=DECIMAL}
-        </foreach>
-        ,STACKING_NO=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingNo,jdbcType=VARCHAR}
-        </foreach>
-        ,STACKING_SEQUENCE=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingSequence,jdbcType=DECIMAL}
-        </foreach>
-        ,STACKING_REMARKS=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingRemarks,jdbcType=VARCHAR}
-        </foreach>
-        ,STACKING_TYPE=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingType,jdbcType=DECIMAL}
-        </foreach>
-        ,STACKING_MATERIAL_NUMBER=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingMaterialNumber,jdbcType=DECIMAL}
-        </foreach>
-        ,STACKING_REMAIN_NUMBER=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingRemainNumber,jdbcType=DECIMAL}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,STACKING_ARRIVAL=
-        <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
-            when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingArrival,jdbcType=DECIMAL}
-        </foreach>
-        where STACKING_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-            #{item.stackingId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from RMS_STACKING
-        where STACKING_ID in
-        <foreach close=")" collection="list" item="id" open="(" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <!-- 根据垛位查询垛位存放物资件数和剩余数量 -->
-    <select id="selectStacking" resultType="java.util.Map">
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsStacking">
+    update RMS_STACKING
+    <set>
+      <if test="stackingNo != null">
+        STACKING_NO = #{stackingNo,jdbcType=VARCHAR},
+      </if>
+      <if test="stackingSequence != null">
+        STACKING_SEQUENCE = #{stackingSequence,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingRemarks != null">
+        STACKING_REMARKS = #{stackingRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="stackingType != null">
+        STACKING_TYPE = #{stackingType,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingMaterialNumber != null">
+        STACKING_MATERIAL_NUMBER = #{stackingMaterialNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingRemainNumber != null">
+        STACKING_REMAIN_NUMBER = #{stackingRemainNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="stackingArrival != null">
+        STACKING_ARRIVAL = #{stackingArrival,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingMaxLayers != null">
+        STACKING_MAX_LAYERS = #{stackingMaxLayers,jdbcType=DECIMAL},
+      </if>
+      <if test="stackingStatus != null">
+        STACKING_STATUS = #{stackingStatus,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where STACKING_ID = #{stackingId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where STACKING_ID = #{stackingId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_STACKING 
+      (STACKING_ID, 
+      STACKING_NO, STACKING_SEQUENCE, 
+      STACKING_REMARKS, STACKING_TYPE, 
+      STACKING_MATERIAL_NUMBER, STACKING_REMAIN_NUMBER, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, STACKING_ARRIVAL, 
+      STACKING_MAX_LAYERS, STACKING_STATUS
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.stackingId,jdbcType=DECIMAL}, 
+      #{item.stackingNo,jdbcType=VARCHAR}, #{item.stackingSequence,jdbcType=DECIMAL}, 
+      #{item.stackingRemarks,jdbcType=VARCHAR}, #{item.stackingType,jdbcType=DECIMAL}, 
+      #{item.stackingMaterialNumber,jdbcType=DECIMAL}, #{item.stackingRemainNumber,jdbcType=DECIMAL}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.stackingArrival,jdbcType=DECIMAL}, 
+      #{item.stackingMaxLayers,jdbcType=DECIMAL}, #{item.stackingStatus,jdbcType=DECIMAL}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_STACKING
+     set
+       STACKING_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingId,jdbcType=DECIMAL}
+       </foreach>
+       ,STACKING_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingNo,jdbcType=VARCHAR}
+       </foreach>
+       ,STACKING_SEQUENCE=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingSequence,jdbcType=DECIMAL}
+       </foreach>
+       ,STACKING_REMARKS=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingRemarks,jdbcType=VARCHAR}
+       </foreach>
+       ,STACKING_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingType,jdbcType=DECIMAL}
+       </foreach>
+       ,STACKING_MATERIAL_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingMaterialNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,STACKING_REMAIN_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingRemainNumber,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,STACKING_ARRIVAL=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingArrival,jdbcType=DECIMAL}
+       </foreach>
+       ,STACKING_MAX_LAYERS=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingMaxLayers,jdbcType=DECIMAL}
+       </foreach>
+       ,STACKING_STATUS=
+       <foreach close="end" collection="list" index="index" item="item" open="case STACKING_ID" separator=" ">
+          when #{item.stackingId,jdbcType=DECIMAL} then #{item.stackingStatus,jdbcType=DECIMAL}
+       </foreach>
+     where STACKING_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.stackingId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_STACKING
+    where STACKING_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 根据垛位查询垛位存放物资件数和剩余数量 -->
+  <select id="selectStacking" resultType="java.util.Map">
         select sum(wgm.gm_number) "materialNumber",
                (select max(rpg.grid_gradation_number) * 24
                 from rms_pwarehouse_grid rpg
@@ -438,26 +489,26 @@
         where rs.stacking_id = rpg.stacking_id
         group by rpg.stacking_id
     </select>
-    <!--根据垛位查询已堆放的物资剩余数量  -->
-    <select id="selectMaterialNumber" resultType="java.lang.Integer">
+  <!--根据垛位查询已堆放的物资剩余数量  -->
+  <select id="selectMaterialNumber" resultType="java.lang.Integer">
         select rs.stacking_material_number
         from rms_stacking rs
         where rs.stacking_id = #{stackingId}
     </select>
-    <!--根据垛位id查询垛位-->
-    <select id="selectStackNo" resultType="java.lang.String">
+  <!--根据垛位id查询垛位-->
+  <select id="selectStackNo" resultType="java.lang.String">
         select rs.stacking_no
         from rms_stacking rs
         where rs.stacking_id = #{stackingId}
     </select>
-    <!--更新垛位剩余数量和垛位存放物资数量-->
-    <update id="updateRmsStacking">
+  <!--更新垛位剩余数量和垛位存放物资数量-->
+  <update id="updateRmsStacking">
         update rms_stacking
         set stacking_material_number = #{materialNumber},
             stacking_remain_number   = #{remainNumber}
     </update>
-    <!--更新垛位  -->
-    <update id="updateStack">
+  <!--更新垛位  -->
+  <update id="updateStack">
         update
             rms_stacking rs
         set (rs.stacking_material_number, rs.stacking_remain_number)=
@@ -467,8 +518,8 @@
                  where rs.stacking_id = #{stackId})
         where rs.stacking_id = #{stackId}
     </update>
-    
-    <select id="getStackingMessage" parameterType="DECIMAL" resultType="java.util.Map">
+
+  <select id="getStackingMessage" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT DISTINCT RS.STACKING_ID              AS "stackingId",
                         RS.STACKING_NO              AS "stackingNo",
                         RS.STACKING_SEQUENCE        AS "stackingSequence",
@@ -481,8 +532,8 @@
           AND RS.STACKING_SEQUENCE IS NOT NULL
         ORDER BY RS.STACKING_SEQUENCE ASC
     </select>
-    
-    <update id="updateNumber">
+
+  <update id="updateNumber">
          update rms_stacking
         set stacking_Material_Number = #{stackingMaterialNumber},
             stacking_remain_number   = #{stackingRemainNumber}