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

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

@@ -126,12 +126,12 @@ public class WmspGridMaterialController extends BaseRESTfulController {
         }
         return success(pageList);
     }
-//统计实时库存数量
-@PostMapping(value = "/countByGmId")
-public RESTfulResult countByGmId() {
-    Long code = wmspGridMaterialService.countByGmId();
-    return success(code);
-}
+    //统计实时库存数量
+    @PostMapping(value = "/countByGmId")
+    public RESTfulResult countByGmId() {
+        Long code = wmspGridMaterialService.countByGmId();
+        return success(code);
+    }
 
 
     // 通过成品仓库网格ID查询实时库存
@@ -201,14 +201,17 @@ public RESTfulResult countByGmId() {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "warehouseid",dataType = "DECIMAL",value = "仓库"),
             @ApiImplicitParam(name = "stackingId",dataType = "BigDicemal",value = "垛位"),
-            @ApiImplicitParam(name = "gradtionNumber",dataType = "BigDicemal",value = "层号")
-
+            @ApiImplicitParam(name = "gradtionNumber",dataType = "BigDicemal",value = "层号"),
+            @ApiImplicitParam(name = "apiId", value = "437", required = false, dataType = "BigDecimal"),
     })
-    @GetMapping("/getMaterialTypeList")
-    public  RESTfulResult getMaterialTypeList(String warehouseid,BigDecimal stackingId,BigDecimal gradtionNumber){
+    @PostMapping("/getMaterialTypeList")
+    public  RESTfulResult getMaterialTypeList(String warehouseid,BigDecimal stackingId,BigDecimal gradtionNumber,Integer pageNum,Integer pageSize,Integer apiId){
         //获得一个list<Map<String,Object>> map里面包括：物质Id、物质名称、物质型号、理论重量、物质件数
-        List<Map<String,Object>> map=wmspGridMaterialService.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
-        return success();
+        List<Map<String,Object>> columnList=wmspGridMaterialService.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String,Object>> mapList=wmspGridMaterialService.getMaterialTypeList(warehouseid,stackingId,gradtionNumber);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
+        return success(pageList);
     }
 }
 

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

@@ -124,22 +124,24 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         Map<String, Object> order = wmspOutboundResultService.getOrder(orderNumber);
         /**拿运输订单信息中的运输订单Id*/
         BigDecimal orderId = (BigDecimal) order.get("orderId");
