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

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

@@ -87,10 +87,40 @@ public class AMScontroller {
     })
     @PostMapping(value = "/purchaseRequirementAdd")
     @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
-    public Map<String, Object> purchaseRequirementAdd(@RequestBody(required = false) Map<String, Object> map) {
+    public Map<String, Object> purchaseRequirementAdd(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+
         return amsFeign.purchaseRequirementAdd(map);
     }
 
+    @ApiOperation(value = "生产需求新增接口", notes = "生产需求新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionRequirementAdd")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> productionRequirementAdd(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        map.put("insertUsername", map.get("userName").toString());
+        if (map.containsKey("requirementStartTime")){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
+            map.put("requirementStartTime", requirementStartTime);
+        }
+
+        if (map.containsKey("requirementEndTime")){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
+            map.put("requirementEndTime", requirementEndTime);
+        }
+        if (map.containsKey("dueTime")){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
+            map.put("dueTime", dueTime);
+        }
+
+
+        return amsFeign.productionRequirementAdd(map);
+    }
+
     @ApiOperation(value = "采购需求修改接口", notes = "采购需求修改接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -110,7 +140,41 @@ public class AMScontroller {
     public Map<String, Object> purchaseRequirementChange(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementChange(map);
     }
+    @ApiOperation(value = "生产需求修改接口", notes = "生产需求修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionStatusUpdate")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
+    public Map<String, Object> productionStatusUpdate(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionStatusUpdate(map);
+    }
+    @ApiOperation(value = "生产需求状态修改接口", notes = "生产需求状态修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionRequirementChange")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
+    public Map<String, Object> productionRequirementChange(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionRequirementChange(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 = "/getproductionRequirementList")
+    Map<String, Object> getproductionRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize
+    ) {
+        return amsFeign.getproductionRequirementList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
     @ApiOperation(value = "展示采购需求详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -228,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"),
@@ -275,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/UniversalController.java

@@ -50,7 +50,7 @@ public class UniversalController extends BaseRESTfulController {
     @Autowired
     private ImageFileUtils imageFileUtils;
 
-    @ApiModelProperty(value = "边输边查物资类型")
+    @ApiModelProperty(value = "边输边查物资大类")
     @GetMapping("/getMaterialTypeByLike")
     public RESTfulResult getMaterialTypeByLike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
@@ -60,6 +60,26 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查物资")
+    @GetMapping("/getMaterialByLike")
+    public RESTfulResult getMaterialByLike(String index,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getMaterialByLike(map);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查运力类型")
+    @GetMapping("/getCapacityTypeByLike")
+    public RESTfulResult getCapacityTypeByLike(String index,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getCapacityTypeByLike(map);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查公司单位")
     @GetMapping("/getCompanyMesByLike")
     public RESTfulResult getCompanyMesByLike(String index,String companyType,@RequestParam(required = false) List<String> id) {
@@ -113,7 +133,15 @@ public class UniversalController extends BaseRESTfulController {
         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) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        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) {
@@ -134,6 +162,16 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> list = universalMapper.getTransRangeByLike(map);
         return success(list);
     }
+
+    @ApiModelProperty(value = "边输边查作业路径")
+    @GetMapping("/getLineByLike")
+    public RESTfulResult getLineByLike(String index,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getLineByLike(map);
+        return success(list);
+    }
     @ApiOperation("上传文件通用方法,返回成功后的url")
     @PostMapping("/uploadFile")
     public RESTfulResult uploadFile(MultipartRequest request) throws Exception {

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,15 +30,30 @@ 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")
     Map<String, Object> purchaseRequirementAdd(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementAdd")
+    Map<String, Object> productionRequirementAdd(Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getproductionRequirementList")
+    Map<String, Object> getproductionRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam  Integer apiId,
+                                                   @RequestParam  Integer pageNum,
+                                                   @RequestParam  Integer pageSize);
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionStatusUpdate")
+    Map<String, Object> productionStatusUpdate(Map<String, Object> map);
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChange")
+    Map<String, Object> productionRequirementChange(Map<String, Object> map);
+
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementUpdate")
     Map<String, Object> purchaseRequirementUpdate(Map<String, Object> map);
 
@@ -46,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);
@@ -70,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/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

@@ -19,17 +19,24 @@ public interface UniversalMapper {
     List<Map<String, Object>> getCompanyMesByLike(Map<String, Object> map);
 
     List<Map<String, Object>> getMaterialTypeByLike(Map<String, Object> map);
+    List<Map<String, Object>> getMaterialByLike(Map<String, Object> map);
+
+    List<Map<String, Object>> getCapacityTypeByLike(Map<String, Object> map);
+
 
     List<Map<String, Object>> getEmissionStandardByLike(Map<String, Object> map);
 
     List<Map<String, Object>> getOperationPointByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getCategoryCodeByLike(Map<String, Object> map);
+
+
     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

@@ -133,7 +133,7 @@
         select * from(
         select
         MATERIAL_TYPE_ID "materialTypeId",
-        MATERIAL_TYPE_NAME "materialTypeName",
+            MATERIAL_TYPE_NAME "materialTypeName",
         MATERIAL_TYPE_ID "id",
         MATERIAL_TYPE_ID "value",
         MATERIAL_TYPE_NAME "label"
@@ -284,7 +284,7 @@
         select * from(
         select
         RC.TRANS_RANGE_ID "transrangeId",
-        RC.TRANS_RANGE_NAME "transrangeName",
+            RC.TRANS_RANGE_NAME "transrangeName",
         RC.TRANS_RANGE_ID "id",
         RC.TRANS_RANGE_ID "value",
         RC.TRANS_RANGE_NAME "label"
@@ -304,5 +304,103 @@
         </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
+    <select id="getCategoryCodeByLike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.RULES_ID "rulesId",
+        RC.RULES_CODE "rulesCode",
+        RC.RULES_ID "id",
+        RC.RULES_ID "value",
+        RC.RULES_CODE "label"
+        from RMS_DEMAND_RULES RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and !(index!=null and index!='')">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getCapacityTypeByLike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.CAPACITY_TYPE_ID "capacityTypeId",
+        RC.CAPACITY_TYPE_NAME "capacityTypeName",
+        RC.CAPACITY_TYPE_ID "id",
+        RC.CAPACITY_TYPE_ID "value",
+        RC.CAPACITY_TYPE_NAME "label"
+        from RMS_CAPACITY_TYPE RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and !(index!=null and index!='')">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+
+    </select>
+    <select id="getLineByLike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.LINE_ID "lineId",
+        RC.LINE_NAME "lineName",
+        RC.LINE_ID "id",
+        RC.LINE_ID "value",
+        RC.LINE_NAME "label"
+        from RMS_LINE RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and !(index!=null and index!='')">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getMaterialByLike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.MATERIAL_ID "materialId",
+        RC.MATERIAL_NAME "materialName",
+        RC.MATERIAL_ID "id",
+        RC.MATERIAL_ID "value",
+        RC.MATERIAL_NAME "label"
+        from RMS_MATERIAL RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and !(index!=null and index!='')">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+
+    </select>
 
 </mapper>