Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

# Conflicts:
#	src/main/java/com/steerinfo/dil/controller/UniversalController.java

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -108,7 +108,7 @@ public class LogAspect {
                 //记录正常日志
                 log.info("方法返回：" + JSON.toJSONString(result));
                 log.info("执行时间（ms）："+exeCost);
-                log.info("执行===" + methodName + "===结束");
+                log.info("执行===" + methodName + "===成功");
                 //记录到数据库
                 List<LogResult> logResults=new ArrayList<>();
                 for(int i=0 ; i<foreignKeys.length ; i++){
@@ -129,9 +129,9 @@ public class LogAspect {
                 logResultMapper.batchInsert(logResults);
             }else{
                 //记录失败日志
-                log.error("方法返回：" + JSON.toJSONString(result));
-                log.error("执行时间（ms）："+exeCost);
-                log.error("执行===" + methodName + "===结束");
+                log.info("方法返回：" + JSON.toJSONString(result));
+                log.info("执行时间（ms）："+exeCost);
+                log.info("执行===" + methodName + "===失败");
             }
         }catch (Exception e){
             //记录错误日志

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -13,8 +13,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
 
 @Component
 public class RequestFilter implements Filter {
@@ -26,47 +24,56 @@ public class RequestFilter implements Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
        try{
-            HttpServletRequest httpRequest = (HttpServletRequest)request;
-            //获取参数，并校验
-            Cookie[] cookies = httpRequest.getCookies();
-            String userId = null;
-            String userName = null;
-            //获取cookie用户数据
-            for (Cookie cookie : cookies) {
-                if (userId==null && cookie.getName().equals("userId")) {
-                    userId = cookie.getValue();
-                }else if(userName==null && cookie.getName().equals("userName")){
-                    userName = URLDecoder.decode(cookie.getValue(),"utf-8");
-                }else if(userId!=null && userName!=null){
-                    //都查到了，退出
-                    break;
-                }
-            }
-            httpRequest.setAttribute("userId",userId);
-            httpRequest.setAttribute("userName", userName);
-            //获取RequestBody数据
-            BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), "UTF-8"));
-            StringBuilder strBuilder = new StringBuilder();
-            String inputStr;
-            while ((inputStr = streamReader.readLine()) != null) {
-                strBuilder.append(inputStr);
-            }
-            if(strBuilder!=null && !"".equals(strBuilder.toString())){
-                //有请求体则写入userId和userName，保存
-                JSONObject params = JSONObject.parseObject(strBuilder.toString());
-                params.put("userId",userId);
-                params.put("userName",userName);
-                //将新的RequestBody写入新的请求对象保存
-                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
-                chain.doFilter(requestWrapper, response);
-            }else{
-                chain.doFilter(request, response);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error(e.getStackTrace());
-            chain.doFilter(request, response);
-        }
+           HttpServletRequest httpRequest = (HttpServletRequest) request;
+           //获取参数，并校验
+           Cookie[] cookies = httpRequest.getCookies();
+           String userId = httpRequest.getHeader("userid");
+           String userName = httpRequest.getHeader("username");
+           String orgCode = httpRequest.getHeader("orgCode");
+           //获取cookie用户数据
+           if (cookies != null && cookies.length > 0) {
+               for (Cookie cookie : cookies) {
+                   if (cookie.getName().equals("userId") && userId == null) {
+                       userId = cookie.getValue();
+                   } else if (cookie.getName().equals("userName") && userName == null) {
+                       userName = URLDecoder.decode(cookie.getValue(), "utf-8");
+                   } else if (cookie.getName().equals("orgCode") && orgCode == null) {
+                       orgCode = URLDecoder.decode(cookie.getValue(), "utf-8");
+                   } else if (userId != null && userName != null && orgCode != null) {
+                       //都查到了，退出
+                       break;
+                   }
+               }
+           }
+           userName = URLDecoder.decode(userName, "utf-8");
+           orgCode = URLDecoder.decode(orgCode, "utf-8");
+           httpRequest.setAttribute("userId", userId);
+           httpRequest.setAttribute("userName", userName);
+           httpRequest.setAttribute("orgCode", orgCode);
+           //获取RequestBody数据
+           BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
+           StringBuilder strBuilder = new StringBuilder();
+           String inputStr;
+           while ((inputStr = streamReader.readLine()) != null) {
+               strBuilder.append(inputStr);
+           }
+           if (strBuilder != null && !"".equals(strBuilder.toString())) {
+               //有请求体则写入userId和userName，保存
+               JSONObject params = JSONObject.parseObject(strBuilder.toString());
+               params.put("userId", userId);
+               params.put("userName", userName);
+               params.put("orgCode", orgCode);
+               //将新的RequestBody写入新的请求对象保存
+               ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
+               chain.doFilter(requestWrapper, response);
+           } else {
+               chain.doFilter(request, response);
+           }
+       } catch (Exception e) {
+           e.printStackTrace();
+           log.error(e.getStackTrace());
+           chain.doFilter(request, response);
+       }
     }
     @Override
     public void init(FilterConfig arg0) throws ServletException {}

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

@@ -292,7 +292,15 @@ public class AMScontroller {
         return amsFeign.logicdelete(map);
     }
 
-    //======================>工资合同
+    @ApiOperation(value="同步NC销售合同")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/saleContractSync")
+    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"销售合同"})
+    public Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map) {
+        return amsFeign.saleContractSync(map);
+    }
+
+    //工资合同
     @ApiOperation(value = "工资合同")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
@@ -339,4 +347,19 @@ public class AMScontroller {
         return amsFeign.logicdeleteAmsSaalryContrac(map);
     }
 
+
+    @ApiOperation(value="展示销售合同")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/selectSaleContractPage")
+    Map<String, Object> selectSaleContractPage(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize){
+        return amsFeign.selectSaleContractPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
 }

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

@@ -78,5 +78,20 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.updateAmsSalaryContrac(id,map);
     }
 
+    @ApiOperation(value="派发运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/dispatchOrder")
+    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.dispatchOrder(map);
+    }
 
+    @ApiOperation(value = "查询运输订单")
+    @PostMapping("/getTransOrderList")
+    public Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getTransOrderList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
 }

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

@@ -123,6 +123,16 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查车牌号")
+    @GetMapping("/getCapacityByLike")
+    public RESTfulResult getCapacityByLike(String index,String orgCode,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("orgCode",orgCode);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getCapacityByLike(map);
+        return success(list);
+    }
     @ApiModelProperty(value = "边输边查快捷需求code")
     @GetMapping("/getCategoryCodeByLike")
     public RESTfulResult getCategoryCodeByLike(String index,@RequestParam(required = false) List<String> id) {
@@ -132,8 +142,6 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> list = universalMapper.getCategoryCodeByLike(map);
         return success(list);
     }
