倒垛

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

@@ -331,5 +331,14 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
         return success(wmspRestackMakeResult);
     }
 
+    //PDA根据仓库id查找倒垛单
+    @GetMapping("/selectRestackByWarehouseIds")
+    public  RESTfulResult selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid){
+
+        List<Map<String,Object>> list=wmspRestackMakeResultService.selectRestackByWarehouseIds( warehouseid);
+
+        return  success(list);
+    }
+
 
 }

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

@@ -1,7 +1,9 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.model.WmspRestackMakeTypeResult;
+import com.steerinfo.dil.model.WmspRestackScanResult;
 import com.steerinfo.dil.service.IWmspRestackMakeTypeResultService;
+import com.steerinfo.dil.service.IWmspRestackScanResultService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -37,6 +39,8 @@ public class WmspRestackMakeTypeResultController extends BaseRESTfulController {
 
     @Autowired
     IWmspRestackMakeTypeResultService wmspRestackMakeTypeResultService;
+    @Autowired
+    private IWmspRestackScanResultService wmspRestackScanResultService;
 
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
@@ -105,6 +109,32 @@ public class WmspRestackMakeTypeResultController extends BaseRESTfulController {
     	}
       return success();
     }
+    @ApiOperation(value="restackMake", notes="根据倒垛ID获得类型和")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "RequestParam", name = "restackMake", value = "倒垛单实绩ID", required = true, dataType = "String"),
+            @ApiImplicitParam(paramType = "RequestParam", name = "context", value = "扫描内容", required = false, dataType = "String")
+    })
+    @GetMapping("/getRestackMakeTypeResult")
+    public RESTfulResult getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,@RequestParam("context")String context){
 
+        //判断是否为空，如果不为空需要先添加然后在查询
+        WmspRestackScanResult wmspRestackScanResult=null;
+        if (context!=null&&context.equals("")){
+            wmspRestackScanResult= wmspRestackScanResultService.insertWmspRestackScanResult(restackMake,context);
+        }
 
+        //返回值对象
+        Map<String,Object> result=new HashMap();
+        //查询类型信息
+        List<Map<String,Object>> restackeMakeTypeResult=wmspRestackMakeTypeResultService.getRestackMakeTypeResult(restackMake);
+        result.put("restackeMakeTypeResult",restackeMakeTypeResult);
+        //查询扫描实绩
+        List<Map<String,Object>> materialList=wmspRestackMakeTypeResultService.getRestackMakeMaterial(restackMake);
+        result.put("materialList",materialList);
+        //判断是否已经生成过了
+        if (wmspRestackScanResult==null){
+            return failed(result);
+        }
+        return success(result);
+    }
 }

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

@@ -153,4 +153,6 @@ public class WmspRestackScanResultController extends BaseRESTfulController {
 
     }
 
+
+
 }

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

@@ -48,4 +48,8 @@ public interface WmspRestackMakeResultMapper extends IBaseMapper<WmspRestackMake
     List<Map<String,Object>> selectMakeMaterialIdByResultId(Integer resultId);
     //Pc端展示已下发的倒垛实绩
     List<Map<String, Object>> selectRestackForPc2(Map<String, Object> map);
+
+    List<Map<String, Object>> selectRestackByWarehouseIds(String warehouseid);
+
+    int getResultLoaderAudit(String restackMake, String context);
 }

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

@@ -6,8 +6,13 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface WmspRestackMakeTypeResultMapper extends IBaseMapper<WmspRestackMakeTypeResult, BigDecimal> {
 
+    List<Map<String, Object>> getRestackMakeTypeResult(String restackMake);
+
+    List<Map<String, Object>> getRestackMakeMaterial(String restackMake);
 }

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

@@ -45,4 +45,6 @@ public interface WmspRestackScanResultMapper extends IBaseMapper<WmspRestackScan
     Integer selectGridIdByResultId(Integer resultId);
     //根据实绩id查找扫描结果
     List<Map<String,Object>> selectTagByResultId(Integer resultId);
+
+    int getWmspRestackScanResultCount(String onlyCode);
 }

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

