adsdas

pom.xml

@@ -130,8 +130,8 @@
 <!--                        <param>WMSP_INBOUND_STACK_RESULT</param>-->
 <!--                        <param>WMSP_INBOUND_CORRECT_RESULT</param>-->
 <!--                        <param>WMSP_INBOUND_DRIVING_RESULT</param>-->
-                        <param>WMSP_INBOUND_SCAN_RESULT</param>
-
+<!--                        <param>WMSP_INBOUND_SCAN_RESULT</param>-->
+                            <param>RMS_PWAREHOUSE_GRID</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -524,7 +524,6 @@ public class WmspOutboundResultController extends BaseRESTfulController {
     @PostMapping("/deleteGridMaterial")
     public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode){
 
-
         //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表,判断是否入库
         List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(materialOnlyCode);
 
@@ -536,7 +535,6 @@ public class WmspOutboundResultController extends BaseRESTfulController {
             Map<String, Object> map1 = list.get(0);
             //创建出库实绩
             WmspOutboundResult wmspOutboundResult=wmspOutboundResultService.createOutboundResult(new BigDecimal(1),new BigDecimal(2));
-
             int status= wmspOutboundResultService.createOutboundScanResult(materialOnlyCode,new BigDecimal(1),wmspOutboundResult.getResultId(),(BigDecimal)map1.get("inboundResultId"),new BigDecimal(1));
         }
         if(result == -1){

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

@@ -0,0 +1,66 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.service.impl.PlatformWarehouseServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2022-07-18 17:59
+ */
+
+
+@RestController
+@RequestMapping("${api.version}/platformWarehouse")
+public class platformWarehouseController extends BaseRESTfulController {
+
+    //该接口针对内转钢材到异地库的站台入库和出库做设计
+    @Autowired
+    PlatformWarehouseServiceImpl platformWarehouseService;
+
+
+    @ApiOperation("站台入库")
+    @PostMapping("platformInbound")
+    public RESTfulResult platformInbound(@RequestBody Map<String,Object> map){
+        int i = 0;
+        try {
+            i = platformWarehouseService.platformInboundOrOut(map);
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
+        if(i == -1){
+            return failed("系统未找到仓库,请联系管理员添加");
+        }else if(i == -2){
+            return failed("关闭订单失败,请联系管理员");
+        }else if(i == -3){
+            return failed("卸货失败");
+        }else if(i == -5){
+            return failed("已入库,请勿重复扫描");
+        }
+        return success(i);
+    }
+
+
+    @ApiOperation("事后出库")
+    @PostMapping("afterInwardOutbound")
+    public RESTfulResult afterInwardOutbound(@RequestBody Map<String,Object> map){
+        int i = 0;
+        try {
+            i = platformWarehouseService.afterInwardOutbound(map);
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
+        return success(i);
+    }
+
+
+}

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.feign;
+
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+@FeignClient(value = "dil-oms-dev", url = "${openfeign.OmsFeign.url}")
+public interface OmsFeign {
+
+    @PostMapping("api/v1/oms/utilscontroller/closeSteelOrderType4")
+    int closeSteelOrderType4(@RequestParam BigDecimal orderId);
+
+    @PostMapping("api/v1/oms/omstrainorders/generateOmstrain")
+    int generateOmstrain(@RequestBody(required = false) Map<String,Object> map);
+}

src/main/java/com/steerinfo/dil/feign/TmstruckFeign.java

@@ -20,4 +20,7 @@ public interface TmstruckFeign {
 
     @PostMapping("/api/v1/truckTms/tmstruckloadresults/addSaleLoadResult")
     Map<String, Object> addSaleLoadResult(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/truckTms/tmstruckunloadresult/updateUnloadResult")
+    Map<String,Object> updateUnloadResult(Map<String, Object> map);
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.mapper;
 
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.framework.mapper.IBaseMapper;
+import feign.Param;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,7 +17,9 @@ public interface RmsPwarehouseGridMapper extends IBaseMapper<RmsPwarehouseGrid,
     int insertSelective(RmsPwarehouseGrid rmsPwarehouseGrid);
     //更新成品仓库网格表
     int updateByPrimaryKeySelective(RmsPwarehouseGrid rmsPwarehouseGrid);
+
     BigDecimal selectMaxId();
+
     BigDecimal selectGridId(Map<String, Object> map);
 
     List<Map<String, Object>> getStackingId(Map<String,Object> map);
@@ -29,4 +32,14 @@ public interface RmsPwarehouseGridMapper extends IBaseMapper<RmsPwarehouseGrid,
 
     List<Map<String,Object>> getNullStackingId(Map<String,Object>map);
 
+    List<Integer> getWarehouseIds(Map<String, Object> map);
+
+    List<BigDecimal> getMaterialSteelIds(BigDecimal orderId);
+
+    List<Map<String,Object>> getOrderMaterialList(BigDecimal orderId);
+
+    BigDecimal selectGridByOrderId(BigDecimal orderId);
+
+
+    Map<String,Object> getGmNum(@Param("orderId") BigDecimal orderId, @Param("materialId") BigDecimal materialId);
 }

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

@@ -68,4 +68,7 @@ public interface WmspGridMaterialMapper extends IBaseMapper<WmspGridMaterial, Bi
   List<Map<String, Object>> getGridMaterialAgeList(Map<String,Object> mapVal);
 
   List<Map<String, Object>> getMaterialIdesNoTime(String warehouseId, String materialCode, String materialSpecification, String materialModel, Integer status);
+
+  int updateWgmByOrderId(BigDecimal orderId);
+
 }

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

@@ -98,4 +98,6 @@ public interface WmspOutboundResultMapper extends IBaseMapper<WmspOutboundResult
 
     BigDecimal getLoadId(Map<String, Object> mapVal);
 
+    BigDecimal getSteelOrderType(BigDecimal orderId);
+
 }

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

@@ -10,37 +10,37 @@ import java.util.Date;
 @ApiModel(value="成品仓库网格")
 public class RmsPwarehouseGrid implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(GRID_ID,DECIMAL,38)
+     * 主键ID(GRID_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal gridId;
 
     /**
-     * 仓库ID(WAREHOUSE_ID,DECIMAL,38)
+     * 仓库ID(WAREHOUSE_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="仓库ID",required=false)
     private BigDecimal warehouseId;
 
     /**
-     * 月台ID(PLATFORM_ID,DECIMAL,38)
+     * 月台ID(PLATFORM_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="月台ID",required=false)
     private BigDecimal platformId;
 
     /**
-     * 垛位ID(STACKING_ID,DECIMAL,38)
+     * 垛位ID(STACKING_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="垛位ID",required=false)
     private BigDecimal stackingId;
 
     /**
-     * 层次号(GRID_GRADATION_NUMBER,DECIMAL,38)
+     * 层次号(GRID_GRADATION_NUMBER,DECIMAL,0)
      */
     @ApiModelProperty(value="层次号",required=false)
     private BigDecimal gridGradationNumber;
 
     /**
-     * 层序号(GRID_SEQUENCE_NUMBER,DECIMAL,38)
+     * 层序号(GRID_SEQUENCE_NUMBER,DECIMAL,0)
      */
     @ApiModelProperty(value="层序号",required=false)
     private BigDecimal gridSequenceNumber;
@@ -75,6 +75,12 @@ public class RmsPwarehouseGrid implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 默认是空，值为1则是内转钢材到异地库(GRID_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="默认是空，值为1则是内转钢材到异地库",required=false)
+    private BigDecimal gridType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -175,6 +181,14 @@ public class RmsPwarehouseGrid implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getGridType() {
+        return gridType;
+    }
+
+    public void setGridType(BigDecimal gridType) {
+        this.gridType = gridType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -192,6 +206,7 @@ public class RmsPwarehouseGrid implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", gridType=").append(gridType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.service;
+
+import java.util.Map;
+
+public interface IPlatformWarehouseService {
+
+
+    int platformInboundOrOut(Map<String, Object> map) throws Exception;
+
+    int afterInwardOutbound(Map<String, Object> map) throws Exception;
+}

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

@@ -0,0 +1,230 @@
+package com.steerinfo.dil.service.impl;
+
+
+import com.steerinfo.dil.feign.OmsFeign;
+import com.steerinfo.dil.feign.TmstruckFeign;
+import com.steerinfo.dil.mapper.RmsPwarehouseGridMapper;
+import com.steerinfo.dil.mapper.WmspGridMaterialMapper;
+import com.steerinfo.dil.model.RmsPwarehouseGrid;
+import com.steerinfo.dil.model.WmspGridMaterial;
+import com.steerinfo.dil.service.IPlatformWarehouseService;
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.xml.crypto.Data;
+import java.math.BigDecimal;
+import java.rmi.server.ExportException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class PlatformWarehouseServiceImpl implements IPlatformWarehouseService {
+
+    @Autowired
+    RmsPwarehouseGridMapper rmsPwarehouseGridMapper;
+
+    @Autowired
+    WmspGridMaterialMapper wmspGridMaterialMapper;
+
+    @Autowired
+    OmsFeign omsFeign;
+
+    @Autowired
+    TmstruckFeign tmstruckFeign;
+
+    @Override
+    @Transactional
+    public int platformInboundOrOut(Map<String, Object> map) throws Exception {
+        int i = 0;
+        //1.首先判断有没有填写车皮号,
+        String wagonNo = map.get("wagonNo").toString();
+        //根据发站名称,去仓库表查询仓库。
+        List<Integer> warehouseIds = rmsPwarehouseGridMapper.getWarehouseIds(map);
+        if(warehouseIds.size() == 0){
+            throw new Exception("仓库不存在,请联系管理员添加!");
+        }
+        BigDecimal warehouseId = DataChange.dataToBigDecimal(warehouseIds.get(0));
+        map.put("warehouseId",warehouseId);
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        ////根据运输ID去网格表查询是否有没有
+
+        //根据运输订单ID,去查询运输订单子表的物资
+        List<Map<String,Object>> orderMaterialList = rmsPwarehouseGridMapper.getOrderMaterialList(orderId);
+        map.put("orderMaterialList",orderMaterialList);
+        //2.做判断,是否填写车皮号
+        if(wagonNo != null && !"".equals(wagonNo) && !"null".equals(wagonNo)){
+            //2.1 如果填写了车皮号,则代表入库的同时出库,出库则需要将火车和汽车绑定起来,这是最重要的一点,其他不变
+            try {
+                inwardInbound(map);
+                afterInwardOutbound(map);
+            } catch (Exception e) {
+                throw new Exception(e.getMessage());
+            }
+            return i;
+        }else{
+            //单纯入库,关闭运输订单,生成卸货实绩,生成网格和实时库存
+            try {
+                inwardInbound(map);
+            } catch (Exception e) {
+                throw new Exception(e.getMessage());
+            }
+            return i;
+        }
+    }
+
+    //public int inwardOutBound(Map<String,Object>map){
+    //    //如果填写了车号,则说明入库之后需要出库
+    //    int i;
+    //    RmsPwarehouseGrid rmsPwarehouseGrid = new RmsPwarehouseGrid();
+    //    BigDecimal warehouseId = DataChange.dataToBigDecimal(map.get("warehouseId"));
+    //    BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+    //    //获取运输订单ID当做垛位
+    //    //根据运输订单ID,去查询运输订单子表的物资
+    //    List<Map<String,Object>> orderMaterialList = (List<Map<String, Object>>) map.get("orderMaterialList");
+    //    //卸货
+    //    for(Map<String,Object> orderMaterialMap:orderMaterialList){
+    //        map.put("materialId",orderMaterialMap.get("materialId"));
+    //        map.put("warehouseId",warehouseId);
+    //        Map<String, Object> returnMap = tmstruckFeign.updateUnloadResult(map);
+    //        String code = (String) returnMap.get("code");
+    //        if("200".equals(code)){
+    //            System.out.println("新增卸车成功：" + map.get("orderId"));
+    //        }else {
+    //            return -3;
+    //        }
+    //    }
+    //    //设置主键ID
+    //    //根据运输订单号去查询网格
+    //    BigDecimal gridId = null;
+    //    if(rmsPwarehouseGridMapper.selectGridByOrderId(orderId) != null){
+    //        gridId = rmsPwarehouseGridMapper.selectGridByOrderId(orderId);
+    //    }else{
+    //        gridId = new BigDecimal(rmsPwarehouseGridMapper.selectMaxId().intValue() + 1);
+    //    }
+    //    rmsPwarehouseGrid.setGridId(gridId);
+    //    rmsPwarehouseGrid.setWarehouseId(warehouseId);
+    //    rmsPwarehouseGrid.setStackingId(orderId);
+    //    rmsPwarehouseGrid.setGridType(new BigDecimal(1));
+    //    rmsPwarehouseGrid.setInsertUsername(map.get("personnelSsoId").toString());
+    //    if (map.get("remark") != null){
+    //        rmsPwarehouseGrid.setInsertUpdateRemark(map.get("remark").toString());
+    //    }
+    //    rmsPwarehouseGrid.setInsertTime(new Date());
+    //    for(Map<String,Object> orderMaterialMap:orderMaterialList){
+    //        WmspGridMaterial wmspGridMaterial = new WmspGridMaterial();
+    //        //设置主键
+    //        wmspGridMaterial.setGmId(wmspGridMaterialMapper.getCount());
+    //        //将钢材物资ID
+    //        wmspGridMaterial.setGridId(gridId);
+    //        wmspGridMaterial.setMaterialId(DataChange.dataToBigDecimal(orderMaterialMap.get("materialId")));
+    //        wmspGridMaterial.setDeleted(new BigDecimal(1));
+    //        wmspGridMaterial.setGmNumber(DataChange.dataToBigDecimal(orderMaterialMap.get("materialNum")));
+    //        wmspGridMaterial.setInsertTime(new Date());
+    //        wmspGridMaterial.setInsertUsername(map.get("personnelSsoId").toString());
+    //        wmspGridMaterialMapper.insertSelective(wmspGridMaterial);
+    //    }
+    //    rmsPwarehouseGridMapper.insertSelective(rmsPwarehouseGrid);
+    //    //入库之后关闭运输订单
+    //    try {
+    //        System.out.println(orderId);
+    //        i = omsFeign.closeSteelOrderType4(orderId);
+    //
+    //    } catch (Exception e) {
+    //        System.out.println(e.getMessage());
+    //        return -2;
+    //    }
+    //    return 1;
+    //}
+
+
+    //重新写一个方法,抽出来单纯入库
+    @Transactional
+    public int inwardInbound(Map<String,Object>map) throws Exception {
+        //2.2 如果没有填写车皮号,则代表只入库
+        //3 将运单当做垛位,与网格表关联起来
+        int i ;
+        RmsPwarehouseGrid rmsPwarehouseGrid = new RmsPwarehouseGrid();
+        BigDecimal warehouseId = DataChange.dataToBigDecimal(map.get("warehouseId"));
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        //获取运输订单ID当做垛位
+        //根据运输订单ID,去查询运输订单子表的物资
+        List<Map<String,Object>> orderMaterialList = (List<Map<String, Object>>) map.get("orderMaterialList");
+        //卸货
+        for(Map<String,Object> orderMaterialMap:orderMaterialList){
+            map.put("materialId",orderMaterialMap.get("materialId"));
+            map.put("warehouseId",warehouseId);
+            Map<String, Object> returnMap = tmstruckFeign.updateUnloadResult(map);
+            String code = (String) returnMap.get("code");
+            if("200".equals(code)){
+                System.out.println("新增卸车成功：" + map.get("orderId"));
+            }else {
+               throw new Exception("卸车失败,请联系管理员");
+            }
+        }
+        //根据运输订单ID,去查询该车所装的物资钢材ID列表,乱尺不存在扫描实绩,故不查了改查物资ID
+        //List<BigDecimal> materialSteelIds = rmsPwarehouseGridMapper.getMaterialSteelIds(orderId);
+        //设置主键ID
+        BigDecimal gridId = null;
+        if(rmsPwarehouseGridMapper.selectGridByOrderId(orderId) != null){
+            gridId = rmsPwarehouseGridMapper.selectGridByOrderId(orderId);
+        }else{
+            gridId = new BigDecimal(rmsPwarehouseGridMapper.selectMaxId().intValue() + 1);
+        }
+        rmsPwarehouseGrid.setGridId(gridId);
+        rmsPwarehouseGrid.setWarehouseId(warehouseId);
+        rmsPwarehouseGrid.setStackingId(orderId);
+        rmsPwarehouseGrid.setGridType(new BigDecimal(1));
+        rmsPwarehouseGrid.setInsertUsername(map.get("personnelSsoId").toString());
+        rmsPwarehouseGrid.setInsertTime(new Date());
+        if (map.get("remark") != null){
+            rmsPwarehouseGrid.setInsertUpdateRemark(map.get("remark").toString());
+        }
+        if(rmsPwarehouseGridMapper.selectGridByOrderId(orderId) != null){
+            rmsPwarehouseGridMapper.updateByPrimaryKeySelective(rmsPwarehouseGrid);
+        }else{
+            for(Map<String,Object> orderMaterialMap:orderMaterialList){
+                WmspGridMaterial wmspGridMaterial = new WmspGridMaterial();
+                //设置主键
+                wmspGridMaterial.setGmId(wmspGridMaterialMapper.getCount());
+                //将钢材物资ID
+                wmspGridMaterial.setGridId(gridId);
+                wmspGridMaterial.setMaterialId(DataChange.dataToBigDecimal(orderMaterialMap.get("materialId")));
+                wmspGridMaterial.setDeleted(new BigDecimal(0));
+                wmspGridMaterial.setGmNumber(DataChange.dataToBigDecimal(orderMaterialMap.get("materialNum")));
+                wmspGridMaterial.setInsertTime(new Date());
+                wmspGridMaterial.setInsertUsername(map.get("personnelSsoId").toString());
+                wmspGridMaterialMapper.insertSelective(wmspGridMaterial);
+            }
+            rmsPwarehouseGridMapper.insertSelective(rmsPwarehouseGrid);
+        }
+        //入库之后关闭运输订单
+        try {
+            System.out.println(orderId);
+            i = omsFeign.closeSteelOrderType4(orderId);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            throw new Exception("关闭订单失败");
+        }
+        return 1;
+    }
+
+
+    @Override
+    @Transactional
+    public int afterInwardOutbound(Map<String, Object> map) throws Exception {
+        //需要参数 运输订单ID,人员ssoId
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        //根据运输订单ID,出库
+        int i = wmspGridMaterialMapper.updateWgmByOrderId(orderId);
+        //同步生成火运实绩
+        try {
+            omsFeign.generateOmstrain(map);
+        } catch (Exception e) {
+            throw new Exception("关联火运失败,请联系管理员");
+        }
+        return i;
+    }
+}

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

@@ -556,6 +556,8 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         }
         //获取运输订单ID
         BigDecimal orderId = DataChange.dataToBigDecimal(mapVal.get("orderId"));
+        //根据运输订单ID查询订单类型
+        BigDecimal orderType = wmspOutboundResultMapper.getSteelOrderType(orderId);
         //根据运输订单ID即提货单ID查询是否生成出库单ID
         /**根据运输订单ID和物资id查询出库单(没有逻辑删除）
          *若orderNum大于0,则不是第一次扫描，已经新增出库单,返回详情信息
@@ -564,7 +566,7 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         int orderNum = ExistWmspOutboundResult(mapVal);
         if(orderNum == 0){
             //创建出货单
-            WmspOutboundResult wmspOutboundResult=createOutboundResult(orderId,new BigDecimal(1));
+            WmspOutboundResult wmspOutboundResult=createOutboundResult(orderId,orderType);
             if (wmspOutboundResult!=null){
                 /**根据运输订单号，查询出该订单还没有装货的物资*/
                 List<Map<String,Object>> orderList = getMaterial(orderId.intValue());

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.33.165:1521:ilsdbstd
-    password: Dil123789
-    username: dil
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: root123
+    username: DAGANG
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-wms-api
@@ -14,8 +14,9 @@ openfeign:
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+  OmsFeign:
+    url: ${OMSFEIGN_URL:localhost:8016}
 
 #图片上传配置
 piction:
@@ -26,5 +27,5 @@ piction:
 
 
 server:
-  port: 8093
+  port: 8012
 

src/main/resources/application-prod.yml

@@ -15,6 +15,8 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+  OmsFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
 #图片上传配置
 piction:
   # path: /usr/share/nginx/html/image

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

@@ -7,30 +7,32 @@
     <result column="PLATFORM_ID" jdbcType="DECIMAL" property="platformId" />
     <result column="STACKING_ID" jdbcType="DECIMAL" property="stackingId" />
     <result column="GRID_GRADATION_NUMBER" jdbcType="DECIMAL" property="gridGradationNumber" />
+    <result column="GRID_SEQUENCE_NUMBER" jdbcType="DECIMAL" property="gridSequenceNumber" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
     <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-    <result column="GRID_SEQUENCE_NUMBER" jdbcType="DECIMAL" property="gridSequenceNumber" />
+    <result column="GRID_TYPE" jdbcType="DECIMAL" property="gridType" />
   </resultMap>
   <sql id="columns">
-    GRID_ID, WAREHOUSE_ID, PLATFORM_ID, STACKING_ID, GRID_GRADATION_NUMBER, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, GRID_SEQUENCE_NUMBER
+    GRID_ID, WAREHOUSE_ID, PLATFORM_ID, STACKING_ID, GRID_GRADATION_NUMBER, GRID_SEQUENCE_NUMBER,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    GRID_TYPE
   </sql>
   <sql id="columns_alias">
-    t.GRID_ID, t.WAREHOUSE_ID, t.PLATFORM_ID, t.STACKING_ID, t.GRID_GRADATION_NUMBER, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.GRID_SEQUENCE_NUMBER
+    t.GRID_ID, t.WAREHOUSE_ID, t.PLATFORM_ID, t.STACKING_ID, t.GRID_GRADATION_NUMBER,
+    t.GRID_SEQUENCE_NUMBER, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.GRID_TYPE
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM RMS_PWAREHOUSE_GRID
+    SELECT <include refid="columns" /> FROM RMS_PWAREHOUSE_GRID
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM RMS_PWAREHOUSE_GRID t
+    SELECT <include refid="columns_alias" /> FROM RMS_PWAREHOUSE_GRID t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="gridId != null">
         and GRID_ID = #{gridId}
       </if>
@@ -46,6 +48,9 @@
       <if test="gridGradationNumber != null">
         and GRID_GRADATION_NUMBER = #{gridGradationNumber}
       </if>
+      <if test="gridSequenceNumber != null">
+        and GRID_SEQUENCE_NUMBER = #{gridSequenceNumber}
+      </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME = #{insertUsername}
       </if>
@@ -61,13 +66,13 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
-      <if test="gridSequenceNumber != null">
-        and GRID_SEQUENCE_NUMBER = #{gridSequenceNumber}
+      <if test="gridType != null">
+        and GRID_TYPE = #{gridType}
       </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="gridId != null">
         and GRID_ID = #{gridId}
       </if>
@@ -83,6 +88,9 @@
       <if test="gridGradationNumber != null">
         and GRID_GRADATION_NUMBER = #{gridGradationNumber}
       </if>
+      <if test="gridSequenceNumber != null">
+        and GRID_SEQUENCE_NUMBER = #{gridSequenceNumber}
+      </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME LIKE '%${insertUsername}%'
       </if>
@@ -98,55 +106,63 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
-      <if test="gridSequenceNumber != null">
-        and GRID_SEQUENCE_NUMBER = #{gridSequenceNumber}
+      <if test="gridType != null">
+        and GRID_TYPE = #{gridType}
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from RMS_PWAREHOUSE_GRID
     where GRID_ID = #{gridId,jdbcType=DECIMAL}
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from RMS_PWAREHOUSE_GRID
     where 1!=1
-      <if test="platformId != null">
-        or PLATFORM_ID = #{platformId}
-      </if>
-      <if test="stackingId != null">
-        or STACKING_ID = #{stackingId}
-      </if>
-      <if test="gridGradationNumber != null">
-        or GRID_GRADATION_NUMBER = #{gridGradationNumber}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="gridSequenceNumber != null">
-        or GRID_SEQUENCE_NUMBER = #{gridSequenceNumber}
-      </if>
+    <if test="warehouseId != null">
+      or WAREHOUSE_ID = #{warehouseId}
+    </if>
+    <if test="platformId != null">
+      or PLATFORM_ID = #{platformId}
+    </if>
+    <if test="stackingId != null">
+      or STACKING_ID = #{stackingId}
+    </if>
+    <if test="gridGradationNumber != null">
+      or GRID_GRADATION_NUMBER = #{gridGradationNumber}
+    </if>
+    <if test="gridSequenceNumber != null">
+      or GRID_SEQUENCE_NUMBER = #{gridSequenceNumber}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="gridType != null">
+      or GRID_TYPE = #{gridType}
+    </if>
   </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsPwarehouseGrid" keyProperty="gridId">
-    insert into RMS_PWAREHOUSE_GRID (GRID_ID, WAREHOUSE_ID, PLATFORM_ID, 
-      STACKING_ID, GRID_GRADATION_NUMBER, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, GRID_SEQUENCE_NUMBER)
-    values (#{gridId,jdbcType=DECIMAL}, #{warehouseId,jdbcType=DECIMAL}, #{platformId,jdbcType=DECIMAL}, 
-      #{stackingId,jdbcType=DECIMAL}, #{gridGradationNumber,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{gridSequenceNumber,jdbcType=DECIMAL})
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsPwarehouseGrid">
+    insert into RMS_PWAREHOUSE_GRID (GRID_ID, WAREHOUSE_ID, PLATFORM_ID,
+                                     STACKING_ID, GRID_GRADATION_NUMBER, GRID_SEQUENCE_NUMBER,
+                                     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                     UPDATE_TIME, INSERT_UPDATE_REMARK, GRID_TYPE
+    )
+    values (#{gridId,jdbcType=DECIMAL}, #{warehouseId,jdbcType=DECIMAL}, #{platformId,jdbcType=DECIMAL},
+            #{stackingId,jdbcType=DECIMAL}, #{gridGradationNumber,jdbcType=DECIMAL}, #{gridSequenceNumber,jdbcType=DECIMAL},
+            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{gridType,jdbcType=DECIMAL}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsPwarehouseGrid">
     insert into RMS_PWAREHOUSE_GRID
@@ -166,6 +182,9 @@
       <if test="gridGradationNumber != null">
         GRID_GRADATION_NUMBER,
       </if>
+      <if test="gridSequenceNumber != null">
+        GRID_SEQUENCE_NUMBER,
+      </if>
       <if test="insertUsername != null">
         INSERT_USERNAME,
       </if>
@@ -181,8 +200,8 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
-      <if test="gridSequenceNumber != null">
-        GRID_SEQUENCE_NUMBER,
+      <if test="gridType != null">
+        GRID_TYPE,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -201,6 +220,9 @@
       <if test="gridGradationNumber != null">
         #{gridGradationNumber,jdbcType=DECIMAL},
       </if>
+      <if test="gridSequenceNumber != null">
+        #{gridSequenceNumber,jdbcType=DECIMAL},
+      </if>
       <if test="insertUsername != null">
         #{insertUsername,jdbcType=VARCHAR},
       </if>
@@ -216,23 +238,24 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
-      <if test="gridSequenceNumber != null">
-        #{gridSequenceNumber,jdbcType=DECIMAL},
+      <if test="gridType != null">
+        #{gridType,jdbcType=DECIMAL},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsPwarehouseGrid">
     update RMS_PWAREHOUSE_GRID
     set WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
-      PLATFORM_ID = #{platformId,jdbcType=DECIMAL},
-      STACKING_ID = #{stackingId,jdbcType=DECIMAL},
-      GRID_GRADATION_NUMBER = #{gridGradationNumber,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},
-      GRID_SEQUENCE_NUMBER = #{gridSequenceNumber,jdbcType=DECIMAL}
+        PLATFORM_ID = #{platformId,jdbcType=DECIMAL},
+        STACKING_ID = #{stackingId,jdbcType=DECIMAL},
+        GRID_GRADATION_NUMBER = #{gridGradationNumber,jdbcType=DECIMAL},
+        GRID_SEQUENCE_NUMBER = #{gridSequenceNumber,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},
+        GRID_TYPE = #{gridType,jdbcType=DECIMAL}
     where GRID_ID = #{gridId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsPwarehouseGrid">
@@ -250,6 +273,9 @@
       <if test="gridGradationNumber != null">
         GRID_GRADATION_NUMBER = #{gridGradationNumber,jdbcType=DECIMAL},
       </if>
+      <if test="gridSequenceNumber != null">
+        GRID_SEQUENCE_NUMBER = #{gridSequenceNumber,jdbcType=DECIMAL},
+      </if>
       <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
       </if>
@@ -265,98 +291,102 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
-      <if test="gridSequenceNumber != null">
-        GRID_SEQUENCE_NUMBER = #{gridSequenceNumber,jdbcType=DECIMAL},
+      <if test="gridType != null">
+        GRID_TYPE = #{gridType,jdbcType=DECIMAL},
       </if>
     </set>
     where GRID_ID = #{gridId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
     where GRID_ID = #{gridId,jdbcType=DECIMAL}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into RMS_PWAREHOUSE_GRID 
-      (GRID_ID, 
-      WAREHOUSE_ID, PLATFORM_ID, STACKING_ID, 
-      GRID_GRADATION_NUMBER, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      GRID_SEQUENCE_NUMBER)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.gridId,jdbcType=DECIMAL}, 
-      #{item.warehouseId,jdbcType=DECIMAL}, #{item.platformId,jdbcType=DECIMAL}, #{item.stackingId,jdbcType=DECIMAL}, 
-      #{item.gridGradationNumber,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.gridSequenceNumber,jdbcType=DECIMAL} from dual  
-   </foreach> )
+    insert into RMS_PWAREHOUSE_GRID
+    (GRID_ID,
+    WAREHOUSE_ID, PLATFORM_ID, STACKING_ID,
+    GRID_GRADATION_NUMBER, GRID_SEQUENCE_NUMBER,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, GRID_TYPE)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.gridId,jdbcType=DECIMAL},
+    #{item.warehouseId,jdbcType=DECIMAL}, #{item.platformId,jdbcType=DECIMAL}, #{item.stackingId,jdbcType=DECIMAL},
+    #{item.gridGradationNumber,jdbcType=DECIMAL}, #{item.gridSequenceNumber,jdbcType=DECIMAL},
+    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.gridType,jdbcType=DECIMAL} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_PWAREHOUSE_GRID
-     set
-       GRID_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.gridId,jdbcType=DECIMAL}
-       </foreach>
-       ,WAREHOUSE_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.warehouseId,jdbcType=DECIMAL}
-       </foreach>
-       ,PLATFORM_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.platformId,jdbcType=DECIMAL}
-       </foreach>
-       ,STACKING_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.stackingId,jdbcType=DECIMAL}
-       </foreach>
-       ,GRID_GRADATION_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.gridGradationNumber,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,GRID_SEQUENCE_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GRID_ID" close="end">
-          when #{item.gridId,jdbcType=DECIMAL} then #{item.gridSequenceNumber,jdbcType=DECIMAL}
-       </foreach>
-     where GRID_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.gridId,jdbcType=DECIMAL}
-     </foreach> 
+    update RMS_PWAREHOUSE_GRID
+    set
+    GRID_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.gridId,jdbcType=DECIMAL}
+    </foreach>
+    ,WAREHOUSE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.warehouseId,jdbcType=DECIMAL}
+    </foreach>
+    ,PLATFORM_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.platformId,jdbcType=DECIMAL}
+    </foreach>
+    ,STACKING_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.stackingId,jdbcType=DECIMAL}
+    </foreach>
+    ,GRID_GRADATION_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.gridGradationNumber,jdbcType=DECIMAL}
+    </foreach>
+    ,GRID_SEQUENCE_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.gridSequenceNumber,jdbcType=DECIMAL}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,GRID_TYPE=
+    <foreach close="end" collection="list" index="index" item="item" open="case GRID_ID" separator=" ">
+      when #{item.gridId,jdbcType=DECIMAL} then #{item.gridType,jdbcType=DECIMAL}
+    </foreach>
+    where GRID_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.gridId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from RMS_PWAREHOUSE_GRID
-    where GRID_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    where GRID_ID in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -431,4 +461,37 @@
         where rpg.warehouse_id = #{warehouseId}
         order by rs.stacking_sequence
   </select>