-        /**根据运输订单号，查询出该订单还没有装货的物资*/
-        List<Map<String,Object>> orderList = wmspOutboundResultService.getMaterial(orderId.intValue());
-        //拿到还没装货的物资的物资编码
-        String materialCode = (String) orderList.get(0).get("materialCode");
-        //拿到还没装货的物资的物资名称
-        String materialName = (String) orderList.get(0).get("materialName");
-        //拿到还没装货的物资的规格
-        String materialSpecification = (String) orderList.get(0).get("materialSpecification");
-        //拿到还没装货的物资的型号
-        String materialModel = (String) orderList.get(0).get("materialModel");
-        //拿到还没装货的物资的物资理重
-        BigDecimal materialTheoreticalWeight = (BigDecimal) orderList.get(0).get("materialTheoreticalWeight");
-        //获取装卸工工号
-        //String personnelJobNumber = mapval.get("personnelJobNumber").toString();
-        //通过装卸工工号查询装卸工名称
-        //String personnelName = wmspOutboundResultService.getPersonnelNameByJobnumber(personnelJobNumber);
+//        根据该运输订单Id判断当前订单是否已经完成出厂，若完成直接返回null
+        if (wmspOutboundResultService.getOutboundStatus(orderId)==0){
+            /**根据运输订单号，查询出该订单还没有装货的物资*/
+            List<Map<String,Object>> orderList = wmspOutboundResultService.getMaterial(orderId.intValue());
+            //拿到还没装货的物资的物资编码
+            String materialCode = (String) orderList.get(0).get("materialCode");
+            //拿到还没装货的物资的物资名称
+            String materialName = (String) orderList.get(0).get("materialName");
+            //拿到还没装货的物资的规格
+            String materialSpecification = (String) orderList.get(0).get("materialSpecification");
+            //拿到还没装货的物资的型号
+            String materialModel = (String) orderList.get(0).get("materialModel");
+            //拿到还没装货的物资的物资理重
+            BigDecimal materialTheoreticalWeight = (BigDecimal) orderList.get(0).get("materialTheoreticalWeight");
+            //获取装卸工工号
+            //String personnelJobNumber = mapval.get("personnelJobNumber").toString();
+            //通过装卸工工号查询装卸工名称
+            //String personnelName = wmspOutboundResultService.getPersonnelNameByJobnumber(personnelJobNumber);
 
         //拿到还没装货的物资id的第一条
         BigDecimal materialId = (BigDecimal) orderList.get(0).get("materialId");
@@ -232,7 +234,9 @@ public class WmspOutboundResultController extends BaseRESTfulController {
                 outBoundDetailedInfo.put("materialModel",materialModel);
                 outBoundDetailedInfo.put("materialTheoreticalWeight",materialTheoreticalWeight);
             }
-        return outBoundDetailedInfo;
+            return outBoundDetailedInfo;
+        }
+        return null;
     }
 
     /**

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

@@ -132,7 +132,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
 
     //删除
     @PostMapping(value = "/deleteByResultId/{resultId}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult deleteByResultId(@PathVariable Integer resultId){
+    public RESTfulResult deleteByResultId(@PathVariable String resultId){
         WmspRestackMakeResult wmspRestackMakeResult=new WmspRestackMakeResult();
         wmspRestackMakeResult.setResultId(new BigDecimal(resultId));
         wmspRestackMakeResult.setDeleted(new BigDecimal(1));
@@ -143,7 +143,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
     @ApiOperation(value="下发", notes="根据url的id下发")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/dispatchDistrubtionStatus/{resultId}")//BigDecimal
-    public RESTfulResult dispatchDistrubtionStatus(@PathVariable Integer resultId){
+    public RESTfulResult dispatchDistrubtionStatus(@PathVariable String resultId){
         WmspRestackMakeResult wmspRestackMakeResult=new WmspRestackMakeResult();
         wmspRestackMakeResult.setResultId(new BigDecimal(resultId));
         wmspRestackMakeResult.setDistributionstatus(new BigDecimal(1));
@@ -170,7 +170,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
         List<Map<String,Object>> code=wmspRestackMakeResultService.selectWarehouse();
         return success(code);
     }
-    @ApiOperation(value="展示倒垛单", notes="分页查询")
+    @ApiOperation(value="展示未下发倒垛单", notes="分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数",  required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
@@ -195,6 +195,45 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
         List<Map<String, Object>> columnList = wmspRestackMakeResultService.selectRestackForPc(mapVal);
 
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+
+        return success(data);
+    }
+    @ApiOperation(value="展示已下发倒垛单", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数",  required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "368", required = false, dataType = "BigDecimal"),
+
+    })
+    @PostMapping(value = "/selectRestackList2")
+    public RESTfulResult selectRestackList2(@RequestBody(required = false) Map<String,Object> mapVal,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId,
+                                           Integer DistrubtionStatus
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        mapVal.put("DistrubtionStatus", DistrubtionStatus);
+        //不分页筛选数据
+        List<Map<String, Object>> list = wmspRestackMakeResultService.selectRestackForPc(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = wmspRestackMakeResultService.selectRestackForPc(mapVal);
+        //            将获取到的columnList中的完成状态用中文表示
+        for (Map<String, Object> map1: list){
+            BigDecimal resultStatus =(BigDecimal)map1.get("resultStatus");
+            if (resultStatus.equals(0)){
+                map1.put("resultStatus","未完成");
+            }
+            if (resultStatus.equals(1)){
+                map1.put("resultStatus","已完成");
+            }
+        }
+
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+
         return success(data);
     }
     //根据实绩查找倒垛信息
@@ -206,7 +245,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
                                                   Integer apiId
 
     ){
-        Integer resultId =(Integer) mapVal.get("resultId");
+        String resultId =(String) mapVal.get("resultId");
         List<Map<String, Object>> libaryInBoundList = wmspRestackMakeResultService.selectRestackInfoByResultId(resultId);
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> columnList = wmspRestackMakeResultService.selectRestackInfoByResultId(resultId);
@@ -231,7 +270,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
-    public RESTfulResult selectAfterWarehouseByResultId(@PathVariable("resultId") Integer resultId){
+    public RESTfulResult selectAfterWarehouseByResultId(@PathVariable("resultId") String resultId){
         List<Map<String,Object>> RestackResult = wmspRestackMakeResultService.selectAfterWarehouseByResultId(resultId);
         return success(RestackResult);
     }
@@ -239,7 +278,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping("/selectAfterstackingByResultId/{resultId}")
-    public RESTfulResult selectAfterstackingByResultId(@PathVariable("resultId") Integer resultId){
+    public RESTfulResult selectAfterstackingByResultId(@PathVariable("resultId") String resultId){
         List<Map<String,Object>> RestackResult = wmspRestackMakeResultService.selectAfterstackingByResultId(resultId);
         return success(RestackResult);
     }
@@ -253,7 +292,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
     @PostMapping("/selectMaterialInfoByResultId")
     public  RESTfulResult selectMaterialInfoByResultId(@RequestBody(required = false) Map<String,Object> map
     ){
-        Integer resultId= (Integer) map.get("resultId");
+        String resultId= (String) map.get("resultId");
         List<Map<String,Object>> list=wmspRestackMakeResultService.selectMaterialInfoByResultId(resultId);
         return  success(list);
     }
@@ -262,7 +301,7 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
     public  RESTfulResult selectRestackByWarehouseId(@RequestBody(required = false) Map<String,Object> map
     ){
         Integer warehouseid= (Integer) map.get("warehouseid");
-        Integer DistrubtionStatus=(Integer)map.get("DistrubtionStatus");
+        String DistrubtionStatus=(String)map.get("DistrubtionStatus");
         Map map1=new HashMap();
         map1.put("warehouseid",warehouseid);
         map1.put("DistrubtionStatus",DistrubtionStatus);
@@ -274,18 +313,22 @@ public class WmspRestackMakeResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "keeperId" ,dataType = "BigDecimal",value = "库管员ID"),
             @ApiImplicitParam(name = "beforeLevel" ,dataType = "String ",value = "倒垛层"),
             @ApiImplicitParam(name = "afterStackingId" ,dataType = "BigDecimal",value = "倒垛后垛位id"),
-            @ApiImplicitParam(name = "afterWarehouseId" ,dataType = "BigDecimal",value = "倒垛后仓库id"),
+            @ApiImplicitParam(name = "afterWarehouseId" ,dataType = "BigDecimal",value = "仓库id"),
             @ApiImplicitParam(name = "afterBeforeStackingId" ,dataType = "BigDecimal",value = "倒垛前的垛位"),
             @ApiImplicitParam(name = "resultRemark" ,dataType = "BigDecimal",value = "倒垛单备注"),
-            @ApiImplicitParam(name = "maps" ,dataType = "List<Map<String,Object>>",value = "物质类型集合")
+            @ApiImplicitParam(name = "maps" ,dataType = "List<Map<String,Object>>",value = "物质型号集合")
     })
-    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,@RequestParam("resultStackNumber")String  beforeLevel,
-             @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,@RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
-             @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,@RequestParam("resultRemark")String resultRemark,
-             @RequestBody(required = false) List<Map<String,Object>> mps){
+    @PostMapping("/createRestackMakeResult")
+    public  RESTfulResult createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+                                                  @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+                                                  @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+                                                  @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+                                                  @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                  @RequestParam("resultRemark")String resultRemark,
+                                                  @RequestBody(required = false) List<Map<String,Object>> mps){
         //创建倒垛单和倒垛单类型
         WmspRestackMakeResult wmspRestackMakeResult= wmspRestackMakeResultService.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
-        return success();
+        return success(wmspRestackMakeResult);
     }
 
 

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

@@ -72,4 +72,6 @@ public interface WmspOutboundResultMapper extends IBaseMapper<WmspOutboundResult
     List<Map<String, Object>> getOunboundOrderNumber(BigDecimal resultId);
     // 修改网格为已删除
     int updateGrid(BigDecimal materialId);
+//    根据orderId获得当前运输订单的状态
+    int getOutboundStatus(BigDecimal orderId);
 }

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

@@ -30,10 +30,10 @@ public interface WmspRestackMakeResultMapper extends IBaseMapper<WmspRestackMake
     //查询倒垛单
     List<Map<String,Object>> selectRestack(Map<String,Object> mapval);
     //渲染数据
-    List<Map<String,Object>> selectAfterWarehouseByResultId(Integer resultId);
-    List<Map<String,Object>> selectAfterstackingByResultId(Integer resultId);
+    List<Map<String,Object>> selectAfterWarehouseByResultId(String resultId);
+    List<Map<String,Object>> selectAfterstackingByResultId(String resultId);
     //根据实绩id查找物资信息
-    List<Map<String,Object>> selectMaterialInfoByResultId(Integer resultId);
+    List<Map<String,Object>> selectMaterialInfoByResultId(String resultId);
     //根据仓库名称和下发状态查找倒垛单
     @MapKey("")
     List<Map<String,Object>> selectRestackByWarehouseId(Map<String,Object> map);
@@ -41,9 +41,11 @@ public interface WmspRestackMakeResultMapper extends IBaseMapper<WmspRestackMake
     Integer selectGridIdByMaterialId(BigDecimal materialSteelId);
     BigDecimal selectGridIdByWarehouseAndSatcking(Map<String,Object> map);
     //根据倒垛实绩查找倒垛信息
-    List<Map<String,Object>> selectRestackInfoByResultId(Integer resultId);
-    //Pc端展示倒垛实绩
+    List<Map<String,Object>> selectRestackInfoByResultId(String resultId);
+    //Pc端展示未下发的倒垛实绩
     List<Map<String,Object>> selectRestackForPc(Map<String,Object> map);
     //根据实绩id查找中间表id
     List<Map<String,Object>> selectMakeMaterialIdByResultId(Integer resultId);
+    //Pc端展示已下发的倒垛实绩
+    List<Map<String, Object>> selectRestackForPc2(Map<String, Object> map);
 }

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

@@ -3,9 +3,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 org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 
 @Mapper
 public interface WmspRestackMakeTypeResultMapper extends IBaseMapper<WmspRestackMakeTypeResult, BigDecimal> {
+
 }

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

@@ -74,4 +74,6 @@ public interface IWmspOutboundResultService {
     int outbountResultToSuccess(Integer resultId);
     //通过出库实绩Id判断出库单已扫描的件数是否等于运输订单物资表的物资件数
     int EqualMaterialsNumber(BigDecimal resultId);
+//    根据orderId判断当前运输订单的状态
+    int getOutboundStatus(BigDecimal orderId);
 }

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

@@ -38,16 +38,16 @@ public interface IWmspRestackMakeResultService {
     //查询倒垛单
     List<Map<String,Object>> selectRestack(Map<String,Object> mapval);
     //渲染数据
-    List<Map<String,Object>> selectAfterWarehouseByResultId(Integer resultId);
-    List<Map<String,Object>> selectAfterstackingByResultId(Integer resultId);
-    List<Map<String,Object>> selectMaterialInfoByResultId(Integer resultId);
+    List<Map<String,Object>> selectAfterWarehouseByResultId(String resultId);
+    List<Map<String,Object>> selectAfterstackingByResultId(String resultId);
+    List<Map<String,Object>> selectMaterialInfoByResultId(String resultId);
     List<Map<String,Object>> selectRestackByWarehouseId(Map<String,Object> map);
     //根据钢材物资id查找仓储网格id
     Integer selectGridIdByMaterialId(BigDecimal materialSteelId);
     //根据倒垛实绩查找倒垛信息
-    List<Map<String,Object>> selectRestackInfoByResultId(Integer resultId);
+    List<Map<String,Object>> selectRestackInfoByResultId(String resultId);
     //Pc端展示倒垛实绩
     List<Map<String,Object>> selectRestackForPc(Map<String,Object> map);
 
-    WmspRestackMakeResult createRestackMakeResult(BigDecimal keeperId, String resultStackNumber, BigDecimal afterStackingId, BigDecimal afterWarehouseId, BigDecimal afterBeforeStackingId, String resultRemark, List<Map<String, Object>> mps);
+    WmspRestackMakeResult createRestackMakeResult(BigDecimal keeperId, BigDecimal beforeLevel, BigDecimal afterStackingId, BigDecimal afterWarehouseId, BigDecimal afterBeforeStackingId, String resultRemark, List<Map<String, Object>> mps);
 }

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

@@ -219,4 +219,9 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         //返回结果
         return EqualMaterialsNumber;
     }
+
+    @Override
+    public int getOutboundStatus(BigDecimal orderId) {
+        return wmspOutboundResultMapper.getOutboundStatus(orderId);
+    }
 }

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

@@ -14,10 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * WmspRestackMakeResult服务实现：
@@ -227,19 +224,19 @@ public class WmspRestackMakeResultServiceImpl  implements IWmspRestackMakeResult
 
     //根据实绩id查找倒垛后的仓库
     @Override
-    public List<Map<String, Object>> selectAfterWarehouseByResultId(Integer resultId) {
+    public List<Map<String, Object>> selectAfterWarehouseByResultId(String resultId) {
         return wmspRestackMakeResultMapper.selectAfterWarehouseByResultId(resultId);
     }
 
     //根据实绩id查找倒垛后的垛位
     @Override
-    public List<Map<String, Object>> selectAfterstackingByResultId(Integer resultId) {
+    public List<Map<String, Object>> selectAfterstackingByResultId(String resultId) {
         return wmspRestackMakeResultMapper.selectAfterstackingByResultId(resultId);
     }
 
     //根据实绩id查找物资信息
     @Override
-    public List<Map<String, Object>> selectMaterialInfoByResultId(Integer resultId) {
+    public List<Map<String, Object>> selectMaterialInfoByResultId(String resultId) {
         return wmspRestackMakeResultMapper.selectMaterialInfoByResultId(resultId);
     }
 
@@ -254,19 +251,37 @@ public class WmspRestackMakeResultServiceImpl  implements IWmspRestackMakeResult
     }
 
     @Override
-    public List<Map<String, Object>> selectRestackInfoByResultId(Integer resultId) {
+    public List<Map<String, Object>> selectRestackInfoByResultId(String resultId) {
         return wmspRestackMakeResultMapper.selectRestackInfoByResultId(resultId);
     }
 
     @Override
     public List<Map<String, Object>> selectRestackForPc(Map<String, Object> map) {
-        return wmspRestackMakeResultMapper.selectRestackForPc(map);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+//        判断当前用户想要获取的是未下发或已下发的数据
+        if (map.get("DistrubtionStatus").equals(0)){
+            mapList = wmspRestackMakeResultMapper.selectRestackForPc(map);
+        }
+        if (map.get("DistrubtionStatus").equals(1)){
+            mapList = wmspRestackMakeResultMapper.selectRestackForPc2(map);
+//            将获取到的mapList中的完成状态用中文表示
+            for (Map<String, Object> map1: mapList){
+                BigDecimal resultStatus =(BigDecimal)map1.get("resultStatus");
+                if (resultStatus.equals(0)){
+                    map1.put("resultStatus","未完成");
+                }
+                if (resultStatus.equals(1)){
+                    map1.put("resultStatus","已完成");
+                }
+            }
+        }
+        return mapList;
     }
 
     /**
      * //创建倒垛单和倒垛单类型
      * @param keeperId
-     * @param resultStackNumber
+     * @param beforeLevel
      * @param afterStackingId
      * @param afterWarehouseId
      * @param afterBeforeStackingId
@@ -276,18 +291,23 @@ public class WmspRestackMakeResultServiceImpl  implements IWmspRestackMakeResult
      */
     @Transactional
     @Override