@@ -13,10 +13,10 @@ public class WmspRestackMakeTypeResult implements IBasePO<BigDecimal> {
     private BigDecimal wmspRestackMakeTypeId;
 
     /**
-     * 物质类型ID(MATERIAL_TYPE_ID,DECIMAL,0)
+     * 物质类型ID(MATERIAL_TYPE_ID,VARCHAR,100)
      */
     @ApiModelProperty(value="物质类型ID",required=false)
-    private BigDecimal materialTypeId;
+    private String materialTypeId;
 
     @ApiModelProperty(value="数量",required=false)
     private BigDecimal quantity;
@@ -77,11 +77,11 @@ public class WmspRestackMakeTypeResult implements IBasePO<BigDecimal> {
         this.wmspRestackMakeTypeId = wmspRestackMakeTypeId;
     }
 
-    public BigDecimal getMaterialTypeId() {
+    public String getMaterialTypeId() {
         return materialTypeId;
     }
 
-    public void setMaterialTypeId(BigDecimal materialTypeId) {
+    public void setMaterialTypeId(String materialTypeId) {
         this.materialTypeId = materialTypeId;
     }
 

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

@@ -37,7 +37,11 @@ public class WmspRestackScanResult implements IBasePO<BigDecimal> {
      */
     @ApiModelProperty(value="装卸工稽核结果（0：不成功；1：成功）",required=false)
     private BigDecimal resultLoaderAudit;
-
+    /**
+     * 物资唯一编码（一件钢材的唯一标识）(MATERIAL_ONLY_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物资唯一编码（一件钢材的唯一标识）",required=false)
+    private String materialOnlyCode;
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
      */
@@ -150,6 +154,14 @@ public class WmspRestackScanResult implements IBasePO<BigDecimal> {
         this.updateUsername = updateUsername == null ? null : updateUsername.trim();
     }
 
+    public String getMaterialOnlyCode() {
+        return materialOnlyCode;
+    }
+
+    public void setMaterialOnlyCode(String materialOnlyCode) {
+        this.materialOnlyCode = materialOnlyCode;
+    }
+
     public Date getUpdateTime() {
         return updateTime;
     }

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

@@ -50,4 +50,7 @@ public interface IWmspRestackMakeResultService {
     List<Map<String,Object>> selectRestackForPc(Map<String,Object> map);
 
     WmspRestackMakeResult createRestackMakeResult(BigDecimal keeperId, BigDecimal beforeLevel, BigDecimal afterStackingId, BigDecimal afterWarehouseId, BigDecimal afterBeforeStackingId, String resultRemark, List<Map<String, Object>> mps);
+
+    List<Map<String, Object>> selectRestackByWarehouseIds(String warehouseid);
+
 }

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

@@ -23,4 +23,8 @@ import java.util.Map;
 public interface IWmspRestackMakeTypeResultService extends IBaseService<WmspRestackMakeTypeResult, BigDecimal>{
 
     Integer createMakeTypeList(BigDecimal makeresultid, List<Map<String, Object>> maps);
+
+    List<Map<String, Object>> getRestackMakeTypeResult(String restackMake);
+
+    List<Map<String, Object>> getRestackMakeMaterial(String restackMake);
 }

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

@@ -52,4 +52,5 @@ public interface IWmspRestackScanResultService {
  //根据实绩id查找扫描结果
  List<Map<String,Object>> selectTagByResultId(Integer resultId);
 
+    WmspRestackScanResult insertWmspRestackScanResult(String restackMake, String context);
 }

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

@@ -340,4 +340,11 @@ public class WmspRestackMakeResultServiceImpl  implements IWmspRestackMakeResult
         return wmspRestackMakeResult;
     }
 
+    @Override
+    public List<Map<String, Object>> selectRestackByWarehouseIds(String warehouseid) {
+        return wmspRestackMakeResultMapper.selectRestackByWarehouseIds(warehouseid);
+    }
+
+
+
 }

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

@@ -51,7 +51,7 @@ public class WmspRestackMakeTypeResultServiceImpl extends BaseServiceImpl<WmspRe
             //给主键赋值
             wmspRestackMakeTypeResult.setWmspRestackMakeTypeId(IDUtils.createIDYMDHMS(seqCount));
             //设置与类型的关联字段
-            wmspRestackMakeTypeResult.setMaterialTypeId(new BigDecimal(map.get("materialCode").toString()));
+            wmspRestackMakeTypeResult.setMaterialTypeId(map.get("materialCode").toString());
             //设置倒垛单ID
             wmspRestackMakeTypeResult.setWmspRestackMakeId(makeresultid);
             //累加总数量
@@ -66,4 +66,14 @@ public class WmspRestackMakeTypeResultServiceImpl extends BaseServiceImpl<WmspRe
         }
         return total;
     }