+  <select id="getWarehouseIds" resultType="java.lang.Integer">
+    SELECT RW.WAREHOUSE_ID FROM RMS_WAREHOUSE RW
+    WHERE
+    RW.DELETED = 0
+    AND RW.WAREHOUSE_NAME = #{sendStation}
+  </select>
+  <select id="getMaterialSteelIds" resultType="java.math.BigDecimal" parameterType="decimal">
+    SELECT WIR.MATERIAL_ID FROM WMSP_OUTBOUND_RESULT WOR
+    LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM
+    ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+    LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT WOSR
+    ON WOSR.RESULT_MATERIAL_ID = WORM.RESULT_MATERIAL_ID
+    LEFT JOIN WMSP_INBOUND_RESULT WIR
+    ON WIR.INBOUND_ID = WOSR.INBOUND_RESULT_ID
+    WHERE WOR.BILL_LADING_ID = #{orderId}
+  </select>
+    <select id="getOrderMaterialList" resultType="java.util.Map" parameterType="decimal">
+      SELECT oom.MATERIAL_ID "materialId",OOM.ORDER_MATERIAL_NUMBER "materialNum" FROM OMSTRUCK_ORDER_MATERIAL OOM
+      WHERE OOM.ORDER_ID = #{materialId}
+    </select>
+  <select id="selectGridByOrderId" resultType="decimal" parameterType="decimal">
+      SELECT RPG.GRID_ID FROM RMS_PWAREHOUSE_GRID RPG
+      WHERE
+      RPG.GRID_TYPE = 1
+      AND RPG.STACKING_ID = #{orderId}
+  </select>
+  <select id="getGmNum" resultType="java.util.Map" >
+      SELECT WGM.GM_NUMBER "gmNum",WGM.GM_ID  "gmId" FROM RMS_PWAREHOUSE_GRID RPG
+      LEFT JOIN WMSP_GRID_MATERIAL WGM
+      ON WGM.GRID_ID = RPG.GRID_ID
+      WHERE RPG.STACKING_ID = #{orderId}
+            and WGM.MATERIAL_ID = #{materialId}
+  </select>
 </mapper>

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