-    public WmspRestackMakeResult createRestackMakeResult(
-            BigDecimal keeperId, String resultStackNumber, BigDecimal afterStackingId,
-              BigDecimal afterWarehouseId, BigDecimal afterBeforeStackingId, String resultRemark, List<Map<String, Object>> maps) {
+    public WmspRestackMakeResult createRestackMakeResult(BigDecimal keeperId,
+                                                        BigDecimal beforeLevel,
+                                                        BigDecimal afterStackingId,
+                                                        BigDecimal afterWarehouseId,
+                                                        BigDecimal afterBeforeStackingId,
+                                                        String resultRemark,
+                                                        List<Map<String, Object>> maps) {
         //初始化倒垛单
         WmspRestackMakeResult wmspRestackMakeResult=new WmspRestackMakeResult();
         //获得序号
         BigDecimal makeresultid =IDUtils.createIDYMDHMS( wmspRestackMakeResultMapper.selectMaxId());
-
         //主键赋值
         wmspRestackMakeResult.setResultId(makeresultid);
-        //倒垛单编号
-        wmspRestackMakeResult.setResultStackNumber(resultStackNumber);
+        //倒垛单层次
+        wmspRestackMakeResult.setBeforeLevel(beforeLevel);
+        //新增倒垛单编号
+        wmspRestackMakeResult.setResultStackNumber(DataChange.generateEightDigitsNumber("WDD",makeresultid.intValue()));
         //倒垛后垛位id
         wmspRestackMakeResult.setAfterStackingId(afterStackingId);
         //倒垛日期

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

@@ -44,15 +44,14 @@ public class WmspRestackMakeTypeResultServiceImpl extends BaseServiceImpl<WmspRe
     @Override
     public Integer createMakeTypeList(BigDecimal makeresultid, List<Map<String, Object>> maps) {
         Integer total=0;
-        for (int i=0;i<maps.size();i++){
-            Map<String,Object> map=new HashMap<>();
+        for (Map<String ,Object> map:maps){
             WmspRestackMakeTypeResult wmspRestackMakeTypeResult=new WmspRestackMakeTypeResult();
             //获得序列号
             BigDecimal seqCount = commonService.getSeqCount("seq__WMSP_RESTACK_MAKE_TYPE");
             //给主键赋值
-            wmspRestackMakeTypeResult.setMaterialTypeId(IDUtils.createIDYMDHMS(seqCount));
+            wmspRestackMakeTypeResult.setWmspRestackMakeTypeId(IDUtils.createIDYMDHMS(seqCount));
             //设置与类型的关联字段
-            wmspRestackMakeTypeResult.setWmspRestackMakeTypeId(new BigDecimal(map.get("materialCode").toString()));
+            wmspRestackMakeTypeResult.setMaterialTypeId(new BigDecimal(map.get("materialCode").toString()));
             //设置倒垛单ID
             wmspRestackMakeTypeResult.setWmspRestackMakeId(makeresultid);
             //累加总数量

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

@@ -711,7 +711,7 @@
   <select id="ExistWmspOutboundResult" parameterType="java.util.Map" resultType="int">
     select count(*)
     from WMSP_OUTBOUND_RESULT w_outbound
-    where (w_outbound.DELETED=0 and w_outbound.RESULT_STATUS =1) and w_outbound.BILL_LADING_ID=#{orderId} and w_outbound.MATERIAL_ID=#{materialId}
+    where w_outbound.DELETED=0  and w_outbound.BILL_LADING_ID=#{orderId} and w_outbound.MATERIAL_ID=#{materialId}
   </select>
 
   <select id="getOutBoundDetailedInfo" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
@@ -868,6 +868,11 @@
                        AND WOR.MATERIAL_ID = OOM.MATERIAL_ID
     WHERE WOR.RESULT_ID = #{resultId}
   </select>
+  <select id="getOutboundStatus" resultType="java.lang.Integer">
+    SELECT COUNT(*)
+    FROM WMSP_OUTBOUND_RESULT wor
+    WHERE wor.RESULT_STATUS = 1 AND wor.BILL_LADING_ID =#{orderId}
+  </select>
 
   <update id="updateGrid" parameterType="DECIMAL" >
     UPDATE WMSP_GRID_MATERIAL WGM

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

@@ -945,134 +945,76 @@
 
 <!--获取倒垛实绩Pc-->
   <select id="selectRestackForPc"  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",
-    WRMR.RESULT_MOVELIST_TIME "resultKeeperIssueTim",
-    RS.STACKING_NO "newStackingNo",
-    RS2.STACKING_NO "StackingNo",
-    RS.STACKING_ID "newStackingId",
-    RS2.STACKING_ID "StackingId",
-    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",
+    SELECT  distinct
+        wrme.RESULT_ID "resultId",
+        --            倒垛编号
+        wrme.RESULT_STACK_NUMBER "resultStackNumber",
+        --            倒垛单创建时间
+        wrme.INSERT_TIME "insertTime",
+        --             总件数
+        wrme.QUANTITY "quantity",
+        --             原层次
+        wrme.BEFORE_LEVEL "beforeLevel",
+        --            新垛位
+        rs.STACKING_NO "afterStackingNo",
+        --            原垛位
+        rs2.STACKING_NO "beforeStackingNo",
+        --            仓库名称
+        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
+    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=#{DistrubtionStatus} and wrme.DELETED=0 and wrme.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>
+    <if test="resultStackNumber != null">
+      and
+      <foreach collection="resultStackNumber" item="item" open="(" separator="or" close=")">
+        "resultStackNumber" like '%${item}%'
+      </foreach>
+    </if>
+    <if test="insertTime != null">
+      and
+      <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+        "insertTime" like '%${item}%'
+      </foreach>
+    </if>
+    <if test="quantity != null">
+      and
+      <foreach collection="quantity" item="item" open="(" separator="or" close=")">
+        "quantity" like '%${item}%'
+      </foreach>
+    </if>
+    <if test="beforeLevel != null">
+      and
+      <foreach collection="beforeLevel" item="item" open="(" separator="or" close=")">
+        "beforeLevel" like '%${item}%'
+      </foreach>
+    </if>
+    <if test="afterStackingNo != null">
+      and
+      <foreach collection="afterStackingNo" item="item" open="(" separator="or" close=")">
+        "afterStackingNo" like '%${item}%'
+      </foreach>
+    </if>
+    <if test="beforeStackingNo != null">
+      and
+      <foreach collection="beforeStackingNo" item="item" open="(" separator="or" close=")">
+        "beforeStackingNo" like '%${item}%'
+      </foreach>
+    </if>
+    <if test="warehouseName != null">
+      and
+      <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+        "warehouseName" like '%${item}%'
+      </foreach>
+    </if>
     </where>
     <include refid="orderByInsertTime"></include>
   </select>
@@ -1087,14 +1029,6 @@
       order by "insertTime" desc
     </if>
   </sql>
-  <!--  &lt;!&ndash;获取倒垛信息pc端&ndash;&gt;-->
-  <!--  <select id="selectRastackForPc" parameterType="java.lang.Integer" resultType="java.util.Map">-->
-  <!--    select WRMR.RESULT_STACK_NUMBER "restackNumber",-->
-  <!--           -->
-  <!--    from  WMSP_RESTACK_MAKE_RESULT WRMR-->
-  <!--    where WRMR.DISTRIBUTIONSTATUS=#{DistrubtionStatus}-->
-  <!--  </select>-->
-
   <!--根据倒垛实绩id查找倒垛信息  -->
   <select id="selectRestackInfoByResultId" parameterType="java.lang.Integer" resultType="java.util.LinkedHashMap">
     select
@@ -1368,4 +1302,89 @@
     WHERE RPG.STACKING_ID=#{stackingId} and  RPG.WAREHOUSE_ID=#{warehouseId} and RPG.GRID_GRADATION_NUMBER=#{gradationNumber}
       and RPG.GRID_SEQUENCE_NUMBER=#{sequenceNumber}
   </select>
+<!--  PC端展示已下发的倒垛实绩-->
+  <select id="selectRestackForPc2" 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",
+    --            当前下发的倒垛单的完成状态
+    wrme.RESULT_STATUS "resultStatus"
+
+    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
+    <where>
+      <if test="resultStackNumber != null">
+        and
+        <foreach collection="resultStackNumber" item="item" open="(" separator="or" close=")">
+          "resultStackNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultKeeperIssueTime != null">
+        and
+        <foreach collection="resultKeeperIssueTime" item="item" open="(" separator="or" close=")">
+          "resultKeeperIssueTime" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="quantity != null">
+        and
+        <foreach collection="quantity" item="item" open="(" separator="or" close=")">
+          "quantity" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="beforeLevel != null">
+        and
+        <foreach collection="beforeLevel" item="item" open="(" separator="or" close=")">
+          "beforeLevel" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="afterStackingNo != null">
+        and
+        <foreach collection="afterStackingNo" item="item" open="(" separator="or" close=")">
+          "afterStackingNo" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="beforeStackingNo != null">
+        and
+        <foreach collection="beforeStackingNo" item="item" open="(" separator="or" close=")">
+          "beforeStackingNo" 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="resultStatus != null">
+        and
+        <foreach collection="resultStatus" item="item" open="(" separator="or" close=")">
+          "resultStatus" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderByInsertTime"></include>
+  </select>
 </mapper>