+
+    @Override
+    public List<Map<String, Object>> getRestackMakeTypeResult(String restackMake) {
+        return wmspRestackMakeTypeResultMapper.getRestackMakeTypeResult(restackMake);
+    }
+
+    @Override
+    public List<Map<String, Object>> getRestackMakeMaterial(String restackMake) {
+        return wmspRestackMakeTypeResultMapper.getRestackMakeMaterial(restackMake);
+    }
 }

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

@@ -1,11 +1,13 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.WmspRestackMakeResultMapper;
 import com.steerinfo.dil.mapper.WmspRestackScanResultMapper;
 import com.steerinfo.dil.model.WmspRestackScanResult;
 import com.steerinfo.dil.service.IWmspRestackScanResultService;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -23,11 +25,14 @@ import java.util.*;
  * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
+@Primary
 @Service
 public class WmspRestackScanResultServiceImpl  implements IWmspRestackScanResultService {
 
     @Autowired
     private WmspRestackScanResultMapper wmspRestackScanResultMapper;
+    @Autowired
+    private WmspRestackMakeResultMapper wmspRestackMakeResultMapper;
 
     @Override
     public List<Map<String, Object>> selectByLoaderId(Map<String, Object> mapval) {
@@ -124,5 +129,44 @@ public class WmspRestackScanResultServiceImpl  implements IWmspRestackScanResult
         return wmspRestackScanResultMapper.selectTagByResultId(resultId);
     }
 
+    @Override
+    public WmspRestackScanResult insertWmspRestackScanResult(String restackMake, String context) {
+
+        //唯一编码
+        String onlyCode=context.split("-")[7];
+        //判断是否重复扫描
+        int count= wmspRestackScanResultMapper.getWmspRestackScanResultCount(onlyCode);
+        if(count==0){
+            WmspRestackScanResult wmspRestackScanResult=new WmspRestackScanResult();
+            //设置扫描实绩id
+            wmspRestackScanResult.setResultId(wmspRestackScanResultMapper.selectMaxId());
+            //倒垛实绩
+            wmspRestackScanResult.setResultRestackId(new BigDecimal(restackMake));
+            //扫描结果
+            wmspRestackScanResult.setResultScanTag(context);
+            //扫描结果
+            wmspRestackScanResult.setMaterialOnlyCode(onlyCode);
+            //设置状态
+            //判断需要倒垛的类型
+            int status= wmspRestackMakeResultMapper.getResultLoaderAudit(restackMake,onlyCode);
+            if (status>0){
+                wmspRestackScanResult.setResultLoaderAudit(new BigDecimal(1));
+            }
+            wmspRestackScanResult.setResultLoaderAudit(new BigDecimal(0));
+            //设置装卸工id为1
+            wmspRestackScanResult.setLoaderId(new BigDecimal(1));
+            //设置扫描时间
+            wmspRestackScanResult.setInsertTime(new Date());
+            //设置常规字段
+            wmspRestackScanResult.setInsertUsername("admin");
+            wmspRestackScanResult.setInsertUpdateRemark("无");
+            int i= wmspRestackScanResultMapper.insertSelective(wmspRestackScanResult);
+            return wmspRestackScanResult;
+        }else {
+            return null;
+
+        }
+    }
+
 
 }

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

@@ -1387,4 +1387,27 @@
     </where>
     <include refid="orderByInsertTime"></include>
   </select>
