倒垛作业

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_INBOUND_DISTRIBUTE</param>
+                        <param>WMSP_RESTACK_MAKE_TYPE_RESULT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -329,18 +329,5 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         return success(mapList);
     }
 
-    /**
-     * 1.查看实时库存物质在实时库存里面没有出库的物质！！！
-     * @param
-     * @return
-     */
-    @ApiOperation(value = "新增扫描吊牌实绩")
-    @PostMapping("/getReboundScanResultByResultMaterial")
-    @Transactional
-    public  synchronized RESTfulResult getReboundScanResultByResultMaterial(@RequestBody(required = false)Map<String,Object>map) throws ParseException {
-        //查询是否未出库
-        //如果没有出库就需要这件钢材放到未出库钢材集合里面
-        //返回回显给用户
-        return null;
-    }
+
 }

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

@@ -17,10 +17,12 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -149,6 +151,65 @@ public RESTfulResult countByGmId() {
         int i = wmspGridMaterialService.updateRmsMaterialSteelDemotion(map);
         return success(i);
     }
+
+    /**
+     * 1.查看实时库存物质在实时库存里面没有出库的物质！！！
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "新增扫描吊牌实绩")
+    @PostMapping("/getReboundScanResultByResultMaterial")
+    @Transactional
+    public  synchronized RESTfulResult getReboundScanResultByResultMaterial(@RequestBody(required = false)Map<String,Object>map) throws ParseException {
+
+        //已存在的集合
+        List<Map<String,Object>> list=null;
+        if (map.containsKey("dateList")&&map.get("dateList")!=null){
+            list=(List<Map<String, Object>>) map.get("dateList");
+        }else{
+            list=new ArrayList<>();
+        }
+        //判断是否重复扫描
+        for (int i=0;i<list.size();i++){
+            Map<String,Object> item=list.get(i);
+            if (item.get("resultMaterial").toString().equals(map.get("resultMaterial").toString())){
+                return success(list);
+            }
+        }
+        //解析扫描信息
+        //将扫描吊牌结果根据分隔符截取字符串
+        String[] split = map.get("resultMaterial").toString().split("-");
+        //唯一编码
+        String MaterialOnlyCode=split[7];
+        //查询是否未出库
+        Map<String,Object> result= wmspGridMaterialService.getReboundScanResultByResultMaterial(map.get("resultMaterial").toString().substring(0,map.get("resultMaterial").toString().length()-1),MaterialOnlyCode);
+
+
+        if (result!=null){
+            //赋值一个主键
+            result.put("resultMaterial",map.get("resultMaterial").toString());
+            //如果没有出库就需要这件钢材放到未出库钢材集合里面
+            list.add(result);
+        }
+
+        return success(list);
+    }
+
+
+
+    @ApiOperation(value = "获得物质类型",notes = "根据仓库垛位层号获得物质类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "warehouseid",dataType = "DECIMAL",value = "仓库"),
+            @ApiImplicitParam(name = "stackingId",dataType = "BigDicemal",value = "垛位"),
+            @ApiImplicitParam(name = "gradtionNumber",dataType = "BigDicemal",value = "层号")
+
+    })
+    @GetMapping("/getMaterialTypeList")
+    public  RESTfulResult getMaterialTypeList(String warehouseid,BigDecimal stackingId,BigDecimal gradtionNumber){
+        //获得一个list<Map<String,Object>> map里面包括：物质Id、物质名称、物质型号、理论重量、物质件数
+        List<Map<String,Object>> map=wmspGridMaterialService.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
+        return success();
+    }
 }
 
 

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

@@ -189,7 +189,6 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
         mapVal.put("DistrubtionStatus", DistrubtionStatus);
         //不分页筛选数据
         List<Map<String, Object>> list = wmspRestackMakeResultService.selectRestackForPc(mapVal);
-        System.out.println(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = wmspRestackMakeResultService.selectRestackForPc(mapVal);

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

@@ -0,0 +1,110 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.WmspRestackMakeTypeResult;
+import com.steerinfo.dil.service.IWmspRestackMakeTypeResultService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * WmspRestackMakeTypeResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPBigDecimal 2022-01-19 03:00
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-19
+ * 作者：generator
+ * 参考：
+ * 描述：WmspRestackMakeTypeResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/wmsprestackmaketyperesults")
+public class WmspRestackMakeTypeResultController extends BaseRESTfulController {
+
+    @Autowired
+    IWmspRestackMakeTypeResultService wmspRestackMakeTypeResultService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("wmsprestackmaketyperesult:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<WmspRestackMakeTypeResult> list = wmspRestackMakeTypeResultService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("wmsprestackmaketyperesult:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<WmspRestackMakeTypeResult> list = wmspRestackMakeTypeResultService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据WmspRestackMakeTypeResult对象创建")
+    @ApiImplicitParam(name = "wmspRestackMakeTypeResult", value = "详细实体wmspRestackMakeTypeResult", required = true, dataType = "WmspRestackMakeTypeResult")
+    //@RequiresPermissions("wmsprestackmaketyperesult:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute WmspRestackMakeTypeResult model){
+        WmspRestackMakeTypeResult wmspRestackMakeTypeResult = wmspRestackMakeTypeResultService.add(model);
+        return success(wmspRestackMakeTypeResult);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("wmsprestackmaketyperesult:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable BigDecimal id){
+        WmspRestackMakeTypeResult wmspRestackMakeTypeResult = wmspRestackMakeTypeResultService.getById(id);
+        return success(wmspRestackMakeTypeResult);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的wmspRestackMakeTypeResult信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "wmspRestackMakeTypeResult", value = "详细实体wmspRestackMakeTypeResult", required = true, dataType = "WmspRestackMakeTypeResult")
+    })
+    //@RequiresPermissions("wmsprestackmaketyperesult:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody WmspRestackMakeTypeResult model){
+        model.setId(id);
+        WmspRestackMakeTypeResult wmspRestackMakeTypeResult = wmspRestackMakeTypeResultService.modify(model);
+        return success(wmspRestackMakeTypeResult);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("wmsprestackmaketyperesult:delete")
+    @DeleteMapping(value = "/{id}")//BigDecimal
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<BigDecimal> ids = ListUtils.convertList(list);
+			  wmspRestackMakeTypeResultService.delete(ids);
+    	}
+      return success();
+    }
+
+
+}

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.WmspGridMaterial;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
@@ -38,4 +39,8 @@ public interface WmspGridMaterialMapper extends IBaseMapper<WmspGridMaterial, Bi
   int updateInboundStackByInboundId(BigDecimal inboundId);
   //根据物资唯一编码查询实时库存id
   List<Map<String,Object>> selectGridIdByMaterialCode(Map<String,Object> map);
+
+    Map<String, Object> getReboundScanResultByResultMaterial(@Param("material") String material, @Param("materialOnlyCode")String materialOnlyCode);
+
+  List<Map<String, Object>> getMaterialTypeList(String warehouseid, BigDecimal stackingId, BigDecimal gradtionNumber);
 }

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

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.WmspRestackMakeTypeResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface WmspRestackMakeTypeResultMapper extends IBaseMapper<WmspRestackMakeTypeResult, BigDecimal> {
+}

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

@@ -86,6 +86,11 @@ public class WmspRestackMakeResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="下发状态",required=false)
     private BigDecimal distributionstatus;
 
+    /**
+     * 物质数量(QUANTITY)
+     */
+    @ApiModelProperty(value="物质数量",required=false)
+    private BigDecimal quantity;
     /**
      * 倒垛后仓库id(AFTER_WAREHOUSE_ID,DECIMAL,0)
      */