-
-
     @ApiModelProperty(value = "边输岗位信息")
     @GetMapping("/getJobInfosByLike")
     public RESTfulResult getrmsrmsjobinfosBylike(String index,@RequestParam(required = false) List<String> id) {

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.WMSFeign;
+import com.steerinfo.dil.model.WmsSlmDlivDir;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
@@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -30,7 +32,7 @@ public class WMSController extends BaseRESTfulController {
     @Autowired
     WMSFeign wmsFeign;
 
-    @ApiOperation(value="查询", notes = "分页查询销售订单")
+    @ApiOperation(value = "查询", notes = "分页查询销售订单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "params", value = "查询条件", required = false, dataType = "HashMap"),
             @ApiImplicitParam(name = "apiId", value = "表单ID", required = false, dataType = "Integer"),
@@ -52,7 +54,7 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.addet(params);
     }
 
-    @ApiOperation(value="查询", notes = "分页查询发货单")
+    @ApiOperation(value = "查询", notes = "分页查询发货单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "params", value = "查询条件", required = false, dataType = "HashMap"),
             @ApiImplicitParam(name = "apiId", value = "表单ID", required = false, dataType = "Integer"),
@@ -61,13 +63,54 @@ public class WMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/selectDlivDirNo")
     public Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap parmas,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize) {
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
         return wmsFeign.selectDlivDirNo(parmas == null ? new HashMap<>() : parmas, apiId, pageNum, pageSize);
     }
 
-    //====================> 实时库存
+    @ApiOperation(value = "修改发货单状态", notes = "修改发货单状态")
+    @ApiImplicitParam(name = "params", value = "修改内容", required = false, dataType = "ArrayList<HashMap<String, Object>>")
+    @PostMapping(value = "/updateOrder")
+    public RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> parmas) {
+        return wmsFeign.udpateOrder(parmas);
+    }
+
+    @ApiOperation(value = "查询发货单第几次退库", notes = "查询发货单第几次退库")
+    @ApiImplicitParam(name = "dlivDirno", value = "查询内容", required = false, dataType = "String")
+    @GetMapping(value = "/getcut/{dlivDirno}")
+    public RESTfulResult getcut(@PathVariable String dlivDirno) {
+        return wmsFeign.getcut(dlivDirno);
+    }
+
+    @ApiOperation(value = "退货", notes = "根据填写的数据将发货单进行退货")
+    @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
+    @PostMapping(value = "/returnGoods")
+    public RESTfulResult returnGoods(@RequestBody(required = false) HashMap<String, Object> params) {
+        return wmsFeign.returnGoods(params);
+    }
+
+    @ApiOperation(value = "撤销退货", notes = "根据发货单号将发货单的退货记录清除")
+    @ApiImplicitParam(name = "id", value = "查询内容", required = false, dataType = "String")
+    @PostMapping(value = "revokeReturnGoods/{id}")
+    public RESTfulResult revokeReturnGoods(@PathVariable("id") String id) {
+        return wmsFeign.revokeReturnGoods(id);
+    }
+
+    @ApiOperation(value = "删除发货单", notes = "根据发货单号将发货单删除")
+    @ApiImplicitParam(name = "id", value = "查询内容", required = false, dataType = "String")
+    @PostMapping(value = "deleteDlivDirno/{id}")
+    public RESTfulResult deleteDlivDirno(@PathVariable("id") String id) {
+        return wmsFeign.deleteDlivDirno(id);
+    }
+
+    @ApiOperation(value = "修改发货单信息", notes = "根据填写的数据将发货单进行修改")
+    @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
+    @PostMapping(value = "/editButton")
+    public RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params) {
+        return wmsFeign.editButton(params);
+    }
+    //实时库存
     @ApiOperation(value = "实时库存")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),

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

@@ -30,10 +30,10 @@ public interface AmsFeign {
     Map<String, Object> purchaseOrderDelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/ams/amsorders/getPurchaseOrderList")
-    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                     @RequestParam  Integer apiId,
-                                     @RequestParam  Integer pageNum,
-                                     @RequestParam  Integer pageSize
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
     );
 //===================>需求
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementAdd")
@@ -61,16 +61,16 @@ public interface AmsFeign {
     Map<String, Object> purchaseRequirementChange(Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getPurchaseRequirementList")
-    Map<String, Object> getPurchaseRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam  Integer apiId,
-                                                   @RequestParam  Integer pageNum,
-                                                   @RequestParam  Integer pageSize);
+    Map<String, Object> getPurchaseRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransplans/getPurchasePlanList")
-    Map<String, Object> getPurchasePlanList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam  Integer apiId,
-                                                   @RequestParam  Integer pageNum,
-                                                   @RequestParam  Integer pageSize);
+    Map<String, Object> getPurchasePlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanAdd")
     Map<String, Object> purchasePlanAdd(Map<String, Object> map);
@@ -85,20 +85,30 @@ public interface AmsFeign {
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/ams/amstransprices/getAmsTransPriceList")
-        Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
-                             @RequestParam  Integer pageNum,
-                             @RequestParam  Integer pageSize);
+    Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/ams/amstransprices/")
     Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amstransprices/{id}")
-    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> update(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amstransprices/logicdelete")
     Map<String, Object> logicdelete(@RequestBody(required = false) Map<String, Object> map);
 
-   // =============================》工资合同
+
+    @PostMapping("api/v1/ams/amssalecontracts/saleContractSync")
+            Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map);
+
+    @PostMapping("api/v1/ams/amssalecontracts/selectSaleContractPage")
+    Map<String, Object> selectSaleContractPage(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize);
+
+   // 工资合同
    @PostMapping("api/v1/ams/amssalarycontracts/getSalaryContrac")
    Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
                             @RequestParam  Integer pageNum,

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