+    <select id="selectRestackByWarehouseIds" resultType="java.util.Map">
+         SELECT wrme.RESULT_ID "resultId", -- 倒垛编号
+          wrme.RESULT_STACK_NUMBER "resultStackNumber", -- 倒垛单创建时间
+          wrme.INSERT_TIME "insertTime", -- 倒垛单下发时间
+          wrme.RESULT_KEEPER_ISSUE_TIME "resultKeeperIssueTime", -- 总件数
+          wrme.QUANTITY "quantity", -- 原层次
+          wrme.BEFORE_LEVEL "beforeLevel", -- 新垛位
+          rs.STACKING_NO "afterStackingNo", -- 原垛位
+          rs2.STACKING_NO "beforeStackingNo", -- 仓库名称
+           rw.WAREHOUSE_NAME "warehouseName"-- 当前下发的倒垛单的完成状态
+          
+           FROM WMSP_RESTACK_MAKE_RESULT wrme
+           LEFT JOIN WMSP_RESTACK_MAKE_MATERIAL wrmm ON wrmm.MAKE_RESULT_ID=wrme.RESULT_ID
+           LEFT JOIN RMS_STACKING rs ON rs.STACKING_ID=wrme.AFTER_STACKING_ID
+           LEFT JOIN RMS_STACKING rs2 ON rs2.STACKING_ID=wrme.AFTER_BEFORE_STACKING_ID
+           LEFT JOIN RMS_WAREHOUSE rw ON rw.WAREHOUSE_ID=wrme.AFTER_WAREHOUSE_ID
+            WHERE wrme.DISTRIBUTIONSTATUS=1 and wrme.DELETED=0 and wrme.RESULT_STATUS=0 and wrme.AFTER_WAREHOUSE_ID=#{warehouseid}
+    </select>
+  <select id="getResultLoaderAudit" resultType="java.lang.Integer">
+    select count(*) from WMSP_RESTACK_MAKE_TYPE_RESULT where MATERIAL_TYPE_ID in (select DISTINCT rm.material_code from RMS_MATERIAL_STEEL  rms
+    left join RMS_MATERIAL rm on rm.material_id= rms.material_id
+    where rms.material_only_code='context') and WMSP_RESTACK_MAKE_ID=#{restackMake}
+  </select>
 </mapper>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.steerinfo.dil.mapper.WmspRestackMakeTypeResultMapper">
   <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.WmspRestackMakeTypeResult">
     <id column="WMSP_RESTACK_MAKE_TYPE_ID" jdbcType="DECIMAL" property="wmspRestackMakeTypeId" />
-    <result column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId" />
+    <result column="MATERIAL_TYPE_ID" jdbcType="VARCHAR" property="materialTypeId" />
     <result column="QUANTITY" jdbcType="DECIMAL" property="quantity" />
     <result column="WMSP_RESTACK_MAKE_ID" jdbcType="DECIMAL" property="wmspRestackMakeId" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
@@ -193,7 +193,7 @@
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.WmspRestackMakeTypeResult">
     update WMSP_RESTACK_MAKE_TYPE_RESULT
-    set MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
+    set MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=VARCHAR},
       QUANTITY = #{quantity,jdbcType=DECIMAL},
       WMSP_RESTACK_MAKE_ID = #{wmspRestackMakeId,jdbcType=DECIMAL},
       INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
@@ -207,7 +207,7 @@
     update WMSP_RESTACK_MAKE_TYPE_RESULT
     <set>
       <if test="materialTypeId != null">
-        MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
+        MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=VARCHAR},
       </if>
       <if test="quantity != null">
         QUANTITY = #{quantity,jdbcType=DECIMAL},
@@ -245,7 +245,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
   </select>
-  <insert id="batchInsert" parameterType="java.util.List">
+    <insert id="batchInsert" parameterType="java.util.List">
     insert into WMSP_RESTACK_MAKE_TYPE_RESULT 
       (WMSP_RESTACK_MAKE_TYPE_ID, 
       MATERIAL_TYPE_ID, QUANTITY, WMSP_RESTACK_MAKE_ID, 
@@ -270,7 +270,7 @@
        </foreach>
        ,MATERIAL_TYPE_ID=
        <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
-          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
+          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=VARCHAR}
        </foreach>
        ,QUANTITY=
        <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