@@ -103,6 +108,18 @@ public class WmspRestackMakeResult implements IBasePO<BigDecimal> {
      */
     @ApiModelProperty(value="倒垛单备注",required=false)
     private String resultRemark;
+    /**
+     * 倒垛单备注(AFTER_BEFORE_STACKING_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="倒垛前的垛位",required=false)
+    private BigDecimal afterBeforeStackingId;
+
+
+    /**
+     * 倒垛单备注(BEFORE_LEVEL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="倒垛前的层",required=false)
+    private BigDecimal beforeLevel;
 
     private static final long serialVersionUID = 1L;
 
@@ -132,6 +149,14 @@ public class WmspRestackMakeResult implements IBasePO<BigDecimal> {
         this.resultStackNumber = resultStackNumber == null ? null : resultStackNumber.trim();
     }
 
+    public BigDecimal getBeforeLevel() {
+        return beforeLevel;
+    }
+
+    public void setBeforeLevel(BigDecimal beforeLevel) {
+        this.beforeLevel = beforeLevel;
+    }
+
     public BigDecimal getAfterStackingId() {
         return afterStackingId;
     }
@@ -164,6 +189,22 @@ public class WmspRestackMakeResult implements IBasePO<BigDecimal> {
         this.resultKeeperIssueTime = resultKeeperIssueTime;
     }
 
+    public BigDecimal getAfterBeforeStackingId() {
+        return afterBeforeStackingId;
+    }
+
+    public void setAfterBeforeStackingId(BigDecimal afterBeforeStackingId) {
+        this.afterBeforeStackingId = afterBeforeStackingId;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
     public String getInsertUsername() {
         return insertUsername;
     }

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

@@ -0,0 +1,163 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="物质类型中间表")
+public class WmspRestackMakeTypeResult implements IBasePO<BigDecimal> {
+    @ApiModelProperty(value="",required=true)
+    private BigDecimal wmspRestackMakeTypeId;
+
+    /**
+     * 物质类型ID(MATERIAL_TYPE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物质类型ID",required=false)
+    private BigDecimal materialTypeId;
+
+    @ApiModelProperty(value="",required=false)
+    private BigDecimal quantity;
+
+    /**
+     * 倒垛单ID(WMSP_RESTACK_MAKE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="倒垛单ID",required=false)
+    private BigDecimal wmspRestackMakeId;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.wmspRestackMakeTypeId;
+    }
+
+    @Override
+    public void setId(BigDecimal wmspRestackMakeTypeId) {
+        this.wmspRestackMakeTypeId = wmspRestackMakeTypeId;
+    }
+
+    public BigDecimal getWmspRestackMakeTypeId() {
+        return wmspRestackMakeTypeId;
+    }
+
+    public void setWmspRestackMakeTypeId(BigDecimal wmspRestackMakeTypeId) {
+        this.wmspRestackMakeTypeId = wmspRestackMakeTypeId;
+    }
+
+    public BigDecimal getMaterialTypeId() {
+        return materialTypeId;
+    }
+
+    public void setMaterialTypeId(BigDecimal materialTypeId) {
+        this.materialTypeId = materialTypeId;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getWmspRestackMakeId() {
+        return wmspRestackMakeId;
+    }
+
+    public void setWmspRestackMakeId(BigDecimal wmspRestackMakeId) {
+        this.wmspRestackMakeId = wmspRestackMakeId;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", wmspRestackMakeTypeId=").append(wmspRestackMakeTypeId);
+        sb.append(", materialTypeId=").append(materialTypeId);
+        sb.append(", quantity=").append(quantity);
+        sb.append(", wmspRestackMakeId=").append(wmspRestackMakeId);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -46,4 +46,6 @@ public interface IWmspGridMaterialService  {
    int updateRmsMaterialSteelDemotion(Map<String, Object> map);
 
     void initInsertWmspGridMaterial(Map<String, Object> item, BigDecimal houseGrid);
+
+    Map<String, Object> getReboundScanResultByResultMaterial(String material ,String materialOnlyCode);
 }

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

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.WmspRestackMakeTypeResult;
+import com.steerinfo.framework.service.IBaseService;
+
+import java.math.BigDecimal;
+
+/**
+ * WmspRestackMakeTypeResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-19 03:00
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-19
+ * 作者：generator
+ * 参考：
+ * 描述：WmspRestackMakeTypeResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IWmspRestackMakeTypeResultService extends IBaseService<WmspRestackMakeTypeResult, BigDecimal>{
+
+}

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

@@ -135,4 +135,12 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
         insertWmspGridMaterial(wmspGridMaterial);
     }
 
+    @Override
+    public Map<String, Object> getReboundScanResultByResultMaterial(String material,String materialOnlyCode) {
+        return wmspGridMaterialMapper.getReboundScanResultByResultMaterial(material,materialOnlyCode);
+    }
+
+    public List<Map<String, Object>> getMaterialTypeList(String warehouseid, BigDecimal stackingId, BigDecimal gradtionNumber) {
+        return wmspGridMaterialMapper.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
+    }
 }

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

@@ -109,7 +109,7 @@ public class WmspInboundDistributeServiceImpl extends BaseServiceImpl<WmspInboun
 //                层次号
                 BigDecimal gridGradationNumber = (BigDecimal)map.get("gridGradationNumber");
 //                仓库Id
-                BigDecimal warehouseId = (BigDecimal)map.get("warehouseId");
+                String warehouseId = map.get("warehouseId").toString();
 //                垛位Id
                 BigDecimal stackingId = (BigDecimal)map.get("stackingId");
 //                拼接物资的存储位置

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

@@ -0,0 +1,37 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.WmspRestackMakeTypeResultMapper;
+import com.steerinfo.dil.model.WmspRestackMakeTypeResult;
+import com.steerinfo.dil.service.IWmspRestackMakeTypeResultService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+
+/**
+ * WmspRestackMakeTypeResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-19 03:00
+ * 类描述
+ * 修订历史：
+ * 日期：2022-01-19
+ * 作者：generator
+ * 参考：
+ * 描述：WmspRestackMakeTypeResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "wmspRestackMakeTypeResultService")
+public class WmspRestackMakeTypeResultServiceImpl extends BaseServiceImpl<WmspRestackMakeTypeResult, BigDecimal> implements IWmspRestackMakeTypeResultService {
+
+    @Autowired
+    private WmspRestackMakeTypeResultMapper wmspRestackMakeTypeResultMapper;
+
+
+    @Override
+    protected IBaseMapper<WmspRestackMakeTypeResult, BigDecimal> getMapper() {
+        return wmspRestackMakeTypeResultMapper;
+    }
+}

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

@@ -623,4 +623,69 @@
     ON RW.WAREHOUSE_ID=RPG.WAREHOUSE_ID
     WHERE  RMS.MATERIAL_ONLY_CODE=#{materialCode} and RW.WAREHOUSE_ID=#{warehouseId}
   </select>
+    <select id="getReboundScanResultByResultMaterial" resultType="java.util.Map">
+     select rm.material_name "materialName",
+         rm.material_specification || '(' || rm.material_model || ')' "specification",
+        rpg.WAREHOUSE_ID "warehouseName",
+       rpg.PLATFORM_ID "platformId",
+       rw.WAREHOUSE_NAME "warehouseId",
+       rpg.STACKING_ID "stackingId",
+       rpg.GRID_GRADATION_NUMBER "gridGradation",
+       rpg.GRID_SEQUENCE_NUMBER "gridSequenceNumber",
+       rs.STACKING_ARRIVAL "stackingArrival",
+       rs.STACKING_NO "stackingNo",
+       rms.material_only_code "materialCode",
+        rms.insert_time "scan_time",
+        rms.material_furnace_number  "furanceNumber",
+        rms.material_theoretical_weight  "materialTheortical",
+        ruom.unit_of_measure_name "measure_name" ,
+        rms.MATERIAL_COUNT "materialCount" ,
+        wosr.OUTBOUND_MATERIAL_NUMBER "MATERIAL_NUMBER",
+        wosr.INSERT_USERNAME "LOADA"
+      from wmsp_grid_material wgm
+      left join RMS_PWAREHOUSE_GRID rpg on rpg.GRID_ID=wgm.GRID_ID
+      left join RMS_STACKING rs on  rs.STACKING_ID=rpg.STACKING_ID
+      left join RMS_WAREHOUSE rw on rpg.WAREHOUSE_ID=rw.WAREHOUSE_ID
+      left join RMS_MATERIAL_STEEL rms
+      on wgm.material_id=rms.material_steel_id
+      left join rms_material rm
+      on rm.material_id = rms.material_id
+      left join RMS_UNIT_OF_MEASURE ruom
+      on rm.unit_Of_Measure_Id=ruom.unit_Of_Measure_Id
+      left join (select OUTBOUND_MATERIAL_NUMBER ,INSERT_USERNAME , result_material from WMSP_OUTBOUND_SCAN_RESULT    ) wosr
+      on wosr.result_material=#{material}
+      where rms.material_only_code=#{materialOnlyCode} and wgm.deleted =0
+    </select>
+  <select id="getMaterialTypeList" resultType="java.util.Map">
+    select distinct *
+    from
+    (select
+    t9.MATERIAL_CODE "materialCode",
+    t9.MATERIAL_NAME "materialName",
+    t16.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+    t9.MATERIAL_SPECIFICATION "materialSpecification",
+    t9.MATERIAL_MODEL "materialModel"
+    from WMSP_GRID_MATERIAL WGM
+    left join RMS_PWAREHOUSE_GRID RPG
+    on WGM.GRID_ID=RPG.GRID_ID
+    left join RMS_STACKING t4
+    ON RPG.STACKING_ID=t4.STACKING_ID
+    left join RMS_MATERIAL_STEEL t16
+    on t16.MATERIAL_STEEL_ID=WGM.MATERIAL_ID
+    left join RMS_MATERIAL t9
+    on t16.MATERIAL_ID=t9.MATERIAL_ID
+    left join RMS_WAREHOUSE t8
+    on RPG.WAREHOUSE_ID=t8.WAREHOUSE_ID
+    where WGM.DELETED=0 and WGM.STATUS!=1
+    <if test="warehouseid != null">
+      and t8.WAREHOUSE_ID = #{warehouseid,jdbcType=DECIMAL}
+    </if>
+    <if test="stackingId != null">
+      and t4.STACKING_ID = #{stackingId,jdbcType=DECIMAL}
+    </if>
+    <if test="gradtionNumber != null">
+      and RPG.GRID_GRADATION_NUMBER = #{gradtionNumber,jdbcType=DECIMAL}
+    </if>
+    )
+  </select>
 </mapper>

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

@@ -388,7 +388,8 @@
     select  distinct
      wir.inbound_distribute_id "distributeId",
      wir.result_number "resultNumber",
-     rpg.WAREHOUSE_ID "warehouseId",
+     rw.WAREHOUSE_NAME "warehouseName",
+     rw.WAREHOUSE_ID "warehouseId",
      rpg.PLATFORM_ID "platformId",
      rpg.STACKING_ID "stackingId",
      rs.STACKING_ARRIVAL "stackingArrival",
@@ -404,6 +405,7 @@
      rm.MATERIAL_LENGTH "materialLength"
   from WMSP_INBOUND_RESULT wir
   left join RMS_PWAREHOUSE_GRID rpg on rpg.GRID_ID=wir.GRID_ID
+  left join RMS_WAREHOUSE rw on rpg.WAREHOUSE_ID=rw.WAREHOUSE_ID
   left join RMS_STACKING rs on  rs.STACKING_ID=rpg.STACKING_ID
   left join rms_material_steel rms on rms.MATERIAL_STEEL_ID=wir.material_Id
   left join rms_material rm on rm.material_Id=rms.material_Id

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

@@ -5,6 +5,10 @@
     <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
     <result column="RESULT_STACK_NUMBER" jdbcType="VARCHAR" property="resultStackNumber" />
     <result column="AFTER_STACKING_ID" jdbcType="DECIMAL" property="afterStackingId" />
+    <result column="BEFORE_LEVEL" jdbcType="DECIMAL" property="beforeLevel" />
+    <result column="AFTER_BEFORE_STACKING_ID" jdbcType="DECIMAL" property="afterBeforeStackingId" />
+    
+    <result column="QUANTITY" jdbcType="DECIMAL" property="quantity" />
     <result column="RESULT_MOVELIST_TIME" jdbcType="TIMESTAMP" property="resultMovelistTime" />
     <result column="KEEPER_ID" jdbcType="DECIMAL" property="keeperId" />
     <result column="RESULT_KEEPER_ISSUE_TIME" jdbcType="TIMESTAMP" property="resultKeeperIssueTime" />
@@ -20,13 +24,13 @@
     <result column="RESULT_REMARK" jdbcType="VARCHAR" property="resultRemark" />
   </resultMap>
   <sql id="columns">
-    RESULT_ID, RESULT_STACK_NUMBER, AFTER_STACKING_ID, RESULT_MOVELIST_TIME, KEEPER_ID, 
+    RESULT_ID, RESULT_STACK_NUMBER, AFTER_STACKING_ID,BEFORE_LEVEL,AFTER_BEFORE_STACKING_ID,QUANTITY, RESULT_MOVELIST_TIME, KEEPER_ID,
     RESULT_KEEPER_ISSUE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
     INSERT_UPDATE_REMARK, DELETED, DISTRIBUTIONSTATUS, AFTER_WAREHOUSE_ID, RESULT_STATUS, 
     RESULT_REMARK
   </sql>
   <sql id="columns_alias">
-    t.RESULT_ID, t.RESULT_STACK_NUMBER, t.AFTER_STACKING_ID, t.RESULT_MOVELIST_TIME, 
+    t.RESULT_ID, t.RESULT_STACK_NUMBER, t.AFTER_STACKING_ID,BEFORE_LEVEL,AFTER_BEFORE_STACKING_ID,QUANTITY, t.RESULT_MOVELIST_TIME,
     t.KEEPER_ID, t.RESULT_KEEPER_ISSUE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
     t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.DISTRIBUTIONSTATUS, t.AFTER_WAREHOUSE_ID, 
     t.RESULT_STATUS, t.RESULT_REMARK
@@ -48,6 +52,15 @@
       <if test="afterStackingId != null">
         and AFTER_STACKING_ID = #{afterStackingId}
       </if>
+      <if test="beforeLevel != null">
+        and BEFORE_LEVEL = #{beforeLevel}
+      </if>
+      <if test="afterBeforeStackingId != null">
+        and AFTER_BEFORE_STACKING_ID = #{afterBeforeStackingId}
+      </if>
+      <if test="quantity != null">
+        and QUANTITY = #{quantity}
+      </if>
       <if test="resultMovelistTime != null">
         and TO_CHAR(RESULT_MOVELIST_TIME,'yyyy-MM-dd') = #{resultMovelistTime}
       </if>
@@ -100,6 +113,15 @@
       <if test="afterStackingId != null">
         and AFTER_STACKING_ID = #{afterStackingId}
       </if>
+      <if test="beforeLevel != null">
+        and BEFORE_LEVEL = #{beforeLevel}
+      </if>
+      <if test="afterBeforeStackingId != null">
+        and AFTER_BEFORE_STACKING_ID = #{afterBeforeStackingId}
+      </if>
+      <if test="quantity != null">
+        and QUANTITY = #{quantity}
+      </if>
       <if test="resultMovelistTime != null">
         and TO_CHAR(RESULT_MOVELIST_TIME,'yyyy-MM-dd') = #{resultMovelistTime}
       </if>
@@ -154,6 +176,15 @@
     <if test="afterStackingId != null">
       or AFTER_STACKING_ID = #{afterStackingId}
     </if>
+    <if test="beforeLevel != null">
+      or BEFORE_LEVEL = #{beforeLevel}
+    </if>
+    <if test="afterBeforeStackingId != null">
+      or AFTER_BEFORE_STACKING_ID = #{afterBeforeStackingId}
+    </if>
+    <if test="quantity != null">
+      or QUANTITY = #{quantity}
+    </if>
     <if test="resultMovelistTime != null">
       or TO_CHAR(RESULT_MOVELIST_TIME,'yyyy-MM-dd') = '#{resultMovelistTime}'
     </if>
@@ -195,13 +226,13 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.WmspRestackMakeResult">
-    insert into WMSP_RESTACK_MAKE_RESULT (RESULT_ID, RESULT_STACK_NUMBER, AFTER_STACKING_ID,
+    insert into WMSP_RESTACK_MAKE_RESULT (RESULT_ID, RESULT_STACK_NUMBER, AFTER_STACKING_ID,BEFORE_LEVEL,AFTER_BEFORE_STACKING_ID,QUANTITY,
                                           RESULT_MOVELIST_TIME, KEEPER_ID, RESULT_KEEPER_ISSUE_TIME,
                                           INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                           UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
                                           DISTRIBUTIONSTATUS, AFTER_WAREHOUSE_ID, RESULT_STATUS,
                                           RESULT_REMARK)
-    values (#{resultId,jdbcType=DECIMAL}, #{resultStackNumber,jdbcType=VARCHAR}, #{afterStackingId,jdbcType=DECIMAL},
+    values (#{resultId,jdbcType=DECIMAL}, #{resultStackNumber,jdbcType=VARCHAR}, #{afterStackingId,jdbcType=DECIMAL}, #{beforeLevel,jdbcType=DECIMAL}, #{afterBeforeStackingId,jdbcType=DECIMAL},#{quantity,jdbcType=DECIMAL},
             #{resultMovelistTime,jdbcType=TIMESTAMP}, #{keeperId,jdbcType=DECIMAL}, #{resultKeeperIssueTime,jdbcType=TIMESTAMP},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
             #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
@@ -220,6 +251,15 @@
       <if test="afterStackingId != null">
         AFTER_STACKING_ID,
       </if>
+      <if test="beforeLevel != null">
+        BEFORE_LEVEL,
+      </if>
+      <if test="afterBeforeStackingId != null">
+        AFTER_BEFORE_STACKING_ID,
+      </if>
+      <if test="quantity != null">
+        QUANTITY,
+      </if>
       <if test="resultMovelistTime != null">
         RESULT_MOVELIST_TIME,
       </if>
@@ -270,6 +310,16 @@
       <if test="afterStackingId != null">
         #{afterStackingId,jdbcType=DECIMAL},
       </if>
+      <if test="beforeLevel != null">
+        #{beforeLevel,jdbcType=DECIMAL},
+      </if>
+      
+      <if test="afterBeforeStackingId != null">
+        #{afterBeforeStackingId,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        #{quantity,jdbcType=DECIMAL},
+      </if>
       <if test="resultMovelistTime != null">
         #{resultMovelistTime,jdbcType=TIMESTAMP},
       </if>
@@ -315,6 +365,9 @@
     update WMSP_RESTACK_MAKE_RESULT
     set RESULT_STACK_NUMBER = #{resultStackNumber,jdbcType=VARCHAR},
         AFTER_STACKING_ID = #{afterStackingId,jdbcType=DECIMAL},
+        BEFORE_LEVEL = #{beforeLevel,jdbcType=DECIMAL},
+        AFTER_BEFORE_STACKING_ID = #{afterBeforeStackingId,jdbcType=DECIMAL},
+        QUANTITY = #{quantity,jdbcType=DECIMAL},
         RESULT_MOVELIST_TIME = #{resultMovelistTime,jdbcType=TIMESTAMP},
         KEEPER_ID = #{keeperId,jdbcType=DECIMAL},
         RESULT_KEEPER_ISSUE_TIME = #{resultKeeperIssueTime,jdbcType=TIMESTAMP},
@@ -339,6 +392,15 @@
       <if test="afterStackingId != null">
         AFTER_STACKING_ID = #{afterStackingId,jdbcType=DECIMAL},
       </if>
+      <if test="beforeLevel != null">
+        BEFORE_LEVEL = #{beforeLevel,jdbcType=DECIMAL},
+      </if>
+      <if test="afterBeforeStackingId != null">
+        AFTER_BEFORE_STACKING_ID = #{afterBeforeStackingId,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        QUANTITY = #{quantity,jdbcType=DECIMAL},
+      </if>
       <if test="resultMovelistTime != null">
         RESULT_MOVELIST_TIME = #{resultMovelistTime,jdbcType=TIMESTAMP},
       </if>
@@ -396,7 +458,7 @@
   <insert id="batchInsert" parameterType="java.util.List">
     insert into WMSP_RESTACK_MAKE_RESULT
     (RESULT_ID,
-    RESULT_STACK_NUMBER, AFTER_STACKING_ID,
+    RESULT_STACK_NUMBER, AFTER_STACKING_ID,BEFORE_LEVEL,AFTER_BEFORE_STACKING_ID,QUANTITY,
     RESULT_MOVELIST_TIME, KEEPER_ID,
     RESULT_KEEPER_ISSUE_TIME, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME,
@@ -407,7 +469,7 @@
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
-    #{item.resultStackNumber,jdbcType=VARCHAR}, #{item.afterStackingId,jdbcType=DECIMAL},
+    #{item.resultStackNumber,jdbcType=VARCHAR}, #{item.afterStackingId,jdbcType=DECIMAL}, #{item.beforeLevel,jdbcType=DECIMAL}, #{item.afterBeforeStackingId,jdbcType=DECIMAL},#{item.quantity,jdbcType=DECIMAL},
     #{item.resultMovelistTime,jdbcType=TIMESTAMP}, #{item.keeperId,jdbcType=DECIMAL},
     #{item.resultKeeperIssueTime,jdbcType=TIMESTAMP}, #{item.insertUsername,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
@@ -428,10 +490,23 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultStackNumber,jdbcType=VARCHAR}
     </foreach>
+    
     ,AFTER_STACKING_ID=
     <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.afterStackingId,jdbcType=DECIMAL}
     </foreach>
+    ,BEFORE_LEVEL=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.beforeLevel,jdbcType=DECIMAL}
+    </foreach>
+    ,AFTER_BEFORE_STACKING_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.afterBeforeStackingId,jdbcType=DECIMAL}
+    </foreach>
+    ,QUANTITY=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.quantity,jdbcType=DECIMAL}
+    </foreach>
     ,RESULT_MOVELIST_TIME=
     <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMovelistTime,jdbcType=TIMESTAMP}
@@ -619,6 +694,135 @@
     FROM RMS_WAREHOUSE RW where RW.WAREHOUSE_TYPE_ID = 1 AND WAREHOUSE_NAME != '高线库'
   </select>
   <!--  查询倒垛单-->
+<!--  <select id="selectRestack"  parameterType="java.lang.Integer" resultType="java.util.LinkedHashMap">-->
+<!--    select distinct-->
+<!--    WRMR.RESULT_ID "resultId",-->
+<!--    WRMR.RESULT_STACK_NUMBER "resultStackNumber",-->
+<!--    WRMR.INSERT_TIME "insertTime",-->
+<!--    WRMR.DISTRIBUTIONSTATUS "DistrubtionStatus",-->
+<!--    RP1.PERSONNEL_NAME "keeperName",-->
+<!--    RP.PERSONNEL_NAME "craneName",-->
+<!--    WRMR.RESULT_MOVELIST_TIME "resultKeeperIssueTim",-->
+<!--    WRMM.MAKE_MATERIAL_NUMBER "makeMaterialNumber",-->
+<!--    RMS.MATERIAL_FURNACE_NUMBER "materialFurnaceNumbe",-->
+<!--    RM.MATERIAL_CODE "materialCode",-->
+<!--    RM.MATERIAL_NAME "materialName",-->
+<!--    RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalW",-->
+<!--    RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "specification",-->
+<!--    WRMM.MATERIAL_ID "materialId",-->
+<!--    RPG.GRID_GRADATION_NUMBER "newGrandNum",-->
+<!--    RPG2.GRID_GRADATION_NUMBER "GrandNum",-->
+<!--    RS.STACKING_NO "newStackingNo",-->
+<!--    RS2.STACKING_NO "StackingNo",-->
+<!--    RS.STACKING_ID "newStackingId",-->
+<!--    RS2.STACKING_ID "StackingId",-->
+<!--    RW.WAREHOUSE_NAME "warehouseName"-->
+<!--    from WMSP_RESTACK_MAKE_RESULT WRMR-->
+<!--    left join WMSP_RESTACK_MAKE_MATERIAL WRMM-->
+<!--    on WRMM.MAKE_RESULT_ID=WRMR.RESULT_ID-->
+<!--    left join RMS_PERSONNEL RP1-->
+<!--    on WRMR.KEEPER_ID=RP1.PERSONNEL_ID-->
+<!--    left join RMS_PWAREHOUSE_GRID RPG-->
+<!--    on   rpg.grid_id=WRMM.After_Grid_Id-->
+<!--    left join RMS_PWAREHOUSE_GRID RPG2-->
+<!--    on RPG2.GRID_ID=WRMM.Before_Grid_Id-->
+<!--    left join RMS_STACKING RS-->
+<!--    on RS.STACKING_ID=RPG.STACKING_ID-->
+<!--    left join RMS_STACKING RS2-->
+<!--    on RS2.STACKING_ID=RPG2.STACKING_ID-->
+<!--    left join RMS_MATERIAL_STEEL RMS-->
+<!--    on RMS.MATERIAL_STEEL_ID=WRMM.MATERIAL_ID-->
+<!--    left join  RMS_MATERIAL RM-->
+<!--    on  RM.MATERIAL_ID=RMS.MATERIAL_ID-->
+<!--    left JOIN WMSP_RESTACK_DRIVING_RESULT WRDR-->
+<!--    ON WRDR.RESULT_RESTACK_ID=WRMR.RESULT_ID-->
+<!--    left JOIN  RMS_PERSONNEL RP-->
+<!--    ON RP.PERSONNEL_ID=WRDR.CRANE_DRIVER_ID-->
+<!--    left join RMS_WAREHOUSE RW-->
+<!--    ON RW.WAREHOUSE_ID=RPG.WAREHOUSE_ID-->
+<!--    WHERE  DISTRIBUTIONSTATUS=#{DistrubtionStatus} and WRMR.DELETED=0 and WRMR.RESULT_STATUS=0-->
+<!--    <where>-->
+<!--      <if test="resultStackNumber != null">-->
+<!--        and-->
+<!--        <foreach collection="resultStackNumber" item="item" open="(" separator="or" close=")">-->
+<!--          "resultStackNumber" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="stackingNo1 != null">-->
+<!--        and-->
+<!--        <foreach collection="stackingNo1" item="item" open="(" separator="or" close=")">-->
+<!--          "stackingNo1" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="gradtionNumber1 != null">-->
+<!--        and-->
+<!--        <foreach collection="gradtionNumber1" item="item" open="(" separator="or" close=")">-->
+<!--          "gradtionNumber1" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="keeperName!= null">-->
+<!--        and-->
+<!--        <foreach collection="keeperName" item="item" open="(" separator="or" close=")">-->
+<!--          "keeperName" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="warehouseName!= null">-->
+<!--        and-->
+<!--        <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">-->
+<!--          "warehouseName" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="materialCode!= null">-->
+<!--        and-->
+<!--        <foreach collection="materialCode" item="item" open="(" separator="or" close=")">-->
+<!--          "materialCode" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="materialName!= null">-->
+<!--        and-->
+<!--        <foreach collection="materialName" item="item" open="(" separator="or" close=")">-->
+<!--          "materialName" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="materialTheoreticalW!= null">-->
+<!--        and-->
+<!--        <foreach collection="materialTheoreticalW" item="item" open="(" separator="or" close=")">-->
+<!--          "materialTheoreticalW" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="specification!= null">-->
+<!--        and-->
+<!--        <foreach collection="specification" item="item" open="(" separator="or" close=")">-->
+<!--          "specification" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="newGrandNum!= null">-->
+<!--        and-->
+<!--        <foreach collection="newGrandNum" item="item" open="(" separator="or" close=")">-->
+<!--          "newGrandNum" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="GrandNum!= null">-->
+<!--        and-->
+<!--        <foreach collection="GrandNum" item="item" open="(" separator="or" close=")">-->
+<!--          "GrandNum" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="newStackingNo!= null">-->
+<!--        and-->
+<!--        <foreach collection="newStackingNo" item="item" open="(" separator="or" close=")">-->
+<!--          "newStackingNo" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="StackingNo!= null">-->
+<!--        and-->
+<!--        <foreach collection="StackingNo" item="item" open="(" separator="or" close=")">-->
+<!--          "StackingNo" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--    </where>-->
+<!--    <include refid="orderByInsertTime"></include>-->
+<!--  </select>-->
   <select id="selectRestack"  parameterType="java.lang.Integer" resultType="java.util.LinkedHashMap">
     select distinct
     WRMR.RESULT_ID "resultId",
@@ -628,13 +832,6 @@
     RP1.PERSONNEL_NAME "keeperName",
     RP.PERSONNEL_NAME "craneName",
     WRMR.RESULT_MOVELIST_TIME "resultKeeperIssueTim",
-    WRMM.MAKE_MATERIAL_NUMBER "makeMaterialNumber",
-    RMS.MATERIAL_FURNACE_NUMBER "materialFurnaceNumbe",
-    RM.MATERIAL_CODE "materialCode",
-    RM.MATERIAL_NAME "materialName",
-    RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalW",
-    RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "specification",
-    WRMM.MATERIAL_ID "materialId",
     RPG.GRID_GRADATION_NUMBER "newGrandNum",
     RPG2.GRID_GRADATION_NUMBER "GrandNum",
     RS.STACKING_NO "newStackingNo",
@@ -655,10 +852,6 @@
     on RS.STACKING_ID=RPG.STACKING_ID
     left join RMS_STACKING RS2
     on RS2.STACKING_ID=RPG2.STACKING_ID
-    left join RMS_MATERIAL_STEEL RMS
-    on RMS.MATERIAL_STEEL_ID=WRMM.MATERIAL_ID
-    left join  RMS_MATERIAL RM
-    on  RM.MATERIAL_ID=RMS.MATERIAL_ID
     left JOIN WMSP_RESTACK_DRIVING_RESULT WRDR
     ON WRDR.RESULT_RESTACK_ID=WRMR.RESULT_ID
     left JOIN  RMS_PERSONNEL RP
@@ -750,7 +943,6 @@
   </select>
 
 
-
 <!--获取倒垛实绩Pc-->
   <select id="selectRestackForPc"  parameterType="java.lang.Integer" resultType="java.util.LinkedHashMap">
     select distinct
@@ -758,23 +950,26 @@
     WRMR.RESULT_STACK_NUMBER "resultStackNumber",
     WRMR.INSERT_TIME "insertTime",
     WRMR.DISTRIBUTIONSTATUS "DistrubtionStatus",
-    RP1.PERSONNEL_NAME "keeperName",
-    RP.PERSONNEL_NAME "craneName",
     WRMR.RESULT_MOVELIST_TIME "resultKeeperIssueTim",
-    WRMM.MAKE_MATERIAL_NUMBER "makeMaterialNumber",
-    RMS.MATERIAL_FURNACE_NUMBER "materialFurnaceNumbe",
-    RM.MATERIAL_CODE "materialCode",
-    RM.MATERIAL_NAME "materialName",
-    RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalW",
-    RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "specification",
-    WRMM.MATERIAL_ID "materialId",
-    RPG.GRID_GRADATION_NUMBER "newGrandNum",
-    RPG2.GRID_GRADATION_NUMBER "GrandNum",
     RS.STACKING_NO "newStackingNo",
     RS2.STACKING_NO "StackingNo",
     RS.STACKING_ID "newStackingId",
     RS2.STACKING_ID "StackingId",
-    RW.WAREHOUSE_NAME "warehouseName"
+    RW.WAREHOUSE_NAME "warehouseName",
+    RPG.GRID_GRADATION_NUMBER "newGrandNum",
+    RPG2.GRID_GRADATION_NUMBER "GrandNum"
+    
+--     WRMM.MAKE_MATERIAL_NUMBER "makeMaterialNumber",
+--     RP1.PERSONNEL_NAME "keeperName",
+--     RP.PERSONNEL_NAME "craneName",
+--     RMS.MATERIAL_FURNACE_NUMBER "materialFurnaceNumbe",
+--     RM.MATERIAL_CODE "materialCode",
+--     RM.MATERIAL_NAME "materialName",
+--     RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalW",
+--     RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "specification",
+--     WRMM.MATERIAL_ID "materialId",
+
+   
     from WMSP_RESTACK_MAKE_RESULT WRMR
     left join WMSP_RESTACK_MAKE_MATERIAL WRMM
     on WRMM.MAKE_RESULT_ID=WRMR.RESULT_ID

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

@@ -0,0 +1,318 @@
+<?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.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="QUANTITY" jdbcType="DECIMAL" property="quantity" />
+    <result column="WMSP_RESTACK_MAKE_ID" jdbcType="DECIMAL" property="wmspRestackMakeId" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    WMSP_RESTACK_MAKE_TYPE_ID, MATERIAL_TYPE_ID, QUANTITY, WMSP_RESTACK_MAKE_ID, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.WMSP_RESTACK_MAKE_TYPE_ID, t.MATERIAL_TYPE_ID, t.QUANTITY, t.WMSP_RESTACK_MAKE_ID, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM WMSP_RESTACK_MAKE_TYPE_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM WMSP_RESTACK_MAKE_TYPE_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="wmspRestackMakeTypeId != null">
+        and WMSP_RESTACK_MAKE_TYPE_ID = #{wmspRestackMakeTypeId}
+      </if>
+      <if test="materialTypeId != null">
+        and MATERIAL_TYPE_ID = #{materialTypeId}
+      </if>
+      <if test="quantity != null">
+        and QUANTITY = #{quantity}
+      </if>
+      <if test="wmspRestackMakeId != null">
+        and WMSP_RESTACK_MAKE_ID = #{wmspRestackMakeId}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="wmspRestackMakeTypeId != null">
+        and WMSP_RESTACK_MAKE_TYPE_ID = #{wmspRestackMakeTypeId}
+      </if>
+      <if test="materialTypeId != null">
+        and MATERIAL_TYPE_ID = #{materialTypeId}
+      </if>
+      <if test="quantity != null">
+        and QUANTITY = #{quantity}
+      </if>
+      <if test="wmspRestackMakeId != null">
+        and WMSP_RESTACK_MAKE_ID = #{wmspRestackMakeId}
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from WMSP_RESTACK_MAKE_TYPE_RESULT
+    where WMSP_RESTACK_MAKE_TYPE_ID = #{wmspRestackMakeTypeId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from WMSP_RESTACK_MAKE_TYPE_RESULT
+    where 1!=1 
+      <if test="materialTypeId != null">
+        or MATERIAL_TYPE_ID = #{materialTypeId}
+      </if>
+      <if test="quantity != null">
+        or QUANTITY = #{quantity}
+      </if>
+      <if test="wmspRestackMakeId != null">
+        or WMSP_RESTACK_MAKE_ID = #{wmspRestackMakeId}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.WmspRestackMakeTypeResult">
+    insert into WMSP_RESTACK_MAKE_TYPE_RESULT (WMSP_RESTACK_MAKE_TYPE_ID, MATERIAL_TYPE_ID, 
+      QUANTITY, WMSP_RESTACK_MAKE_ID, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{wmspRestackMakeTypeId,jdbcType=DECIMAL}, #{materialTypeId,jdbcType=DECIMAL}, 
+      #{quantity,jdbcType=DECIMAL}, #{wmspRestackMakeId,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.WmspRestackMakeTypeResult">
+    insert into WMSP_RESTACK_MAKE_TYPE_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="wmspRestackMakeTypeId != null">
+        WMSP_RESTACK_MAKE_TYPE_ID,
+      </if>
+      <if test="materialTypeId != null">
+        MATERIAL_TYPE_ID,
+      </if>
+      <if test="quantity != null">
+        QUANTITY,
+      </if>
+      <if test="wmspRestackMakeId != null">
+        WMSP_RESTACK_MAKE_ID,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="wmspRestackMakeTypeId != null">
+        #{wmspRestackMakeTypeId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialTypeId != null">
+        #{materialTypeId,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        #{quantity,jdbcType=DECIMAL},
+      </if>
+      <if test="wmspRestackMakeId != null">
+        #{wmspRestackMakeId,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.WmspRestackMakeTypeResult">
+    update WMSP_RESTACK_MAKE_TYPE_RESULT
+    set MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
+      QUANTITY = #{quantity,jdbcType=DECIMAL},
+      WMSP_RESTACK_MAKE_ID = #{wmspRestackMakeId,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}
+    where WMSP_RESTACK_MAKE_TYPE_ID = #{wmspRestackMakeTypeId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.WmspRestackMakeTypeResult">
+    update WMSP_RESTACK_MAKE_TYPE_RESULT
+    <set>
+      <if test="materialTypeId != null">
+        MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        QUANTITY = #{quantity,jdbcType=DECIMAL},
+      </if>
+      <if test="wmspRestackMakeId != null">
+        WMSP_RESTACK_MAKE_ID = #{wmspRestackMakeId,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>
+    </set>
+    where WMSP_RESTACK_MAKE_TYPE_ID = #{wmspRestackMakeTypeId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where WMSP_RESTACK_MAKE_TYPE_ID = #{wmspRestackMakeTypeId,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 WMSP_RESTACK_MAKE_TYPE_RESULT 
+      (WMSP_RESTACK_MAKE_TYPE_ID, 
+      MATERIAL_TYPE_ID, QUANTITY, WMSP_RESTACK_MAKE_ID, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL}, 
+      #{item.materialTypeId,jdbcType=DECIMAL}, #{item.quantity,jdbcType=DECIMAL}, #{item.wmspRestackMakeId,jdbcType=DECIMAL}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update WMSP_RESTACK_MAKE_TYPE_RESULT
+     set
+       WMSP_RESTACK_MAKE_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.wmspRestackMakeTypeId,jdbcType=DECIMAL}
+       </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}
+       </foreach>
+       ,QUANTITY=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
+          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.quantity,jdbcType=DECIMAL}
+       </foreach>
+       ,WMSP_RESTACK_MAKE_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.wmspRestackMakeId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
+          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
+          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
+          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
+          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WMSP_RESTACK_MAKE_TYPE_ID" close="end">
+          when #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where WMSP_RESTACK_MAKE_TYPE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.wmspRestackMakeTypeId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from WMSP_RESTACK_MAKE_TYPE_RESULT
+    where WMSP_RESTACK_MAKE_TYPE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>