@@ -22,825 +22,6 @@ import java.util.Map;
 @FeignClient(name = "ANTAI-TMS-API", url = "${openfeign.TmsFeign.url}")
 public interface TmsFeign {
 
-    /*
-    TmstruckLoadResultController
-     */
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResultForConverted")
-    Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map);
-
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getSaleOrderOnQueue")
-    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("con") String con);
-
-    @ApiOperation(value="查询订单下的物资")
-    @GetMapping("api/v1/truckTms/dropDown/getOrderMaterial/{orderId}")
-    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId);
-
-    @ApiOperation(value="查询仓库下所有月台")
-    @GetMapping("api/v1/truckTms/dropDown/getPlatformIdByWarehouse/{warehouseId}")
-    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId);
-
-    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdAndLoadSq")
-    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map);
-
-    @ApiOperation(value="根据运输订单号查询装/卸点、卸货物资、装机备注信息：后台管理 ")
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadingIdRemark")
-    Map<String, Object> selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
-
-    @ApiOperation(value="修改装/卸点、卸货物资、装机备注等：后台管理 ")
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdRemark")
-    Map<String, Object> updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
-    public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("status") Integer status ,
-                                          @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")   String con,
-                                          @RequestParam("userId") String userId,
-                                          @RequestParam("userIds") String userIds,
-                                                @RequestParam("startTime") String startTime,
-                                                @RequestParam("endTime") String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
-    public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultByResultId/{resultId}")
-    public Map<String,Object> getLoadResultByResultId(@PathVariable("resultId") Integer resultId);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addUnLoadResultForconverted")
-    public Map<String,Object> addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addCGLoadResult")
-    public Map<String, Object> addCGLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addSaleLoadResult")
-    public Map<String, Object> addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addSale2LoadResult")
-    public Map<String, Object> addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadResult")
-    public Map<String, Object> updateLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultById/{resultId}")
-    public Map<String, Object> getLoadResultById(@PathVariable("resultId") Integer resultId);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/deleteLoadResult/{resultId}")
-    public Map<String, Object> deleteLoadResult(@PathVariable("resultId")Integer resultId);
-    /*
-        TmstruckEnfactoryResultController
-     */
-
-    @ApiOperation(value="查询所有的进厂实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(99)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getAllEnFactoryResult")
-    public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam("apiId")     Integer apiId,
-                                                     @RequestParam("pageNum")   Integer pageNum,
-                                                     @RequestParam("pageSize")  Integer pageSize,
-                                                     @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("startTime") String startTime,
-                                                     @RequestParam("endTime") String endTime,
-                                                     @RequestParam("userId")    String userId,
-                                                     @RequestParam("userIds")   String userIds
-    );
-    @GetMapping("api/v1/truckTms/tmstruckenfactoryresults/getMaterial")
-    public Map<String , Object> getMaterial(@RequestParam("orderId")  Integer orderId);
-
-    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/addEnFactoryResult")
-    public Map<String, Object> addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @ApiOperation(value="PDA扫描更新进厂作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/enFactoryResultByPDA")
-    Map<String, Object> enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    /*
-        TmstruckWeightResultController
-     */
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiMaoResult")
-    public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam("apiId") Integer apiId,
-                                                 @RequestParam("pageNum") Integer pageNum,
-                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("orderType") Integer orderType,
-                                                 @RequestParam("con")     String con,
-                                                 @RequestParam("userId")  String userId,
-                                                 @RequestParam("userIds") String userIds,
-                                                 @RequestParam("startTime")String startTime,
-                                                 @RequestParam("endTime")String endTime
-                                                 );
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
-    public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("orderType") Integer orderType,
-                                                @RequestParam("con") String con,
-                                                @RequestParam("userId")String userId,
-                                                @RequestParam("userIds")String userIds,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime);
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
-    public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiPiResult")
-    public Map<String, Object> addJiPiResult(@RequestBody Map<String, Object> mapValue);
-
-
-    /*
-     TmstruckUnloadResultController
-     */
-
-    @PostMapping("api/v1/truckTms/tmstruckunloadresult/getUnloadResult")
-    public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("con")      String con,
-                                               @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds,
-                                               @RequestParam("startTime")String startTime,
-                                               @RequestParam("endTime")String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
-    public Map<String, Object> addUnloadResult(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckunloadresult/updateUnloadResult")
-    public Map<String, Object> updateUnloadResult(@RequestBody Map<String, Object> mapValue);
-
-    /*
-    TmstruckReceiptResultController
-     */
-
-
-    @PostMapping("api/v1/truckTms/tmstruckreciveresult/getReceiveResult")
-    public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")  String con,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime);
-
-    /*
-    TmstruckLeaveFactoryResultController
-     */
-
-
-    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/getLeaveFactoryResult")
-    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("con") String con,
-                                               @RequestParam("carrierSsoId")String carrierSsoId,
-                                               @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds,
-                                               @RequestParam("startTime") String startTime,
-                                               @RequestParam("endTime") String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
-    public Map<String, Object> addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    /*
-    TmstruckMeasureCommissionController
-     */
-
-    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/getAllMeasureCommission")
-    public Map<String, Object> getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       @RequestParam("apiId") Integer apiId,
-                                                       @RequestParam("pageNum") Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize,
-                                                       @RequestParam("con")String con);
-
-
-    /*
-    TmstruckQualityResultController
-     */
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
-    public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")String con,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime);
-
-
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")
-    public Map<String, Object> getQualityResultById(@PathVariable("resultId") Integer resultId);
-
-
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
-    public Map<String, Object> updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    //查询质检实绩
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
-    Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       @RequestParam("apiId")    Integer apiId,
-                                                       @RequestParam("pageNum")  Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize);
-
-    /**
-     * TmstruckTotalResult
-     */
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/selectCountList")
-    Map<String,Object> selectCountList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       @RequestParam("apiId")    Integer apiId,
-                                                       @RequestParam("pageNum")  Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize);
-
-    /**
-     * 下拉框
-     */
-    @GetMapping("api/v1/truckTms/dropDown/getDilBatch")
-    Map<String, Object> getDilBatch();
-
-    @GetMapping("api/v1/truckTms/dropDown/getCarrier")
-    Map<String, Object> getCarrier();
-
-    @GetMapping("api/v1/truckTms/dropDown/getLine")
-    Map<String, Object> getLine();
-
-    @GetMapping("api/v1/truckTms/dropDown/getWarehouse")
-    Map<String, Object> getWarehouse();
-
-    @GetMapping("api/v1/truckTms/dropDown/getGatepost")
-    Map<String, Object> getGatepost();
-
-    @GetMapping("api/v1/truckTms/dropDown/getAPO")
-    Map<String, Object> getAPO();
-
-    @GetMapping("api/v1/truckTms/dropDown/getFuCapacityId")
-    Map<String, Object> getFuCapacityId();
-
-    @GetMapping("api/v1/truckTms/dropDown/getPort")
-    Map<String, Object> getPort();
-
-    @GetMapping("api/v1/truckTms/dropDown/getFuMaterial/{type}")
-    Map<String, Object> getFuMaterial(@PathVariable("type")Integer type);
-
-    @GetMapping("api/v1/truckTms/dropDown/getUnloadPoint/{type}")
-    Map<String, Object> getUnloadPoint(@PathVariable("type") Integer type);
-    /**
-     * 包月总实绩
-     */
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getTmstruckMonthResult")
-    Map<String,Object> getTmstruckMonthResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       @RequestParam("apiId")    Integer apiId,
-                                       @RequestParam("pageNum")  Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize);
-    /**
-     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
-     */
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/{orderId}")
-    Map<String,Object> isNextNeedJl(@PathVariable("orderId") Integer orderId);
-
-
-    /**
-     *查询短信实绩
-     */
-    @PostMapping("api/v1/truckTms/tmstrucksmsrusults/getSmsResult")
-    Map<String,Object> getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                    @RequestParam("apiId") Integer apiId,
-                                    @RequestParam("pageNum") Integer pageNum,
-                                    @RequestParam("pageSize") Integer pageSize,
-                                    @RequestParam("con") String con);
-
-    @ApiOperation(value="APP查询进厂实绩")
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryResultList")
-    Map<String, Object> getEnfactoryResultList();
-
-    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryMessageByOrderId")
-    Map<String, Object> getEnfactoryMessageByOrderId(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/getAllTimeTaskResult")
-    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con") String con,
-                                              @RequestParam("userId") String userId,
-                                              @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime,
-                                              @RequestParam("orderType")Integer orderType);
-
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getAllReverseResult")
-    RESTfulResult getAllReverseResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con") String con,
-                                              @RequestParam("userId") String userId,
-                                              @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
-    Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
-
-    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/addSteelNzReceiptResult")
-    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
-    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
-
-    @PostMapping("api/v1/truckTms/tmstruckreturnresults/getAllReturnResult")
-    public Map<String, Object>  getAllReturnResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("orderType") Integer orderType,
-                                                   @RequestParam("con") String con);
-
-    @PostMapping("api/v1/truckTms/selfMachine/getBillOrder")
-    Map<String, Object> getBillOrder(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/selfMachine/getDeliveryOrder")
-    Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/selfMachine/queryNumber")
-    Map<String, Object> queryNumber(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/selfMachine/changeNumber")
-    Map<String, Object> changeNumber(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getRLFLReport")
-    Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("startTime") String startTime,
-                                      @RequestParam("endTime")   String endTime,
-                                      @RequestParam("orderType") Integer orderType,
-                                      @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
-    Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapval,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam Integer orderType,
-                                          @RequestParam Integer orderStatus);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReport")
-    Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime")   String endTime,
-                                      @RequestParam("carrierSsoId")   String carrierSsoId,
-                                         @RequestParam("orderType") Integer orderType,
-                                         @RequestParam("shipperId") Integer shipperId,
-                                         @RequestParam("receiveName") String receiveName,
-                                         @RequestParam String materialName,
-                                         @RequestParam String wareHouse
-    );
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
-    Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime")   String endTime,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId
-    );
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
-    Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("startTime") String startTime,
-                                                   @RequestParam("endTime") String endTime,
-                                                   @RequestParam("carrierSsoId") String carrierSsoId,
-                                                   @RequestParam("userId") String userId,
-                                                   @RequestParam("userIds") String userIds,
-                                                   @RequestParam("con") String con,
-                                                   @RequestParam("orderType") Integer orderType
-    );
-    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport2")
-    Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("startTime") String startTime,
-                                                   @RequestParam("endTime") String endTime,
-                                                   @RequestParam("carrierSsoId") String carrierSsoId,
-                                                   @RequestParam("userId") String userId,
-                                                   @RequestParam("userIds") String userIds,
-                                                   @RequestParam("con") String con,
-                                                   @RequestParam("orderType") Integer orderType
-    );
-    //内转统计报表
-    @PostMapping("api/v1/truckTms/statisticalReport/getAllInwardResult")
-    Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime")   String endTime,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId
-    );
-
-    //采购内转统计报表
-    @PostMapping("api/v1/truckTms/statisticalReport/getPurInwardReport")
-    Map<String, Object> getPurInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer apiId,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam String startTime,
-                                           @RequestParam String endTime);
-//内转统计报表
-    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReport")
-    Map<String, Object> getInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer apiId,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam String startTime,
-                                           @RequestParam String endTime);
-
-    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
-    Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
-
-
-    //发送留皮计量委托
-    @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
-    Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
-
-
-    //新增计时作业实绩
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
-    Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
-    Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam Integer apiId,
-                                   @RequestParam Integer pageNum,
-                                   @RequestParam Integer pageSize,
-                                   @RequestParam String startTime,
-                                   @RequestParam String endTime);
-
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderForResultDetail")
-    Map<String, Object> getLoaderForResultDetail(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam("apiId") Integer apiId,
-                                   @RequestParam("pageNum") Integer pageNum,
-                                   @RequestParam("pageSize") Integer pageSize,
-                                   @RequestParam("startTime") String startTime,
-                                   @RequestParam("endTime") String endTime, @RequestParam("con") String con, @RequestParam("isPage") String  isPage);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
-    Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam String startTime,
-                                     @RequestParam String endTime);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderResult")
-    Map<String, Object> getLoaderResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam String startTime,
-                                     @RequestParam String endTime);
-
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
-    Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/unitSureEndTimeout")
-    Map<String, Object> unitSureEndTimeout(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTaskPause")
-    Map<String, Object> JudgeTimeTaskPause(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLXInwardReport")
-    Map<String, Object> getLXInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam String startTime,
-                                     @RequestParam String endTime,
-                                          @RequestParam String con);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")
-    Map<String, Object> getInwardReportForAssemble(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam String startTime,
-                                          @RequestParam String endTime,
-                                                   @RequestParam BigDecimal orderType,
-                                                   @RequestParam String index,
-                                                   @RequestParam String isPage,
-                                                   @RequestParam String orgCode);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")
-    Map<String, Object> getCapacityByDefend(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                            @RequestParam String startTime,
-                                            @RequestParam String endTime,
-                                          @RequestParam String con,
-                                            @RequestParam String yes
-                                         );
-
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")
-    Map<String, Object> getReceiptResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam String con,
-                                            @RequestParam String startTime,
-                                            @RequestParam String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptPhoto")
-    String getReceiptPhoto(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingResult")
-    Map<String, Object> getReceivingResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                         @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize,
-                                         @RequestParam String con,
-                                         @RequestParam String startTime,
-                                         @RequestParam String endTime
-    );
-
-    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
-    Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
-    @PostMapping("/api/v1/truckTms/pathDisplay/fullPathVisualizationByCarNumber")
-    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
-    @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
-    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
-    @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")
-    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
-    @PostMapping(value = "/api/v1/truckTms/tmstruckarrivalresults/addtmstruckArrivalResult",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestPart("file") MultipartFile file);
-
-    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult")
-    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("num") Integer num, @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, @RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
-
-    @PostMapping(value = "/api/v1/truckTms/tmstruckarrivalresults/uploadImage",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public String uploadImage(@RequestParam("orderNumber")String orderNumber,@RequestPart("file") MultipartFile file);
-
-//    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult", headers = "content-type=multipart/form-data",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-//    public  RESTfulResult addTmstruckReceiptResult(@RequestPart("file")MultipartRequest request,@RequestParam("num") Integer num,@RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
-    @PostMapping("/api/v1/truckTms/pathDisplay/getFinishTruckOrderInfo")
-    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    );
-
-    @PostMapping(value = "/api/v1/truckTms/pathDisplay/selectWarnSwitch")
-    public RESTfulResult selectWarnSwitch();
-
-    @PostMapping(value = "/api/v1/truckTms/pathDisplay/inTransitWarn")
-    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
-
-    @PostMapping("/api/v1/truckTms/pathDisplay/offLineWarn")
-    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
-    @PostMapping("/api/v1/truckTms/pathDisplay/parkWarn")
-    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
-    @PostMapping("/api/v1/truckTms/pathDisplay/abnormalLineWarn")
-    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
-
-    @PostMapping("/api/v1/truckTms/pathDisplay/getHaveAbnormalTruckOrderInfo")
-    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
-    @PostMapping("/api/v1/truckTms/pathDisplay/getTransportAbnormalInfo")
-    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
-                                                  @RequestParam(name = "pageNum") Integer pageNum,
-                                                  @RequestParam(name = "pageSize") Integer pageSize);
-
-
-    @ApiOperation(value = "获取收货作业照片")
-    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
-    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
-
-
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseInwardList")
-    Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("startTime") String startTime,
-                                      @RequestParam("endTime") String endTime,
-                                      @RequestParam("orgCode") String orgCode,
-                                      @RequestParam("isPage") String isPage,
-                                      @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseOrderList")
-    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime,
-                                              @RequestParam("orgCode") String orgCode,
-                                              @RequestParam("isPage") String isPage,
-                                             @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleOrderList")
-    Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime") String endTime,
-                                         @RequestParam("orgCode") String orgCode,
-                                         @RequestParam("isPage") String isPage,
-                                         @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardInFactory")
-    Map<String, Object> getInwardInFactory(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("startTime") String startTime,
-                                           @RequestParam("endTime") String endTime,
-                                           @RequestParam("orgCode") String orgCode,
-                                           @RequestParam("isPage") String isPage,
-                                           @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getOutFactoryInwardList")
-    Map<String, Object> getOutFactoryInwardList(@RequestBody(required = false)Map<String, Object> mapValue,
-                                                @RequestParam("apiId")Integer apiId,
-                                                @RequestParam("pageNum")Integer pageNum,
-                                                @RequestParam("pageSize")Integer pageSize,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime,
-                                                @RequestParam("orgCode")String orgCode,
-                                                @RequestParam("isPage")String isPage,
-                                                @RequestParam("index")String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReport")
-    Map<String, Object> getSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
-                                           @RequestParam("startTime")String startTime,
-                                           @RequestParam("endTime")String endTime,
-                                           @RequestParam("carrierSsoId")String carrierSsoId,
-                                           @RequestParam("receiveName")String receiveName,
-                                           @RequestParam("materialName")String materialName,
-                                           @RequestParam("specification")String specification,
-                                           @RequestParam("remark")String remark,
-                                           @RequestParam("capacityNo") String capacityNo,
-                                           @RequestParam("carrierName") String carrierName,
-                                           @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler,
-                                           @RequestParam("easPrimaryId") String easPrimaryId
-                                           );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelSpellingReport")
-    Map<String, Object> getSaleSteelSpellingReport(@RequestBody(required = false)Map<String, Object> map);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportNew")
-    Map<String, Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
-                                           @RequestParam("startTime")String startTime,
-                                           @RequestParam("endTime")String endTime,
-                                           @RequestParam("carrierSsoId")String carrierSsoId,
-                                           @RequestParam("receiveName")String receiveName,
-                                           @RequestParam("materialName")String materialName,
-                                           @RequestParam("specification")String specification,
-                                           @RequestParam("remark")String remark,
-                                           @RequestParam("capacityNo") String capacityNo,
-                                           @RequestParam("carrierName") String carrierName,
-                                           @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler,
-                                           @RequestParam("easPrimaryId") String easPrimaryId
-    );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSettledSaleSteelReportNew")
-    Map<String, Object> getSettledSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
-                                              @RequestParam("startTime")String startTime,
-                                              @RequestParam("endTime")String endTime,
-                                              @RequestParam("carrierSsoId")String carrierSsoId,
-                                              @RequestParam("receiveName")String receiveName,
-                                              @RequestParam("materialName")String materialName,
-                                              @RequestParam("specification")String specification,
-                                              @RequestParam("remark")String remark,
-                                              @RequestParam("capacityNo") String capacityNo,
-                                              @RequestParam("carrierName") String carrierName,
-                                              @RequestParam("consigneeName") String consigneeName,
-                                              @RequestParam("saler") String saler,
-                                              @RequestParam("easPrimaryId") String easPrimaryId
-    );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/loadingSaleSteelReport")
-    Map<String, Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
-                                           @RequestParam("startTime")String startTime,
-                                           @RequestParam("endTime")String endTime,
-                                           @RequestParam("carrierSsoId")String carrierSsoId,
-                                           @RequestParam("receiveName")String receiveName,
-                                           @RequestParam("materialName")String materialName,
-                                           @RequestParam("specification")String specification,
-                                           @RequestParam("remark")String remark,
-                                           @RequestParam("capacityNo") String capacityNo,
-                                           @RequestParam("carrierName") String carrierName,
-                                           @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler,
-                                           @RequestParam("easPrimaryId") String easPrimaryId
-    );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")
-    Map<String, Object> getInwardSaleSteelReport(@RequestBody(required = false) Map<String, Object> map,
-                                                 @RequestParam("startTime") String startTime,
-                                                 @RequestParam("endTime") String endTime,
-                                                 @RequestParam("carrierSsoId") String carrierSsoId,
-                                                 @RequestParam("receiveName") String receiveName,
-                                                 @RequestParam("materialName") String materialName,
-                                                 @RequestParam("specification") String specification,
-                                                 @RequestParam("remark") String remark,
-                                                 @RequestParam("capacityNo") String capacityNo,
-                                                 @RequestParam("carrierName") String carrierName,
-                                                 @RequestParam("consigneeName") String consigneeName,
-                                                 @RequestParam("saler") String saler);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelOrder")
-    Map<String, Object> getInwardSaleSteelOrder(@RequestBody(required = false) Map<String, Object> map,
-                                                 @RequestParam("startTime") String startTime,
-                                                 @RequestParam("endTime") String endTime,
-                                                 @RequestParam("remark") String remark,
-                                                 @RequestParam("capacityNo") String capacityNo,
-                                                 @RequestParam("consigneeName") String consigneeName
-                                                 );
-
-    @PostMapping("/api/v1/truckTms/tmstrucksmsrusults/sendMeaage")
-    Map<String, Object> sendMeaage(@RequestParam String mobile,
-                                   @RequestParam String content);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSteelReportDetailsBySmId")
-    Map<String, Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId);
-
-
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/changeOrderLine")
-    Map<String, Object> changeOrderLine(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportForFinance")
-    Map<String, Object> getSaleSteelReportForFinance(BigDecimal saleOrderMaterialId);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/steelTransportReport")
-    Map<String, Object> steelTransportReport(@RequestBody(required = false) Map<String, Object> map, @RequestParam String startTime,@RequestParam String endTime);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/yawnReport")
-    Map<String, Object> yawnReport(@RequestBody(required = false) Map<String, Object> map);
-
     //======================>车辆综合实绩
     @PostMapping("api/v1/tms/tmscomprehensiveresults/gettmscomprehensiveresult")
     Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
@@ -855,6 +36,24 @@ public interface TmsFeign {
 
     @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/dispatchOrder")
+    Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getTransOrderList")
+    Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam  Integer apiId,
+                                                @RequestParam  Integer pageNum,
+                                                @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/omstransorders/deleteTransOrder")
+    Map<String, Object> deleteTransOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/closeTransOrder")
+    Map<String, Object> closeTransOrder(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/closeTransOrderByPlan")
+    Map<String, Object> closeTransOrderByPlan(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.dil.model.WmsSlmDlivDir;
 import com.steerinfo.framework.controller.RESTfulResult;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -7,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,13 +30,31 @@ public interface WMSFeign {
     RESTfulResult addet(@RequestBody HashMap params);
 
     @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/selectDlivDirNo")
-    public Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap params,
+    Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap params,
                                              @RequestParam("apiId") Integer apiId,
                                              @RequestParam("pageNum") Integer pageNum,
                                              @RequestParam("pageSize") Integer pageSize);
 
-    //==================实时库存
 
+    @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/udpateOrder")
+    RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @GetMapping(value = "api/v1/wms/wmsslmdlivdirs/getcut/{dlivDirno}")
+    RESTfulResult getcut(@PathVariable String dlivDirno);
+
+    @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/returnGoods")
+    RESTfulResult returnGoods(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/revokeReturnGoods/{id}")
+    RESTfulResult revokeReturnGoods(@PathVariable("id") String id);
+
+    @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/deleteDlivDirno/{id}")
+    RESTfulResult deleteDlivDirno(@PathVariable("id") String id);
+
+    @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/editButton")
+    RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params);
+
+    //实时库存
     @PostMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsList")
     Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
@@ -49,4 +69,5 @@ public interface WMSFeign {
     @PutMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsUpdate/{id}")
     Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
 
+
 }

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

@@ -33,6 +33,8 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getPersonnelByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getCapacityByLike(Map<String, Object> map);
+
     List<Map<String, Object>> getTransRangeByLike(Map<String, Object> map);
     List<Map<String, Object>> getLineByLike(Map<String, Object> map);
     List<Map<String, Object>> getrmsrmsjobinfosBylike(Map<String, Object> map);

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

@@ -0,0 +1,886 @@
+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 WmsSlmDlivDir implements IBasePO<String> {
+    /**
+     * 发运计划号(DLIV_DIRNO,VARCHAR,40)
+     */
+    @ApiModelProperty(value="发运计划号",required=true)
+    private String dlivDirno;
+
+    @ApiModelProperty(value="",required=false)
+    private String seq;
+
+    /**
+     * 合同号/订单编号(ORDER_NO,VARCHAR,40)
+     */
+    @ApiModelProperty(value="合同号/订单编号",required=false)
+    private String orderNo;
+
+    /**
+     * 行号(ORDER_SEQ,VARCHAR,10)
+     */
+    @ApiModelProperty(value="行号",required=false)
+    private String orderSeq;
+
+    /**
+     * 客户编码(CUSTOMER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="客户编码",required=false)
+    private String customerNo;
+
+    /**
+     * 客户名称(CUSTOMER_NM,VARCHAR,100)
+     */
+    @ApiModelProperty(value="客户名称",required=false)
+    private String customerNm;
+
+    /**
+     * 产线(PROD_LINE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="产线",required=false)
+    private String prodLine;
+
+    /**
+     * 物料名称(PROD_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String prodName;
+
+    /**
+     * 标准代码(SPEC_ABBSYM,VARCHAR,20)
+     */
+    @ApiModelProperty(value="标准代码",required=false)
+    private String specAbbsym;
+
+    /**
+     * 钢级(牌号)代码(STEEL_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="钢级(牌号)代码",required=false)
+    private String steelCode;
+
+    /**
+     * 计划件数(QUANTITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计划件数",required=false)
+    private BigDecimal quantity;
+
+    /**
+     * 计划重量(WEIGHT,DECIMAL,13)
+     */
+    @ApiModelProperty(value="计划重量",required=false)
+    private BigDecimal weight;
+
+    /**
+     * 金额(MONEY,DECIMAL,14)
+     */
+    @ApiModelProperty(value="金额",required=false)
+    private BigDecimal money;
+
+    /**
+     * 运费(TRANSMONEY,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运费",required=false)
+    private Short transmoney;
+
+    /**
+     * 指示状态(0未允许发货1允许发货2正在执行3执行完毕)(DLIV_PROG_CD,VARCHAR,1)
+     */
+    @ApiModelProperty(value="指示状态(0未允许发货1允许发货2正在执行3执行完毕)",required=false)
+    private String dlivProgCd;
+
+    /**
+     * 创建人(CREATE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人(UPDATE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人",required=false)
+    private String updateName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 有效标识(VALIDFLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="有效标识",required=false)
+    private String validflag;
+
+    /**
+     * 合同行号(ORDER_LINE_NO,VARCHAR,60)
+     */
+    @ApiModelProperty(value="合同行号",required=false)
+    private String orderLineNo;
+
+    /**
+     * 直径(DIAMETER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="直径",required=false)
+    private Short diameter;
+
+    /**
+     * 收货单位(FINAL_USER,VARCHAR,50)
+     */
+    @ApiModelProperty(value="收货单位",required=false)
+    private String finalUser;
+
+    /**
+     * 目的地(收货地址)(DESTINATION,VARCHAR,100)
+     */
+    @ApiModelProperty(value="目的地(收货地址)",required=false)
+    private String destination;
+
+    /**
+     * 贸易类型2018(ISOUT,VARCHAR,1)
+     */
+    @ApiModelProperty(value="贸易类型2018",required=false)
+    private String isout;
+
+    /**
+     * 申请人(APPLICANT_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="申请人",required=false)
+    private String applicantName;
+
+    /**
+     * 申请时间(APPLICANT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="申请时间",required=false)
+    private Date applicantTime;
+
+    /**
+     * 确认人(AFFRIM_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="确认人",required=false)
+    private String affrimName;
+
+    /**
+     * 确认时间(AFFRIM_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="确认时间",required=false)
+    private Date affrimTime;
+
+    /**
+     * 交货日期(DELVRY_EDATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="交货日期",required=false)
+    private Date delvryEdate;
+
+    /**
+     * 收货单位描述(FINAL_USER_DESC,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货单位描述",required=false)
+    private String finalUserDesc;
+
+    /**
+     * 运输方式('2010')(TRANSIT_TYP,VARCHAR,20)
+     */
+    @ApiModelProperty(value="运输方式('2010')",required=false)
+    private String transitTyp;
+
+    /**
+     * 车船号(SHIP_CAR_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="车船号",required=false)
+    private String shipCarNo;
+
+    /**
+     * 备注(MEMO,VARCHAR,500)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 打印次数,提货单打印状态(0未打印1打印2作废)(PRINT_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="打印次数,提货单打印状态(0未打印1打印2作废)",required=false)
+    private Short printNumber;
+
+    /**
+     * 审批人(PLAN_SEND_MAN,VARCHAR,20)
+     */
+    @ApiModelProperty(value="审批人",required=false)
+    private String planSendMan;
+
+    /**
+     * 审批时间(PLAN_SEND_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="审批时间",required=false)
+    private Date planSendTime;
+
+    /**
+     * 退货人(PLAN_RECEIVE_MAN,VARCHAR,20)
+     */
+    @ApiModelProperty(value="退货人",required=false)
+    private String planReceiveMan;
+
+    /**
+     * 退货时间(PLAN_RECEIVE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="退货时间",required=false)
+    private Date planReceiveTime;
+
+    /**
+     * 单据完成人(PLAN_OVER_MAN,VARCHAR,20)
+     */
+    @ApiModelProperty(value="单据完成人",required=false)
+    private String planOverMan;
+
+    /**
+     * 单据完成时间(PLAN_OVER_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="单据完成时间",required=false)
+    private Date planOverTime;
+
+    /**
+     * 承运单位('1109')(CARRIER_UNIT,VARCHAR,20)
+     */
+    @ApiModelProperty(value="承运单位('1109')",required=false)
+    private String carrierUnit;
+
+    /**
+     * 订货价(牌价)(ORDER_PRICE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订货价(牌价)",required=false)
+    private Short orderPrice;
+
+    /**
+     * 供货单位(SUPPLY_UNIT,VARCHAR,10)
+     */
+    @ApiModelProperty(value="供货单位",required=false)
+    private String supplyUnit;
+
+    /**
+     * 物料编号(PROD_CODE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String prodCode;
+
+    /**
+     * 已出件数(OUTQUANTITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="已出件数",required=false)
+    private BigDecimal outquantity;
+
+    /**
+     * 已出重量(OUTWEIGHT,DECIMAL,13)
+     */
+    @ApiModelProperty(value="已出重量",required=false)
+    private BigDecimal outweight;
+
+    /**
+     * 退货件数(OVERQUANTITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="退货件数",required=false)
+    private BigDecimal overquantity;
+
+    /**
+     * 单价(PRICE,DECIMAL,12)
+     */
+    @ApiModelProperty(value="单价",required=false)
+    private BigDecimal price;
+
+    /**
+     * 成品牌号(STEEL_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="成品牌号",required=false)
+    private String steelName;
+
+    /**
+     * 成品规格(SPEC_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="成品规格",required=false)
+    private String specName;
+
+    /**
+     * 公司名字(BODYNAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="公司名字",required=false)
+    private String bodyname;
+
+    /**
+     * 业务类型(BUSINAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="业务类型",required=false)
+    private String businame;
+
+    /**
+     * 退货重量(OVERWEIGHT,DECIMAL,13)
+     */
+    @ApiModelProperty(value="退货重量",required=false)
+    private BigDecimal overweight;
+
+    /**
+     * 退货原因(OVERMEMO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="退货原因",required=false)
+    private String overmemo;
+
+    /**
+     * 老系统编码备注(WMEMO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="老系统编码备注",required=false)
+    private String wmemo;
+
+    /**
+     * NC订单唯一码(CORDER_BID,VARCHAR,100)
+     */
+    @ApiModelProperty(value="NC订单唯一码",required=false)
+    private String corderBid;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.dlivDirno;
+    }
+
+    @Override
+    public void setId(String dlivDirno) {
+        this.dlivDirno = dlivDirno == null ? null : dlivDirno.trim();
+    }
+
+    public String getDlivDirno() {
+        return dlivDirno;
+    }
+
+    public void setDlivDirno(String dlivDirno) {
+        this.dlivDirno = dlivDirno == null ? null : dlivDirno.trim();
+    }
+
+    public String getSeq() {
+        return seq;
+    }
+
+    public void setSeq(String seq) {
+        this.seq = seq == null ? null : seq.trim();
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo == null ? null : orderNo.trim();
+    }
+
+    public String getOrderSeq() {
+        return orderSeq;
+    }
+
+    public void setOrderSeq(String orderSeq) {
+        this.orderSeq = orderSeq == null ? null : orderSeq.trim();
+    }
+
+    public String getCustomerNo() {
+        return customerNo;
+    }
+
+    public void setCustomerNo(String customerNo) {
+        this.customerNo = customerNo == null ? null : customerNo.trim();
+    }
+
+    public String getCustomerNm() {
+        return customerNm;
+    }
+
+    public void setCustomerNm(String customerNm) {
+        this.customerNm = customerNm == null ? null : customerNm.trim();
+    }
+
+    public String getProdLine() {
+        return prodLine;
+    }
+
+    public void setProdLine(String prodLine) {
+        this.prodLine = prodLine == null ? null : prodLine.trim();
+    }
+
+    public String getProdName() {
+        return prodName;
+    }
+
+    public void setProdName(String prodName) {
+        this.prodName = prodName == null ? null : prodName.trim();
+    }
+
+    public String getSpecAbbsym() {
+        return specAbbsym;
+    }
+
+    public void setSpecAbbsym(String specAbbsym) {
+        this.specAbbsym = specAbbsym == null ? null : specAbbsym.trim();
+    }
+
+    public String getSteelCode() {
+        return steelCode;
+    }
+
+    public void setSteelCode(String steelCode) {
+        this.steelCode = steelCode == null ? null : steelCode.trim();
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    public Short getTransmoney() {
+        return transmoney;
+    }
+
+    public void setTransmoney(Short transmoney) {
+        this.transmoney = transmoney;
+    }
+
+    public String getDlivProgCd() {
+        return dlivProgCd;
+    }
+
+    public void setDlivProgCd(String dlivProgCd) {
+        this.dlivProgCd = dlivProgCd == null ? null : dlivProgCd.trim();
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName == null ? null : createName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName == null ? null : updateName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getValidflag() {
+        return validflag;
+    }
+
+    public void setValidflag(String validflag) {
+        this.validflag = validflag == null ? null : validflag.trim();
+    }
+
+    public String getOrderLineNo() {
+        return orderLineNo;
+    }
+
+    public void setOrderLineNo(String orderLineNo) {
+        this.orderLineNo = orderLineNo == null ? null : orderLineNo.trim();
+    }
+
+    public Short getDiameter() {
+        return diameter;
+    }
+
+    public void setDiameter(Short diameter) {
+        this.diameter = diameter;
+    }
+
+    public String getFinalUser() {
+        return finalUser;
+    }
+
+    public void setFinalUser(String finalUser) {
+        this.finalUser = finalUser == null ? null : finalUser.trim();
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination == null ? null : destination.trim();
+    }
+
+    public String getIsout() {
+        return isout;
+    }
+
+    public void setIsout(String isout) {
+        this.isout = isout == null ? null : isout.trim();
+    }
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName == null ? null : applicantName.trim();
+    }
+
+    public Date getApplicantTime() {
+        return applicantTime;
+    }
+
+    public void setApplicantTime(Date applicantTime) {
+        this.applicantTime = applicantTime;
+    }
+
+    public String getAffrimName() {
+        return affrimName;
+    }
+
+    public void setAffrimName(String affrimName) {
+        this.affrimName = affrimName == null ? null : affrimName.trim();
+    }
+
+    public Date getAffrimTime() {
+        return affrimTime;
+    }
+
+    public void setAffrimTime(Date affrimTime) {
+        this.affrimTime = affrimTime;
+    }
+
+    public Date getDelvryEdate() {
+        return delvryEdate;
+    }
+
+    public void setDelvryEdate(Date delvryEdate) {
+        this.delvryEdate = delvryEdate;
+    }
+
+    public String getFinalUserDesc() {
+        return finalUserDesc;
+    }
+
+    public void setFinalUserDesc(String finalUserDesc) {
+        this.finalUserDesc = finalUserDesc == null ? null : finalUserDesc.trim();
+    }
+
+    public String getTransitTyp() {
+        return transitTyp;
+    }
+
+    public void setTransitTyp(String transitTyp) {
+        this.transitTyp = transitTyp == null ? null : transitTyp.trim();
+    }
+
+    public String getShipCarNo() {
+        return shipCarNo;
+    }
+
+    public void setShipCarNo(String shipCarNo) {
+        this.shipCarNo = shipCarNo == null ? null : shipCarNo.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public Short getPrintNumber() {
+        return printNumber;
+    }
+
+    public void setPrintNumber(Short printNumber) {
+        this.printNumber = printNumber;
+    }
+
+    public String getPlanSendMan() {
+        return planSendMan;
+    }
+
+    public void setPlanSendMan(String planSendMan) {
+        this.planSendMan = planSendMan == null ? null : planSendMan.trim();
+    }
+
+    public Date getPlanSendTime() {
+        return planSendTime;
+    }
+
+    public void setPlanSendTime(Date planSendTime) {
+        this.planSendTime = planSendTime;
+    }
+
+    public String getPlanReceiveMan() {
+        return planReceiveMan;
+    }
+
+    public void setPlanReceiveMan(String planReceiveMan) {
+        this.planReceiveMan = planReceiveMan == null ? null : planReceiveMan.trim();
+    }
+
+    public Date getPlanReceiveTime() {
+        return planReceiveTime;
+    }
+
+    public void setPlanReceiveTime(Date planReceiveTime) {
+        this.planReceiveTime = planReceiveTime;
+    }
+
+    public String getPlanOverMan() {
+        return planOverMan;
+    }
+
+    public void setPlanOverMan(String planOverMan) {
+        this.planOverMan = planOverMan == null ? null : planOverMan.trim();
+    }
+
+    public Date getPlanOverTime() {
+        return planOverTime;
+    }
+
+    public void setPlanOverTime(Date planOverTime) {
+        this.planOverTime = planOverTime;
+    }
+
+    public String getCarrierUnit() {
+        return carrierUnit;
+    }
+
+    public void setCarrierUnit(String carrierUnit) {
+        this.carrierUnit = carrierUnit == null ? null : carrierUnit.trim();
+    }
+
+    public Short getOrderPrice() {
+        return orderPrice;
+    }
+
+    public void setOrderPrice(Short orderPrice) {
+        this.orderPrice = orderPrice;
+    }
+
+    public String getSupplyUnit() {
+        return supplyUnit;
+    }
+
+    public void setSupplyUnit(String supplyUnit) {
+        this.supplyUnit = supplyUnit == null ? null : supplyUnit.trim();
+    }
+
+    public String getProdCode() {
+        return prodCode;
+    }
+
+    public void setProdCode(String prodCode) {
+        this.prodCode = prodCode == null ? null : prodCode.trim();
+    }
+
+    public BigDecimal getOutquantity() {
+        return outquantity;
+    }
+
+    public void setOutquantity(BigDecimal outquantity) {
+        this.outquantity = outquantity;
+    }
+
+    public BigDecimal getOutweight() {
+        return outweight;
+    }
+
+    public void setOutweight(BigDecimal outweight) {
+        this.outweight = outweight;
+    }
+
+    public BigDecimal getOverquantity() {
+        return overquantity;
+    }
+
+    public void setOverquantity(BigDecimal overquantity) {
+        this.overquantity = overquantity;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getSteelName() {
+        return steelName;
+    }
+
+    public void setSteelName(String steelName) {
+        this.steelName = steelName == null ? null : steelName.trim();
+    }
+
+    public String getSpecName() {
+        return specName;
+    }
+
+    public void setSpecName(String specName) {
+        this.specName = specName == null ? null : specName.trim();
+    }
+
+    public String getBodyname() {
+        return bodyname;
+    }
+
+    public void setBodyname(String bodyname) {
+        this.bodyname = bodyname == null ? null : bodyname.trim();
+    }
+
+    public String getBusiname() {
+        return businame;
+    }
+
+    public void setBusiname(String businame) {
+        this.businame = businame == null ? null : businame.trim();
+    }
+
+    public BigDecimal getOverweight() {
+        return overweight;
+    }
+
+    public void setOverweight(BigDecimal overweight) {
+        this.overweight = overweight;
+    }
+
+    public String getOvermemo() {
+        return overmemo;
+    }
+
+    public void setOvermemo(String overmemo) {
+        this.overmemo = overmemo == null ? null : overmemo.trim();
+    }
+
+    public String getWmemo() {
+        return wmemo;
+    }
+
+    public void setWmemo(String wmemo) {
+        this.wmemo = wmemo == null ? null : wmemo.trim();
+    }
+
+    public String getCorderBid() {
+        return corderBid;
+    }
+
+    public void setCorderBid(String corderBid) {
+        this.corderBid = corderBid == null ? null : corderBid.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", dlivDirno=").append(dlivDirno);
+        sb.append(", seq=").append(seq);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", orderSeq=").append(orderSeq);
+        sb.append(", customerNo=").append(customerNo);
+        sb.append(", customerNm=").append(customerNm);
+        sb.append(", prodLine=").append(prodLine);
+        sb.append(", prodName=").append(prodName);
+        sb.append(", specAbbsym=").append(specAbbsym);
+        sb.append(", steelCode=").append(steelCode);
+        sb.append(", quantity=").append(quantity);
+        sb.append(", weight=").append(weight);
+        sb.append(", money=").append(money);
+        sb.append(", transmoney=").append(transmoney);
+        sb.append(", dlivProgCd=").append(dlivProgCd);
+        sb.append(", createName=").append(createName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateName=").append(updateName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", validflag=").append(validflag);
+        sb.append(", orderLineNo=").append(orderLineNo);
+        sb.append(", diameter=").append(diameter);
+        sb.append(", finalUser=").append(finalUser);
+        sb.append(", destination=").append(destination);
+        sb.append(", isout=").append(isout);
+        sb.append(", applicantName=").append(applicantName);
+        sb.append(", applicantTime=").append(applicantTime);
+        sb.append(", affrimName=").append(affrimName);
+        sb.append(", affrimTime=").append(affrimTime);
+        sb.append(", delvryEdate=").append(delvryEdate);
+        sb.append(", finalUserDesc=").append(finalUserDesc);
+        sb.append(", transitTyp=").append(transitTyp);
+        sb.append(", shipCarNo=").append(shipCarNo);
+        sb.append(", memo=").append(memo);
+        sb.append(", printNumber=").append(printNumber);
+        sb.append(", planSendMan=").append(planSendMan);
+        sb.append(", planSendTime=").append(planSendTime);
+        sb.append(", planReceiveMan=").append(planReceiveMan);
+        sb.append(", planReceiveTime=").append(planReceiveTime);
+        sb.append(", planOverMan=").append(planOverMan);
+        sb.append(", planOverTime=").append(planOverTime);
+        sb.append(", carrierUnit=").append(carrierUnit);
+        sb.append(", orderPrice=").append(orderPrice);
+        sb.append(", supplyUnit=").append(supplyUnit);
+        sb.append(", prodCode=").append(prodCode);
+        sb.append(", outquantity=").append(outquantity);
+        sb.append(", outweight=").append(outweight);
+        sb.append(", overquantity=").append(overquantity);
+        sb.append(", price=").append(price);
+        sb.append(", steelName=").append(steelName);
+        sb.append(", specName=").append(specName);
+        sb.append(", bodyname=").append(bodyname);
+        sb.append(", businame=").append(businame);
+        sb.append(", overweight=").append(overweight);
+        sb.append(", overmemo=").append(overmemo);
+        sb.append(", wmemo=").append(wmemo);
+        sb.append(", corderBid=").append(corderBid);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -107,7 +107,7 @@
         RC.SSO_CODE "ssoCode",
         RC.COMPANY_ID "id",
         RC.COMPANY_ID "value",
-        RC.COMPANY_NAME "label"
+        RC.COMPANY_TYPE || '-' || RC.COMPANY_NAME "label"
         from RMS_COMPANY RC
         where DELETED = 0        )
         <where>
@@ -117,7 +117,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and !(index!=null and index!='')">
+           <if test="id!=null and id.size>0">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -141,7 +141,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and !(index!=null and index!='')">
+           <if test="id!=null and id.size>0">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -165,7 +165,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and !(index!=null and index!='')">
+           <if test="id!=null and id.size>0">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -193,7 +193,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null and !(index!=null and index!='')">
+            <if test="id!=null and id.size>0">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -217,7 +217,34 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and !(index!=null and index!='')">
+           <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getCapacityByLike" resultType="java.util.Map">
+        select * from (
+            SELECT DISTINCT
+            RCA .CAPACITY_ID "id",
+            RCA .CAPACITY_ID "value",
+            RCA .CAPACITY_NUMBER "label"
+            FROM RMS_CAPACITY RCA
+            LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
+            LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
+            WHERE RCA .DELETED = 0
+            <if test="orgCode!=null and orgCode!=''">
+                AND RC.SSO_CODE = #{orgCode}
+            </if>
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and id.size>0">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -241,7 +268,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and !(index!=null and index!='')">
+           <if test="id!=null and id.size>0">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}
@@ -265,7 +292,7 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null and !(index!=null and index!='')">
+            <if test="id!=null and id.size>0">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
                     #{item}