@@ -314,5 +314,37 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <select id="getRestackMakeTypeResult" resultType="java.util.Map">
+    select DISTINCT
+     rm.UNIT_OF_MEASURE_ID "unitOfMeasureId",
+     rm.MATERIAL_CODE "materialCode",
+     rm.MATERIAL_NAME "materialName",
+     rm.MATERIAL_SPECIFICATION "materialSpecification",
+     rm.MATERIAL_MODEL "materialMode",
+     rm.MATERIAL_LENGTH "materialLength",
+     wrmtr.QUANTITY "quantity",
+     coun.num "count"
+    from WMSP_RESTACK_MAKE_TYPE_RESULT  wrmtr
+    left join rms_material rm on rm.material_code= wrmtr.MATERIAL_TYPE_ID
+    left join (
+        select count(*) num,rm2.MATERIAL_ID materialId from WMSP_RESTACK_SCAN_RESULT wrsr
+        left join RMS_MATERIAL_STEEL rms on rms.MATERIAL_ONLY_CODE=wrsr.RESULT_SCAN_TAG
+        left join RMS_MATERIAL rm2 on rm2.MATERIAL_ID = rms.MATERIAL_ID
+        group by rm2.MATERIAL_ID
+    ) coun on coun.materialId=wrmtr.MATERIAL_TYPE_ID
+    where wrmtr.WMSP_RESTACK_MAKE_ID =#{restackMake}
+  </select>
+  <select id="getRestackMakeMaterial" resultType="java.util.Map">
+        select
+        wrsr.RESULT_SCAN_TAG "materialOnlyCode",
+        rm.MATERIAL_CODE "materialCode",
+        rm.MATERIAL_NAME "materialName",
+        rm.MATERIAL_SPECIFICATION "materialSpecification",
+        rm.MATERIAL_MODEL "materialMode",
+        rm.MATERIAL_LENGTH "materialLength"
+        from WMSP_RESTACK_SCAN_RESULT wrsr
+        left join RMS_MATERIAL_STEEL rms on rms.MATERIAL_ONLY_CODE=wrsr.RESULT_SCAN_TAG
+        left join RMS_MATERIAL rm on rm.MATERIAL_ID = rms.MATERIAL_ID
+        where wrsr.RESULT_RESTACK_ID =#{restackMake}
+  </select>
 </mapper>

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

@@ -8,6 +8,8 @@
     <result column="RESULT_SCAN_TAG" jdbcType="VARCHAR" property="resultScanTag" />
     <result column="RESULT_LOADER_AUDIT" jdbcType="DECIMAL" property="resultLoaderAudit" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="MATERIAL_ONLY_CODE" jdbcType="VARCHAR" property="materialOnlyCode" />
+    
     <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
@@ -15,12 +17,12 @@
     <result column="ISSUE_TIME" jdbcType="TIMESTAMP" property="issueTime" />
   </resultMap>
   <sql id="columns">
-    RESULT_ID, RESULT_RESTACK_ID, LOADER_ID, RESULT_SCAN_TAG, RESULT_LOADER_AUDIT, INSERT_USERNAME, 
+    RESULT_ID, RESULT_RESTACK_ID, LOADER_ID, RESULT_SCAN_TAG, RESULT_LOADER_AUDIT, INSERT_USERNAME, MATERIAL_ONLY_CODE,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, ISSUE_TIME
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.RESULT_RESTACK_ID, t.LOADER_ID, t.RESULT_SCAN_TAG, t.RESULT_LOADER_AUDIT, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.INSERT_USERNAME,t.MATERIAL_ONLY_CODE, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
     t.ISSUE_TIME
   </sql>
   <sql id="select">
@@ -49,6 +51,9 @@
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME = #{insertUsername}
       </if>
+      <if test="materialOnlyCode != null and materialOnlyCode != ''">
+        and MATERIAL_ONLY_CODE = #{materialOnlyCode}
+      </if>
       <if test="insertTime != null">
         and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
       </if>
@@ -86,6 +91,9 @@
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME LIKE '%${insertUsername}%'
       </if>
+      <if test="materialOnlyCode != null and materialOnlyCode != ''">
+        and MATERIAL_ONLY_CODE LIKE '%${materialOnlyCode}%'
+      </if>
       <if test="insertTime != null">
         and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
       </if>
@@ -125,6 +133,9 @@
     <if test="insertUsername != null and insertUsername != ''">
       or INSERT_USERNAME = #{insertUsername}
     </if>
+    <if test="materialOnlyCode != null and materialOnlyCode != ''">
+      or MATERIAL_ONLY_CODE = #{materialOnlyCode}
+    </if>
     <if test="insertTime != null">
       or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
     </if>
@@ -143,11 +154,11 @@
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.WmspRestackScanResult">
     insert into WMSP_RESTACK_SCAN_RESULT (RESULT_ID, RESULT_RESTACK_ID, LOADER_ID,
-                                          RESULT_SCAN_TAG, RESULT_LOADER_AUDIT, INSERT_USERNAME,
+                                          RESULT_SCAN_TAG, RESULT_LOADER_AUDIT, INSERT_USERNAME,MATERIAL_ONLY_CODE,
                                           INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                           INSERT_UPDATE_REMARK, ISSUE_TIME)
     values (#{resultId,jdbcType=DECIMAL}, #{resultRestackId,jdbcType=DECIMAL}, #{loaderId,jdbcType=DECIMAL},
-            #{resultScanTag,jdbcType=VARCHAR}, #{resultLoaderAudit,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
+            #{resultScanTag,jdbcType=VARCHAR}, #{resultLoaderAudit,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{materialOnlyCode,jdbcType=VARCHAR},
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{issueTime,jdbcType=TIMESTAMP})
   </insert>
@@ -172,6 +183,9 @@
       <if test="insertUsername != null">
         INSERT_USERNAME,
       </if>
+      <if test="materialOnlyCode != null">
+        MATERIAL_ONLY_CODE,
+      </if>
       <if test="insertTime != null">
         INSERT_TIME,
       </if>
@@ -207,6 +221,9 @@
       <if test="insertUsername != null">
         #{insertUsername,jdbcType=VARCHAR},
       </if>
+      <if test="materialOnlyCode != null">
+        #{materialOnlyCode,jdbcType=VARCHAR},
+      </if>
       <if test="insertTime != null">
         #{insertTime,jdbcType=TIMESTAMP},
       </if>
@@ -231,6 +248,7 @@
         RESULT_SCAN_TAG = #{resultScanTag,jdbcType=VARCHAR},
         RESULT_LOADER_AUDIT = #{resultLoaderAudit,jdbcType=DECIMAL},
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        MATERIAL_ONLY_CODE = #{materialOnlyCode,jdbcType=VARCHAR},
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
@@ -256,6 +274,9 @@
       <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
       </if>
+      <if test="materialOnlyCode != null">
+        MATERIAL_ONLY_CODE = #{materialOnlyCode,jdbcType=VARCHAR},
+      </if>
       <if test="insertTime != null">
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
       </if>
@@ -290,7 +311,7 @@
     insert into WMSP_RESTACK_SCAN_RESULT
     (RESULT_ID,
     RESULT_RESTACK_ID, LOADER_ID, RESULT_SCAN_TAG,
-    RESULT_LOADER_AUDIT, INSERT_USERNAME,
+    RESULT_LOADER_AUDIT, INSERT_USERNAME,MATERIAL_ONLY_CODE,
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     ISSUE_TIME)
@@ -298,7 +319,7 @@
     select
     #{item.resultId,jdbcType=DECIMAL},
     #{item.resultRestackId,jdbcType=DECIMAL}, #{item.loaderId,jdbcType=DECIMAL}, #{item.resultScanTag,jdbcType=VARCHAR},
-    #{item.resultLoaderAudit,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.resultLoaderAudit,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},#{item.materialOnlyCode,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.issueTime,jdbcType=TIMESTAMP} from dual
@@ -331,6 +352,10 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
     </foreach>
+    ,MATERIAL_ONLY_CODE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.materialOnlyCode,jdbcType=VARCHAR}
+    </foreach>
     ,INSERT_TIME=
     <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
@@ -608,4 +633,8 @@
     from WMSP_RESTACK_SCAN_RESULT WRSR
     where   WRSR.RESULT_RESTACK_ID=#{resultId} AND  WRSR.RESULT_LOADER_AUDIT=1
   </select>
+  <select id="getWmspRestackScanResultCount" resultType="java.lang.Integer">
+    select count(*) from WMSP_RESTACK_SCAN_RESULT WRSR
+    where   WRSR.MATERIAL_ONLY_CODE=#{onlyCode}
+  </select>
 </mapper>