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

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

@@ -7,6 +7,7 @@ import com.steerinfo.dil.mapper.LogResultMapper;
 import com.steerinfo.dil.model.LogResult;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
+import lombok.extern.java.Log;
 import org.apache.log4j.Logger;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -21,10 +22,7 @@ import org.springframework.stereotype.Component;
 import java.lang.reflect.Method;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 日志 Aspect切面,编写切入点的方法
@@ -103,30 +101,52 @@ public class LogAspect {
             //获取执行时间
             long exeCost = System.currentTimeMillis() - beginTime.getTime();
             if(RESTfulResult.SUCCEED.equals(result.getStatus())){
-                //执行成功，记录日志
-                Map<String,Object> data =(Map<String,Object>) result.getData();
-                //记录正常日志
+                //执行成功，记录正常日志
                 log.info("方法返回：" + JSON.toJSONString(result));
                 log.info("执行时间（ms）："+exeCost);
                 log.info("执行===" + methodName + "===成功");
-                //记录到数据库
-                List<LogResult> logResults=new ArrayList<>();
-                for(int i=0 ; i<foreignKeys.length ; i++){
-                    LogResult logResult=new LogResult();
-                    logResult.setLogId(logResultMapper.nextId());
-                    logResult.setForeignKeyId(DataChange.dataToBigDecimal(data.get(foreignKeys[i])));
-                    logResult.setForeignKeyType(foreignKeyTypes[i]);
-                    logResult.setLogContent(map.get("userName")+":"+result.getMessage());
-                    logResult.setMethodName(""+signature);
-                    logResult.setMethodDescription(description);
-                    logResult.setInsertTime(beginTime);
-                    logResult.setExeCost(DataChange.dataToBigDecimal(exeCost));
-                    logResult.setFilePath(logPrefix+format.format(beginTime));
-                    logResult.setInsertUsername(""+map.get("userId"));
-                    logResult.setRemark("自动记录");
-                    logResults.add(logResult);
+                try{
+                    //data数组
+                    List<Map<String,Object>> datas = new ArrayList<>();
+                    //记录到数据库
+                    List<LogResult> logResults=new ArrayList<>();
+                    //检查返回data类型
+                    if(result.getData() instanceof Map){
+                        Map<String,Object> data =(Map) result.getData();
+                        datas.add(data);
+                    }else if(result.getData() instanceof List){
+                        datas =(List) result.getData();
+                    }else{
+                        throw new Exception("无法处理的数据类型！");
+                    }
+                    //批量处理
+                    for(Map<String,Object> data : datas){
+                        for(int i=0 ; i<foreignKeys.length ; i++){
+                            if(data.get(foreignKeys[i]) != null){
+                                LogResult logResult=new LogResult();
+                                logResult.setLogId(logResultMapper.nextId());
+                                logResult.setForeignKeyId(DataChange.dataToBigDecimal(data.get(foreignKeys[i])));
+                                logResult.setForeignKeyType(foreignKeyTypes[i]);
+                                logResult.setLogContent(map.get("userName")+":"+result.getMessage());
+                                logResult.setMethodName(""+signature);
+                                logResult.setMethodDescription(description);
+                                logResult.setInsertTime(beginTime);
+                                logResult.setExeCost(DataChange.dataToBigDecimal(exeCost));
+                                logResult.setFilePath(logPrefix+format.format(beginTime));
+                                logResult.setInsertUsername(""+map.get("userId"));
+                                logResult.setRemark("自动记录");
+                                logResults.add(logResult);
+                            }
+                        }
+                    }
+                    if(logResults.size() > 0){
+                        logResultMapper.batchInsert(logResults);
+                    }else{
+                        throw new Exception("目标foreignKey不存在！");
+                    }
+                }catch (Exception e){
+                    log.info("记录日志失败："+e.getMessage());
                 }
-                logResultMapper.batchInsert(logResults);
             }else{
                 //记录失败日志
                 log.info("方法返回：" + JSON.toJSONString(result));

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

@@ -33,6 +33,7 @@ public class RequestFilter implements Filter {
            String orgCode = httpRequest.getHeader("orgcode");
            String roleCodes = httpRequest.getHeader("rolecodes");
            String dilCompanyList = httpRequest.getHeader("dilCompanyList");
+           String rootCompanyMap = httpRequest.getHeader("rootCompanyMap");
            //获取cookie用户数据
            if (cookies != null && cookies.length > 0) {
                for (Cookie cookie : cookies) {
@@ -46,8 +47,10 @@ public class RequestFilter implements Filter {
                        roleCodes = URLDecoder.decode(cookie.getValue(), "utf-8");
                    } else if (cookie.getName().equals("dilCompanyList") && dilCompanyList == null) {
                        dilCompanyList = URLDecoder.decode(cookie.getValue(),"utf-8");
+                   } else if (cookie.getName().equals("rootCompanyMap") && rootCompanyMap == null) {
+                       rootCompanyMap = URLDecoder.decode(cookie.getValue(),"utf-8");
                    }
-                   else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null) {
+                   else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null && rootCompanyMap != null) {
                        //都查到了，退出
                        break;
                    }
@@ -58,8 +61,7 @@ public class RequestFilter implements Filter {
                orgCode = URLDecoder.decode(orgCode, "utf-8");
                roleCodes = URLDecoder.decode(roleCodes, "utf-8");
                dilCompanyList = URLDecoder.decode(dilCompanyList,"UTF-8");
-
-
+               rootCompanyMap = URLDecoder.decode(rootCompanyMap,"utf-8");
                //System.out.println(dilCompanyList.getClass().toString());
            }catch (Exception e){}
            httpRequest.setAttribute("userId", userId);
@@ -68,6 +70,8 @@ public class RequestFilter implements Filter {
            httpRequest.setAttribute("roleCodes", roleCodes);
            Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
            httpRequest.setAttribute("dilCompanyList",dilCompanyListObject);;
+           Object rootCompanyMapObject = JSONObject.parse(rootCompanyMap);
+           httpRequest.setAttribute("rootCompanyMap",rootCompanyMapObject);
            //获取RequestBody数据
            BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
            StringBuilder strBuilder = new StringBuilder();
@@ -83,6 +87,7 @@ public class RequestFilter implements Filter {
                params.put("orgCode", orgCode);
                params.put("roleCodes",roleCodes);
                params.put("dilCompanyList",dilCompanyListObject);
+               params.put("rootCompanyMap",rootCompanyMapObject);
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
                chain.doFilter(requestWrapper, response);

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

@@ -159,6 +159,8 @@ public class AMScontroller {
     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>")
@@ -169,6 +171,15 @@ public class AMScontroller {
         return amsFeign.productionRequirementChange(map);
     }
 
+    @ApiOperation(value = "生产需求状态修改接口批量", notes = "生产需求状态修改接口批量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionRequirementChangeList")
+    public Map<String, Object> productionRequirementChangeList(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionRequirementChangeList(map);
+    }
+
 
     @ApiOperation(value = "展示生产需求详情")
     @ApiImplicitParams({
@@ -453,6 +464,23 @@ public class AMScontroller {
         return amsFeign.selectSaleContractPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
 
+
+    @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 = "/selectSaleOrderPage")
+    Map<String, Object> selectSaleOrderPage(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize){
+        return amsFeign.selectSaleOrderPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+
     @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -463,6 +491,18 @@ public class AMScontroller {
         return amsFeign.productionPlanAdd(map);
     }
 
+    @ApiOperation(value = "生产计划批量新增接口", notes = "生产计划批量新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionPlanAddList")
+    public Map<String, Object> productionPlanAddList(@RequestBody Map<String, Object> map) {
+        return amsFeign.productionPlanAddList(map);
+    }
+
+
+
+
     @ApiOperation(value = "展示生产订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -607,4 +647,35 @@ public class AMScontroller {
         return amsFeign.getproductionRequirementworkflowList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
     }
+
+
+    @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 = "/getProductPlanList")
+    Map<String, Object> getProductPlanList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize){
+        return amsFeign.getProductPlanList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+
+    @ApiOperation("停用计划")
+    @PostMapping("/deactivatedPlan")
+    Map<String,Object> deactivatedPlan(@RequestBody Map<String,Object> map) {
+        return amsFeign.deactivatedPlan(map);
+    }
+
+    @ApiOperation("需求审批详情")
+    @PostMapping("/requirementApproveDetails")
+    Map<String,Object> requirementApproveDetails(@RequestBody Map<String,Object> map) {
+        return amsFeign.requirementApproveDetails(map);
+    }
+
+
 }

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

@@ -33,14 +33,6 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @Autowired
     private BackgroundProcessingMapper backgroundProcessingMapper;
 
-    @Autowired
-    private BackgroundProcessingServiceImpl backgroundProcessingService;
-
-    @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
-
-    @Autowired
-    private UniversalMapper universalMapper;
 
     @Resource
     SSOUtil ssoUtil;
@@ -54,9 +46,11 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
             // 根据用户名去查询该用户绑定的公司及下属公司
             List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
-            List<Map<String,Object>> currentCompanyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
+            Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
+            //List<Map<String,Object>> currentCompanyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
             userInfo.put("dilCompanyList", companyList);
-            userInfo.put("currentCompanyList",currentCompanyList);
+            userInfo.put("rootCompanyMap",rootCompanyMap);
+            //userInfo.put("currentCompanyList",currentCompanyList);
             // 根据查询到的公司ID
             //System.out.println(userInfo);
             //// 获取机构

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

@@ -120,6 +120,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.updateTransOrder(map);
     }
 
+    @ApiOperation(value = "合并运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/mergeTransOrder")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> mergeTransOrder(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.mergeTransOrder(map);
+    }
+
     @ApiOperation(value = "更改运输订单状态")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/changeTransOrder")
@@ -180,7 +188,6 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value="计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @RequestLimit()
     @PostMapping(value = "/startend")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计时"})
     public Map<String, Object> start(@RequestBody(required = false) Map<String, Object> map) {
@@ -458,16 +465,18 @@ public class TMSController extends BaseRESTfulController {
         if (capacities.length != list.size()) {
             throw new Exception("车号不允许重复！");
         } else {
-            new Runnable() {
-                @Override
-                public void run() {
-                    Map<String, Object> capacityMap = new HashMap<>();
-                    capacityMap.put("capacities", capacities);
-                    capacityMap.put("userId", userId);
-                    capacityMap.put("userName", userName);
-                    rmsFeign.batchInsertCapacityTrain(capacityMap);
-                }
-            }.run();
+            try{
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        Map<String, Object> capacityMap = new HashMap<>();
+                        capacityMap.put("capacities", capacities);
+                        capacityMap.put("userId", userId);
+                        capacityMap.put("userName", userName);
+                        rmsFeign.batchInsertCapacityTrain(capacityMap);
+                    }
+                }.run();
+            }catch (Exception e){e.printStackTrace();}
         }
         //新增AMS及TMS
         map.put("userId",userId);
@@ -486,7 +495,7 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value = "采购火运装货作业")
+    @ApiOperation(value = "采购火运计量作业")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseTrainWeight")
 //    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计量实绩"})
@@ -578,6 +587,7 @@ public class TMSController extends BaseRESTfulController {
             }
             //校验数据
             String requirementNumber = item.get("通知单号").toString();
+            BigDecimal weight = DataChange.dataToBigDecimal(item.get("净重"));
             if (map.get("requirementNumber") != null) {
                 if (map.get("requirementNumber").equals(requirementNumber)) {
                     String unloadTime = map.get("unloadTime").toString();
@@ -587,9 +597,11 @@ public class TMSController extends BaseRESTfulController {
                 } else {
                     throw new Exception("同一个Excel文件中只允许有一个通知单号！");
                 }
+                map.put("weight", weight.add(DataChange.dataToBigDecimal(map.get("weight"))));
             } else {
                 //不存在，新增
                 map.put("requirementNumber", requirementNumber);
+                map.put("weight", weight);
                 map.put("unloadTime",item.get("卸车日期").toString());
             }
             //车牌号去重
@@ -628,4 +640,32 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> changeSaleTransOrder(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.changeSaleTransOrder(map);
     }
+
+
+    @ApiOperation(value = "查询司机运输汇总")
+    @PostMapping("/getDriverTotalResult")
+    public Map<String, Object> getDriverTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return tmsFeign.getDriverTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+
+    @ApiOperation(value = "查询车辆运输汇总")
+    @PostMapping("/getCapacityTotalResult")
+    public Map<String, Object> getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return tmsFeign.getDriverTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation("生产物流-调度任务新增")
+    @PostMapping("/dispatchTask")
+    Map<String,Object> dispatchTask(@RequestBody Map<String,Object> map) {
+        return tmsFeign.dispatchTask(map);
+    }
 }

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

@@ -95,7 +95,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查作业点")
     @PostMapping("/getOperationPointByLike")
     public RESTfulResult getOperationPointByLike(@RequestBody(required = false) Map<String,Object> map) {
-        System.out.println(map.get("id"));
+        //System.out.println(map.get("id"));
         List<Map<String, Object>> list = universalMapper.getOperationPointByLike(map);
         return success(list);
     }
@@ -103,6 +103,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查人员")
     @PostMapping("/getPersonnelByLike")
     public RESTfulResult getPersonnelByLike(@RequestBody(required = false) Map<String,Object> map) {
+        DataChange.getMonthStartEnd(map);
         List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
         return success(list);
     }

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

@@ -149,5 +149,64 @@ public class WMSController extends BaseRESTfulController {
     public Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.delete(map);
     }
+
+    @ApiOperation(value = "查询实时库存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/getGridMaterialList")
+    public Map<String, Object> getGridMaterialList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return wmsFeign.getGridMaterialList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value = "查询入库实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/getInboundList")
+    public Map<String, Object> getInboundList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return wmsFeign.getInboundList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "入库")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"inboundResultId"}, foreignKeyTypes = {"入库实绩"})
+    @PostMapping("/inbound")
+    public Map<String, Object> inbound(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.inbound(map);
+    }
+
+    @ApiOperation(value = "查询出库实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/getOutboundList")
+    public Map<String, Object> getOutboundList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize) {
+        return wmsFeign.getOutboundList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "出库")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"outboundResultId"}, foreignKeyTypes = {"出库实绩"})
+    @PostMapping("/outbound")
+    public Map<String, Object> outbound(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.outbound(map);
+    }
 }
 

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