@@ -755,8 +755,14 @@
     update WMSP_GRID_MATERIAL WGM set WGM.DELETED = 1,UPDATE_TIME = #{updateTime}
     where WGM.MATERIAL_ID = #{materialSteelId}
   </update>
-  
- <select id="getMaterialId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    <update id="updateWgmByOrderId" parameterType="decimal">
+      UPDATE WMSP_GRID_MATERIAL WGM
+      SET WGM.DELETED = 1
+      WHERE
+          WGM.GRID_ID = ( SELECT RPG.GRID_ID FROM RMS_PWAREHOUSE_GRID RPG WHERE RPG.STACKING_ID = #{ orderId } )
+    </update>
+
+    <select id="getMaterialId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
    select distinct
         rm.MATERIAL_ID "materialId"
         from RMS_MATERIAL rm

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

@@ -1207,5 +1207,9 @@
       SELECT RP.PERSONNEL_ID FROM RMS_PERSONNEL RP
       WHERE RP.PERSONNEL_SSO_ID = #{userId}
   </select>
+  <select id="getSteelOrderType" resultType="java.math.BigDecimal" parameterType="decimal">
+      SELECT OO.ORDER_TYPE FROM OMSTRUCK_ORDER OO
+      WHERE OO.ORDER_ID = #{orderId}
+  </select>
 
 </mapper>