@@ -56,6 +56,10 @@ public interface AmsFeign {
     Map<String, Object> productionRequirementChange(Map<String, Object> map);
 
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChangeList")
+    Map<String, Object> productionRequirementChangeList(@RequestBody Map<String, Object> map);
+
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementUpdate")
     Map<String, Object> purchaseRequirementUpdate(Map<String, Object> map);
 
@@ -119,6 +123,12 @@ public interface AmsFeign {
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/ams/amsorders/selectSaleOrderPage")
+    Map<String, Object> selectSaleOrderPage(@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,
@@ -166,6 +176,14 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAdd")
     Map<String, Object> productionPlanAdd(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAddList")
+    Map<String, Object> productionPlanAddList(@RequestBody Map<String, Object> map);
+
+
+
+
+
     @PostMapping("api/v1/ams/amstransplans/getproductionPlanList")
     Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
                                              @RequestParam Integer apiId,
@@ -216,4 +234,17 @@ public interface AmsFeign {
                                                      @RequestParam  Integer pageNum,
                                                      @RequestParam  Integer pageSize);
 
+
+    @PostMapping(value = "api/v1/ams/amstransplans/getProductPlanList")
+    Map<String, Object> getProductPlanList(@RequestBody Map<String, Object> objectMap,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/deactivatedPlan")
+    Map<String, Object> deactivatedPlan(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/requirementApproveDetails")
+    Map<String, Object> requirementApproveDetails(@RequestBody Map<String, Object> map);
+
 }

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

@@ -46,6 +46,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/updateTransOrder")
     Map<String, Object> updateTransOrder(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/omstransorders/mergeTransOrder")
+    Map<String, Object> mergeTransOrder(@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,
@@ -219,6 +222,22 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/changeSaleTransOrder")
     Map<String, Object> changeSaleTransOrder(Map<String, Object> map);
 
+
+    @PostMapping("api/v1/tms/omstransorders/getDriverTotalResult")
+    Map<String, Object> getDriverTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/omstransorders/getCapacityTotalResult")
+    Map<String, Object> getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping(value = "/api/v1/tms/omstransorders/dispatchTask")
+    Map<String, Object> dispatchTask(@RequestBody Map<String, Object> map);
+
 }
 
 

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

@@ -70,4 +70,24 @@ public interface WMSFeign {
     Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
 
 
+    @PostMapping("api/v1/wms/wmsgridmaterials/getGridMaterialList")
+    Map<String, Object> getGridMaterialList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/wms/wmsinboundresults/getInboundList")
+    Map<String, Object> getInboundList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/wms/wmsinboundresults/inbound")
+    Map<String, Object> inbound(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/wms/wmsoutboundresults/getOutboundList")
+    Map<String, Object> getOutboundList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/wms/wmsoutboundresults/outbound")
+    Map<String, Object>outbound(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -90,4 +90,6 @@ public interface BackgroundProcessingMapper {
 
     List<Map<String, Object>> getCurrentCompanyList(String loginName);
 
+    Map<String,Object> getCompanyRootMap(String loginName);
+
 }

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

@@ -4,10 +4,12 @@ import com.steerinfo.dil.model.LogResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface LogResultMapper extends IBaseMapper<LogResult, BigDecimal> {
     @Select("select SEQ_LOG_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
     BigDecimal nextId();
 }

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.util;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -266,4 +267,26 @@ public class DataChange {
         map.put("startDate", dayStartTime + " 00:00:00");
         map.put("endDate", dayEndTime + " 00:00:00");
     }
+
+    public static void getMonthStartEnd(Map<String,Object> map) {
+        //
+        Calendar cale = Calendar.getInstance();
+
+        // 获取当月第一天和最后一天
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String firstDay, lastDay;
+        // 获取前月的第一天
+        cale.add(Calendar.MONTH, 0);
+        cale.set(Calendar.DAY_OF_MONTH, 1);
+        firstDay = format.format(cale.getTime());
+        // 获取前月的最后一天
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 1);
+        cale.set(Calendar.DAY_OF_MONTH, 0);
+        lastDay = format.format(cale.getTime());
+        System.out.println("本月第一天和最后一天分别是 ： " + firstDay + " and " + lastDay);
+        map.put("firstDay",firstDay);
+        map.put("lastDay",lastDay);
+
+    }
 }

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

@@ -22,7 +22,8 @@
     <select id="getCompanyList" resultType="java.util.Map">
         SELECT distinct rc.company_id "companyId",
                rc.COMPANY_TYPE "companyType",
-               rc.DELETED "deleted" FROM RMS_COMPANY RC
+               rc.DELETED "deleted",
+               level "level" FROM RMS_COMPANY RC
         START WITH RC.COMPANY_ID IN (
         SELECT RPC.COMPANY_ID FROM RMS_PERSONNEL RP
         LEFT JOIN RMS_PERSONNEL_COMPANY RPC on RP.PERSONNEL_ID = RPC.PERSONNEL_ID
@@ -46,5 +47,22 @@
         AND
         RP.PERSONNEL_JOB_NUMBER = #{userName}
     </select>
+    <select id="getCompanyRootMap" resultType="java.util.Map">
+        SELECT DISTINCT
+            rc.company_id "rootCompanyId",
+            rc.COMPANY_NAME "rootCompanyName"
+        FROM
+            RMS_COMPANY RC START WITH RC.COMPANY_ID IN (
+            SELECT
+                RPC.COMPANY_ID
+            FROM
+                RMS_PERSONNEL RP
+                    LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
+            WHERE
+                RPC.DELETED = 0
+              AND RP.PERSONNEL_JOB_NUMBER = #{userName}
+        ) CONNECT BY PRIOR rc.PARENT_COMPANY_ID = RC.COMPANY_ID
+        ORDER BY LEVEL DESC FETCH NEXT 1 ROW ONLY
+    </select>
 
 </mapper>

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

@@ -9,8 +9,15 @@
             </if>
         </if>
     </sql>
-
-
+    <sql id="companyFilter">
+        <if test="!roleCodes.contains('admin') and dilCompanyList != null and dilCompanyList.size > 0">
+            AND ${prop}
+            in
+            <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
+                #{item.companyId}
+            </foreach>
+        </if>
+    </sql>
     <!--   查询所有的汽车衡  -->
     <select id="getColumnNoRoutList" resultType="java.lang.String" parameterType="map">
         select DTCR.COLUMN_NAME from DIL_TABLE_COLUMN_ROLE DTCR
@@ -81,37 +88,123 @@
     <select id="getCompanyMesByLike" resultType="java.util.Map">
         select * from(
         select
-        RC.COMPANY_ID "companyId",
-        RC.COMPANY_NAME "companyName",
-        RC.COMPANY_TYPE "companyType",
         RC.SSO_ID "ssoId",
         RC.SSO_CODE "ssoCode",
         RC.COMPANY_ID "id",
+        RC.COMPANY_ID   "key",
         RC.COMPANY_ID "value",
         <if test="companyType==null">
             RC.COMPANY_TYPE || '-' ||
         </if>
         RC.COMPANY_NAME "label",
-        RC.COMPANY_NAME "text"
+        RC.COMPANY_NAME "text",
+        T2 ."rootCompanyId",
+        T2 ."rootCompanyName",
+        'label' "prop"
         from RMS_COMPANY RC
-        where DELETED = 0        )
+        LEFT JOIN (
+            SELECT "companyId",MAX("level") "rootIndex" FROM
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            )
+            GROUP BY "companyId"
+        ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+        LEFT JOIN
+        (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
         <where>
+            DELETED = 0
             <if test="companyType!=null and companyType!=''">
-                AND "companyType" = #{companyType}
+                AND RC.COMPANY_TYPE = #{companyType}
+            </if>
+            <if test="companyId!=null and companyId!=''">
+                AND RC.COMPANY_ID = #{companyId}
+            </if>
+            <if test="businessCompanyId!=null and businessCompanyId!=''">
+                AND RC.COMPANY_ID = #{businessCompanyId}
+            </if>
+            <if test="carrierId!=null and carrierId!=''">
+                AND RC.COMPANY_ID = #{carrierId}
             </if>
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
             </if>
-           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
-                AND "id" in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
+            <if test="!roleCodes.contains('admin') and dilCompanyList != null and dilCompanyList.size > 0">
+                AND RC.COMPANY_ID in
+                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
+                    #{item.companyId}
                 </foreach>
             </if>
         </where>
-        FETCH NEXT 10 ROWS ONLY
+        <if test="noRow == null">
+            FETCH NEXT 10 ROWS ONLY
+        </if>
+        )
+        <if test="id!=null and id.size>0">
+        UNION
+            select
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID   "key",
+            RC.COMPANY_ID "value",
+            <if test="companyType==null">
+                RC.COMPANY_TYPE || '-' ||
+            </if>
+            RC.COMPANY_NAME "label",
+            RC.COMPANY_NAME "text",
+            T2 ."rootCompanyId",
+            T2 ."rootCompanyName",
+            'label' "prop"
+            from RMS_COMPANY RC
+            LEFT JOIN (
+                SELECT "companyId",MAX("level") "rootIndex" FROM
+                (
+                SELECT
+                RC.COMPANY_ID "rootCompanyId",
+                RC.COMPANY_NAME "rootCompanyName",
+                LEVEL "level",
+                CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+                FROM
+                RMS_COMPANY RC
+                CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+                )
+                GROUP BY "companyId"
+            ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+            LEFT JOIN
+            (
+                SELECT
+                RC.COMPANY_ID "rootCompanyId",
+                RC.COMPANY_NAME "rootCompanyName",
+                LEVEL "level",
+                CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+                FROM
+                RMS_COMPANY RC
+                CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+            where RC.COMPANY_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getMaterialTypeByLike" resultType="java.util.Map">
+        select * from(
         select * from(
         select
         MATERIAL_TYPE_ID "materialTypeId",
@@ -131,6 +224,9 @@
             <if test="remark!=null and remark!=''">
                 AND REGEXP_LIKE("remark", #{remark})
             </if>
+            <if test="materialTypeId!=null and materialTypeId!=''">
+                AND "materialTypeId" =  #{materialTypeId}
+            </if>
            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -139,6 +235,23 @@
             </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+        UNION
+            select
+            MATERIAL_TYPE_ID "materialTypeId",
+            MATERIAL_TYPE_NAME "materialTypeName",
+            MATERIAL_TYPE_ID "id",
+            MATERIAL_TYPE_ID "value",
+            MATERIAL_TYPE_NAME "label",
+            MATERIAL_TYPE_NAME "text",
+            REMARK "remark"
+            from RMS_MATERIAL_TYPE
+            where MATERIAL_TYPE_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getEmissionStandardByLike" resultType="java.util.Map">
         select * from (
@@ -167,33 +280,31 @@
     </select>
     <select id="getOperationPointByLike" resultType="java.util.Map">
     SELECT * FROM (
-        select * from (
         select
-        OPERATION_POINT_ID "operationPointId",
-        OPERATION_POINT_NAME "operationPointName",
-        OPERATION_POINT_TYPE "operationPointType",
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "label",
         OPERATION_POINT_NAME "text"
         from RMS_OPERATION_POINT
-        where DELETED = 0
-        )
         <where>
+            DELETED = 0
             <if test="operationPointType!=null and operationPointType!=''">
-                AND REGEXP_LIKE("operationPointType", #{operationPointType})
+                AND REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
+            </if>
+            <if test="receivingPointId!=null and receivingPointId!=''">
+                AND OPERATION_POINT_ID = #{receivingPointId}
+            </if>
+            <if test="shippingPointId!=null and shippingPointId!=''">
+                AND OPERATION_POINT_ID =  #{shippingPointId}
             </if>
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
             </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
     )
     <if test="id!=null and id.size>0">
         UNION select
-        OPERATION_POINT_ID "operationPointId",
-        OPERATION_POINT_NAME "operationPointName",
-        OPERATION_POINT_TYPE "operationPointType",
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "label",
@@ -212,11 +323,12 @@
         PERSONNEL_ID "personnelId",
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
+        PERSONNEL_PHONE "personnelPhone",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
-        PERSONNEL_NAME "text"
-
+        PERSONNEL_NAME "text",
+        'personnelName' "prop"
         from RMS_PERSONNEL
         where DELETED = 0
         )
@@ -224,6 +336,15 @@
             <if test="personnelPost!=null and personnelPost!=''">
                 AND "personnelPost" = #{personnelPost}
             </if>
+            <if test="personnelId!=null and personnelId!=''">
+                AND "personnelId" = #{personnelId})
+            </if>
+            <if test="driverId!=null and driverId!=''">
+                AND "personnelId" = #{driverId})
+            </if>
+            <if test="driverId2!=null and driverId2!=''">
+                AND "personnelId" = #{driverId2})
+            </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
@@ -236,10 +357,12 @@
         PERSONNEL_ID "personnelId",
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
+        PERSONNEL_PHONE "personnelPhone",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
-        PERSONNEL_NAME "text"
+        PERSONNEL_NAME "text",
+        'personnelName' "prop"
         from RMS_PERSONNEL
         WHERE PERSONNEL_ID in
         <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -254,13 +377,15 @@
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
             RCA .CAPACITY_NUMBER "label",
-            RCA .CAPACITY_NUMBER "text"
+            RCA .CAPACITY_NUMBER "text",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            'capacityNumber' "prop"
             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
             LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
             WHERE RCA .DELETED = 0
-            <if test="orgCode!=null and orgCode !='' and roleCodes.contains('chengyunshang')">
+            <if test="orgCode!=null and orgCode !='' and roleCodes.contains('chengYunShang')">
                 AND RC.SSO_CODE = #{orgCode}
             </if>
             <if test="capacityType != null and capacityType != '' ">
@@ -272,6 +397,15 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(RCA .CAPACITY_NUMBER, #{index})
             </if>
+            <if test="capacityId!=null and capacityId!=''">
+                AND RCA .CAPACITY_ID = #{capacityId}
+            </if>
+            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
+                AND RCA .CAPACITY_ID in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
             FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -281,7 +415,9 @@
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
             RCA .CAPACITY_NUMBER "label",
-            RCA .CAPACITY_NUMBER "text"
+            RCA .CAPACITY_NUMBER "text",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            'capacityNumber' "prop"
             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
@@ -335,6 +471,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
+            <if test="transrangeId!=null and transrangeId!=''">
+                AND "transrangeId" =  #{transrangeId}
+            </if>
             <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -389,6 +528,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(RCT.CAPACITY_TYPE_NAME, #{index})
             </if>
+            <if test="capacityTypeId!=null and capacityTypeId!=''">
+                AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
+            </if>
         </where>
         GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
         FETCH NEXT 10 ROWS ONLY
@@ -447,6 +589,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label" || "points", #{index})
             </if>
+            <if test="lineId!=null and lineId!=''">
+                AND "lineId" = #{lineId}
+            </if>
             <if test="lineType!=null and lineType!=''">
                 AND REGEXP_LIKE("lineType" , #{lineType})
             </if>
@@ -495,19 +640,28 @@
         RC.MATERIAL_NAME "text"
         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 id.size>0 and !(index!=null and index!='')">
-                AND "id" in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
-                </foreach>
+                AND REGEXP_LIKE(RC.MATERIAL_NAME, #{index})
             </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+        UNION
+            select
+            RC.MATERIAL_ID "materialId",
+            RC.MATERIAL_NAME "materialName",
+            RC.MATERIAL_ID "id",
+            RC.MATERIAL_ID "value",
+            RC.MATERIAL_NAME "label",
+            RC.MATERIAL_NAME "text"
+            from RMS_MATERIAL RC
+            WHERE RC.MATERIAL_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="countTrainLoad" resultType="java.lang.Integer">
         SELECT COUNT(*)
@@ -528,10 +682,11 @@
         </where>
     </select>
     <select id="getBusinessTypeLike" resultType="java.util.Map">
+        select * from(
         select * from(
         select
-        DBT.BUSINESS_TYPE_ID  "businessTypeId",
-        DBT.BUSINESS_TYPE_ID  "id",
+        DBT.BUSINESS_TYPE_ID "businessTypeId",
+        DBT.BUSINESS_TYPE_ID "id",
         DBT.BUSINESS_TYPE_ID "value",
         DBT.BUSINESS_TYPE_NAME "text",
         DBT.BUSINESS_TYPE_NAME "businessTypeName",
@@ -546,10 +701,10 @@
                 AND REGEXP_LIKE("label", #{index})
             </if>
             <if test="businessType!=null and businessType!=''">
-                AND  "businessTypeId" = #{businessType}
+                AND "businessTypeId" = #{businessType}
             </if>
             <if test="businessScene!=null and businessScene!=''">
-                AND  "businessScene" = #{businessScene}
+                AND "businessScene" = #{businessScene}
             </if>
             <if test="transportType!=null and transportType!=''">
                 AND REGEXP_LIKE("transportType", #{transportType})
@@ -557,24 +712,40 @@
             <if test="materialTypeName!=null and materialTypeName!=''">
                 AND REGEXP_LIKE("materialTypeName", #{materialTypeName})
             </if>
-            <if test="id!=null and id.size > 0 and !(index!=null and index!='')">
-                AND "id" in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
-                </foreach>
-            </if>
+
         </where>
         FETCH NEXT 10 ROWS ONLY
+    )
+    <if test="id!=null and id.size > 0">
+        UNION
+        select
+        DBT.BUSINESS_TYPE_ID "businessTypeId",
+        DBT.BUSINESS_TYPE_ID "id",
+        DBT.BUSINESS_TYPE_ID "value",
+        DBT.BUSINESS_TYPE_NAME "text",
+        DBT.BUSINESS_TYPE_NAME "businessTypeName",
+        DBT.BUSINESS_SCENE "businessScene",
+        DBT.BUSINESS_TYPE_NAME "label",
+        DBT.ALTERNATE_FIELDS1 "transportType",
+        DBT.ALTERNATE_FIELDS2 "materialTypeName"
+        from DIL_BUSINESS_TYPE DBT
+        WHERE DBT.BUSINESS_TYPE_ID in
+        <foreach collection="id" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </if>
     </select>
     <select id="findTrainWeight" resultType="java.util.Map">
         <foreach collection="list" item="item"  separator=" UNION " >
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
+            OOC .ORDER_CHILD_ID "transOrderChildId",
             TWR .RESULT_ID "resultId",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
             #{item.毛重} "grossWeight"
             FROM 	OMS_TRANS_ORDER OTO
+            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_WEIGHT_RESULT TWR
                 ON TWR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TWR.NET_WEIGHT_TIME = to_date(#{weightTime}, 'yyyymmdd')
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
@@ -591,10 +762,14 @@
     <select id="findTrainUnload" resultType="java.util.Map">
         <foreach collection="list" item="item"  separator=" UNION " >
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
+            OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
+            ARC .RECEIVING_POINT_ID "unloadPointId",
+            APC .MATERIAL_ID "materialId",
             #{item.车号} "capacityId",
             #{item.净重} "unloadWeight"
             FROM 	OMS_TRANS_ORDER OTO
+            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_UNLOAD_RESULT TUR
             ON TUR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TUR.UNLOAD_START_TIME = to_date(#{unloadTime}, 'yyyymmdd')
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
@@ -628,8 +803,15 @@
         FUEL_TYPE_NAME "text",
         FUEL_TYPE_NAME "label"
         FROM RMS_FUEL_TYPE
-        WHERE DELETED = 0
-        <if test="id!=null and id.size > 0 and !(index!=null and index!='')">
+        <where>
+            DELETED = 0
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE(FUEL_TYPE_NAME, #{index})
+            </if>
+        </where>
+        FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size > 0">
             UNION
             SELECT
             FUEL_TYPE_ID "fuelTypeId",
@@ -644,13 +826,6 @@
                 #{item}
             </foreach>
         </if>
-        )
-        <where>
-            <if test="index!=null and index!=''">
-                AND REGEXP_LIKE("label", #{index})
-            </if>
-        </where>
-        FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getDemandRulesCode" resultType="java.util.Map">
         SELECT * FROM (
@@ -672,11 +847,19 @@
         ON ROP.OPERATION_POINT_ID = RTR.START_POINT_ID
         LEFT JOIN RMS_OPERATION_POINT ROP2
         ON ROP2.OPERATION_POINT_ID = RTR.END_POINT_ID
+        <where>
+            <include refid="companyFilter" >
+                <property name="prop" value="rdb.COMPANY_ID"/>
+            </include>
+        </where>
         )
         <where>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
+            <if test="businessCompanyId!=null and businessCompanyId!=''">
+                AND REGEXP_LIKE("businessCompanyId", #{businessCompanyId})
+            </if>
         </where>
     </select>
 

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,stdout,RUNNING,errorfile
+log4j.rootCategory=INFO,RUNNING,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout