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

# Conflicts:
#	pom.xml
#	src/main/java/com/steerinfo/dil/controller/SystemFileController.java
#	src/main/java/com/steerinfo/dil/controller/TMSController.java
#	src/main/java/com/steerinfo/dil/feign/TmsFeign.java

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-api</artifactId>
-    <version>2.4</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -6,6 +6,8 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.text.ParseException;
+
 @ControllerAdvice
 public class WebExceptionHandler {
 
@@ -18,6 +20,8 @@ public class WebExceptionHandler {
         e.printStackTrace();
         if(e instanceof NullPointerException){
             return new RESTfulResult("500", "操作失败：缺乏必要参数！", e);
+        }else if(e instanceof ParseException){
+            return new RESTfulResult("500", "操作失败：格式转换异常！", e);
         }
         return new RESTfulResult("500", "操作失败:"+e.getMessage(), e);
     }

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

@@ -247,6 +247,17 @@ public class AMScontroller {
         return amsFeign.purchasePlanChange(map);
     }
 
+
+    @ApiOperation(value = "采购火运计划删除接口", notes = "采购火运计划删除接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchaseTrainPlanDelete")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchaseTrainPlanDelete(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchaseTrainPlanDelete(map);
+    }
+
     @ApiOperation(value="同步销售订单")    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售订单"})
@@ -540,4 +551,25 @@ public class AMScontroller {
     ) {
         return amsFeign.getSalePlanList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value = "发运单绑定接口", notes = "发运单绑定接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/bindSale")
+    public RESTfulResult bindSale(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.bindSale(map);
+    }
+
+    @ApiOperation(value = "获取物资数据", notes = "获取物资数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "物料编码", required = true, dataType = "String")
+    })
+    @PostMapping(value = "/getMaterial")
+    public RESTfulResult bindSale(@RequestParam String prodCode,
+                                  Integer apiId,
+                                  Integer pageNum,
+                                  Integer pageSize) {
+        return amsFeign.getMaterial(prodCode, apiId, pageNum, pageSize);
+    }
 }

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

@@ -40,4 +40,14 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @Autowired
     private UniversalMapper universalMapper;
 
+    @ApiOperation("登录接口")
+    @PostMapping("bpLogin")
+    public RESTfulResult bpLogin(String userName,String password,String app_code) {
+
+        backgroundProcessingService.bpLogin(userName);
+        return success();
+    }
+
+
+
 }

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

@@ -772,6 +772,13 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertTransRange(map);
     }
 
+    @ApiOperation(value = "删除运输范围")
+    @PostMapping(value = "/deleteTransRange")
+    @LogAround(foreignKeys = {"transRangeId"}, foreignKeyTypes = "运输范围")
+    public Map<String, Object> deleteTransRange(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.deleteTransRange(map);
+    }
+
 
 
     @ApiOperation(value = "新增集装箱数据")
@@ -998,4 +1005,28 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.rmsexpansecategorysupdate(id,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 = "/getBusinessType")
+    public Map<String, Object> getBusinessType(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
+        return rmsFeign.getBusinessType(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="新增业务类型")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/insertBusinessType")
+    public  Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername", map.get("userName").toString());
+        return  rmsFeign.insertBusinessType(map);
+    }
+
 }

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
@@ -47,6 +48,10 @@ public class SystemFileController extends BaseRESTfulController {
     @Autowired
     ISystemFileService systemFileService;
 
+
+    @Resource
+    SystemFileMapper systemFileMapper;
+
     @Autowired
     SystemFileMapper systemFileMapper;
 
@@ -153,6 +158,7 @@ public class SystemFileController extends BaseRESTfulController {
     @PostMapping("/insertFiles")
     public RESTfulResult insertFiles(String[] fileUuids, String[] fileNames, String[] fileTypes, Map<Object, MultipartFile> FileList, MultipartRequest request) throws Exception {
 
+<<<<<<< .mine
         List<MultipartFile> files = new ArrayList<>();
         int index = -1;
         for (int i = 0; i < 21; i++) {
@@ -161,10 +167,27 @@ public class SystemFileController extends BaseRESTfulController {
                 files.add(file);
                 if (index < 0) {
                     index = i;
+
+
+=======
+        List<MultipartFile> files  = new ArrayList<>();
+        int index=-1;
+        for(int j = 0 ; j < fileTypes.length ; j ++ ) {
+            for(int i=0;i<21;i++) {
+                MultipartFile file = request.getFile("file" +j +"" + i);
+                if (file != null) {
+                    files.add(file);
+                    if (index < 0) {
+                        index = i;
+                    }
+>>>>>>> .theirs
                 }
             }
         }
 
+        if(files.size() == 0) {
+            return failed("传输失败");
+        }
         for (int i = 0; i < fileUuids.length; i++) {
             //获取系统时间
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
@@ -217,7 +240,6 @@ public class SystemFileController extends BaseRESTfulController {
             e.getMessage();
             return failed();
         }
-
     }
 
     @PostMapping("/previewfile2")
@@ -293,5 +315,33 @@ public class SystemFileController extends BaseRESTfulController {
 
     }
 
+    @PostMapping("/previewfileList")
+    public RESTfulResult previewfileList(@RequestBody HashMap map) {
+        String uuid =  map.get("uuid").toString();
+        String[] uuidList = uuid.split(";");
+        //遍历数组，去找文件名称和路径
+        List<Map<String,Object>> mapList = systemFileMapper.getFileInfo(uuidList);
+        List<Map<String,Object>> resultList = new ArrayList<>();
+        for (Map<String,Object> parmas : mapList) {
+            String filename = parmas.get("FILENAME").toString();
+            String filepath = parmas.get("FILEPATH").toString();
+            if (filename == null ||filename.isEmpty()) {
+                return failed("该图片不存在！");
+            }
+            if (filepath == null ||filepath.isEmpty()) {
+                return failed("该图片地址不存在！");
+            }
+            try {
+                Map<String,Object> result = ftpFileUtil.downloadFileNew(filename, filepath);
+                resultList.add(result);
+            } catch (IOException e) {
+                e.getMessage();
+                continue;
+            }
+        }
+        return success(resultList);
+
+    }
+
 
 }

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

@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.FileInputStream;
 import java.math.BigDecimal;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -159,7 +160,11 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.syncWeightResult(map);
     }
 
+<<<<<<< .mine
 
+=======
+
+>>>>>>> .theirs
     @ApiOperation(value="计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @RequestLimit()
@@ -381,7 +386,7 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping(value = "/purchaseTrainLoad")
 //    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
     public Map<String, Object> purchaseTrainLoad(@RequestBody MultipartFile file,
-                                                 String materialType,
+                                                 String businessType,
                                                  String userId,
                                                  String userName) throws Exception {
         File excel = ExcelToolUtils.multipartFileToFile(file);
@@ -396,18 +401,19 @@ public class TMSController extends BaseRESTfulController {
         Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
         List<Map<String, Object>> list = ExcelToolUtils.getExcelList(is, fileName, 0);
-        List<String> capacityIds = new ArrayList<>();
-        for (Map<String, Object> item : list) {
-            capacityIds.add(item.get("车号").toString());
-        }
         map.put("list", list);
-        //校验当前excel是否已经导过
-        if (universalMapper.checkTrainOrder(map) > 0) {
-            throw new Exception("存在24小时内的重复运单！不允许重复导入！");
-        }
         //统计通知单的重量车数和车牌号
         Set<String> capacitySet = new HashSet<>();//车牌号
         for (Map<String, Object> item : list) {
+            //校验行
+            if(item.get("通知单号")==null || item.get("通知单号").equals("")
+                || item.get("车号")==null || item.get("车号").equals("")
+                    || item.get("装车日期")==null || item.get("装车日期").equals("")
+                    || item.get("净重")==null || item.get("净重").equals("")
+                    || item.get("皮重")==null || item.get("皮重").equals("")
+                    || item.get("毛重")==null || item.get("毛重").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/装车日期/净重/皮重/毛重），请检查模板或数据是否正确!");
+            }
             //通知单统计
             String requirementNumber = item.get("通知单号").toString();
             if (map.get("requirementNumber") != null) {
@@ -415,24 +421,34 @@ public class TMSController extends BaseRESTfulController {
                     //已存在，修改
                     BigDecimal weight = DataChange.dataToBigDecimal(map.get("weight"));
                     BigDecimal truckNumber = DataChange.dataToBigDecimal(map.get("truckNumber"));
+                    String loadTime = map.get("loadTime").toString();
                     weight = weight.add(DataChange.dataToBigDecimal(item.get("净重")));
                     truckNumber = truckNumber.add(new BigDecimal(1));
                     map.put("weight", weight);
                     map.put("truckNumber", truckNumber);
+                    if(!loadTime.equals(item.get("装车日期").toString())){
+                        throw new Exception("同一个Excel只允许一批车辆，请检查装车日期！");
+                    }
                 } else {
-                    throw new Exception("同一个Excel文件中只允许有一个采购订单号！");
+                    throw new Exception("同一个Excel文件中只允许有一个通知单号！");
                 }
             } else {
                 //不存在，新增
                 BigDecimal weight = DataChange.dataToBigDecimal(item.get("净重"));
                 BigDecimal truckNumber = new BigDecimal(1);
+                String loadTime = item.get("装车日期").toString();
                 map.put("requirementNumber", requirementNumber);
                 map.put("weight", weight);
                 map.put("truckNumber", truckNumber);
+                map.put("loadTime",loadTime);
             }
             //车牌号去重
             capacitySet.add(item.get("车号").toString());
         }
+        //校验当前excel是否已经导入过
+        if (universalMapper.countTrainLoad(map) > 0) {
+            throw new Exception("存在重复的装车信息！不允许重复导入！");
+        }
         //新增火车运力资源
         String[] capacities = capacitySet.toArray(new String[0]);//车牌号
         if (capacities.length != list.size()) {
@@ -450,10 +466,10 @@ public class TMSController extends BaseRESTfulController {
             }.run();
         }
         //新增AMS及TMS
-        map.put("userId", userId);
-        map.put("userName", userName);
-        map.put("materialType", materialType);
-        return tmsFeign.purchaseTrainLoad(map, userId, userName);
+        map.put("userId",userId);
+        map.put("userName",userName);
+        map.put("businessType",businessType);
+        return tmsFeign.purchaseTrainLoad(map);
     }
 
     @ApiOperation(value = "查询采购火运装货")
@@ -465,6 +481,160 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.purchaseTrainLoadList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+
+    @ApiOperation(value = "采购火运装货作业")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/purchaseTrainWeight")
+//    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计量实绩"})
+    public Map<String, Object> purchaseTrainWeight(@RequestBody MultipartFile file,
+                                                 String businessType,
+                                                 String userId,
+                                                 String userName) throws Exception {
+        File excel = ExcelToolUtils.multipartFileToFile(file);
+        FileInputStream is = null;
+        String fileName = excel.getName();
+        // 解决fileName兼容性问题
+        int lastindex = fileName.lastIndexOf("\\");
+        fileName = fileName.substring(lastindex + 1);
+        if (fileName != null && fileName.length() > 0) {
+            is = new FileInputStream(excel);
+        }
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(is, fileName, 0);
+        map.put("list", list);
+        Set<String> capacitySet = new HashSet<>();//车牌号
+        for (Map<String, Object> item : list) {
+            //校验行
+            if(item.get("通知单号")==null || item.get("通知单号").equals("")
+                    || item.get("车号")==null || item.get("车号").equals("")
+                    || item.get("计量日期")==null || item.get("计量日期").equals("")
+                    || item.get("净重")==null || item.get("净重").equals("")
+                    || item.get("皮重")==null || item.get("皮重").equals("")
+                    || item.get("毛重")==null || item.get("毛重").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/计量日期/净重/皮重/毛重），请检查模板或数据是否正确!");
+            }
+            //校验数据
+            String requirementNumber = item.get("通知单号").toString();
+            if (map.get("requirementNumber") != null) {
+                if (map.get("requirementNumber").equals(requirementNumber)) {
+                    String weightTime = map.get("weightTime").toString();
+                    if(!weightTime.equals(item.get("计量日期").toString())){
+                        throw new Exception("同一个Excel只允许一批车辆，请检查计量日期！");
+                    }
+                } else {
+                    throw new Exception("同一个Excel文件中只允许有一个通知单号！");
+                }
+            } else {
+                //不存在，新增
+                map.put("requirementNumber", requirementNumber);
+                map.put("weightTime",item.get("计量日期").toString());
+            }
+            //车牌号去重
+            capacitySet.add(item.get("车号").toString());
+        }
+        String[] capacities = capacitySet.toArray(new String[0]);//车牌号
+        if (capacities.length != list.size()) {
+            throw new Exception("车号不允许重复！");
+        }
+        map.put("userId",userId);
+        map.put("userName",userName);
+        map.put("businessType",businessType);
+        //获取火车运单及计量详情
+        List<Map<String,Object>> orderList = universalMapper.findTrainWeight(map);
+        if (orderList.size() <= 0) {
+            throw new Exception("未查询到装车信息，请先上传装车作业！");
+        }
+        map.put("orderList",orderList);
+        //新增TMS
+        return tmsFeign.purchaseTrainWeight(map);
+    }
+
+
+    @ApiOperation(value = "查询采购火运计量")
+    @PostMapping("/purchaseTrainWeightList")
+    public Map<String, Object> purchaseTrainWeightList(@RequestBody(required = false) Map<String, Object> map,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize) {
+        return tmsFeign.purchaseTrainWeightList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "采购火运卸车作业")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/purchaseTrainUnload")
+//    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计量实绩"})
+    public Map<String, Object> purchaseTrainUnload(@RequestBody MultipartFile file,
+                                                   String businessType,
+                                                   String userId,
+                                                   String userName) throws Exception {
+        File excel = ExcelToolUtils.multipartFileToFile(file);
+        FileInputStream is = null;
+        String fileName = excel.getName();
+        // 解决fileName兼容性问题
+        int lastindex = fileName.lastIndexOf("\\");
+        fileName = fileName.substring(lastindex + 1);
+        if (fileName != null && fileName.length() > 0) {
+            is = new FileInputStream(excel);
+        }
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(is, fileName, 0);
+        map.put("list", list);
+        Set<String> capacitySet = new HashSet<>();//车牌号
+        for (Map<String, Object> item : list) {
+            //校验行
+            if(item.get("通知单号")==null || item.get("通知单号").equals("")
+                    || item.get("车号")==null || item.get("车号").equals("")
+                    || item.get("卸车日期")==null || item.get("卸车日期").equals("")
+                    || item.get("净重")==null || item.get("净重").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/卸车日期/净重），请检查模板或数据是否正确!");
+            }
+            //校验数据
+            String requirementNumber = item.get("通知单号").toString();
+            if (map.get("requirementNumber") != null) {
+                if (map.get("requirementNumber").equals(requirementNumber)) {
+                    String unloadTime = map.get("unloadTime").toString();
+                    if(!unloadTime.equals(item.get("卸车日期").toString())){
+                        throw new Exception("同一个Excel只允许一批车辆，请检查卸车日期！");
+                    }
+                } else {
+                    throw new Exception("同一个Excel文件中只允许有一个通知单号！");
+                }
+            } else {
+                //不存在，新增
+                map.put("requirementNumber", requirementNumber);
+                map.put("unloadTime",item.get("卸车日期").toString());
+            }
+            //车牌号去重
+            capacitySet.add(item.get("车号").toString());
+        }
+        String[] capacities = capacitySet.toArray(new String[0]);//车牌号
+        if (capacities.length != list.size()) {
+            throw new Exception("车号不允许重复！");
+        }
+        map.put("userId",userId);
+        map.put("userName",userName);
+        map.put("businessType",businessType);
+        //获取火车运单及计量详情
+        List<Map<String,Object>> orderList = universalMapper.findTrainUnload(map);
+        if (orderList.size() <= 0) {
+            throw new Exception("未查询到装车信息，请先上传装车作业！");
+        }
+        map.put("orderList",orderList);
+        //新增TMS
+        return tmsFeign.purchaseTrainUnload(map);
+    }
+
+    @ApiOperation(value = "查询采购火运卸车")
+    @PostMapping("/purchaseTrainUnloadList")
+    public Map<String, Object> purchaseTrainUnloadList(@RequestBody(required = false) Map<String, Object> map,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return tmsFeign.purchaseTrainUnloadList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
     @ApiOperation(value = "更改销售运输订单状态")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/changeSaleTransOrder")

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

@@ -181,4 +181,19 @@ public class UniversalController extends BaseRESTfulController {
     public String getWlUrl() {
         return universalMapper.getWlUrl();
     }
+
+    @ApiModelProperty(value = "边输边查业务类型")
+    @PostMapping("/getBusinessTypeLike")
+    public RESTfulResult getBusinessTypeLike(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getBusinessTypeLike(map);
+        return success(list);
+    }
+
+    @ApiOperation(value = "查询是否有正在执行的运单")
+    @PostMapping("/getReceivedTransOrder")
+    public RESTfulResult getReceivedTransOrder(@RequestBody(required = false)Map<String,Object> map) {
+        List<Map<String,Object>> orderIds= universalMapper.getOrderIds(map);
+        return success(orderIds);
+    }
+
 }

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

@@ -89,6 +89,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanChange")
     Map<String, Object> purchasePlanChange(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransplans/purchaseTrainPlanDelete")
+    Map<String, Object> purchaseTrainPlanDelete(Map<String, Object> map);
+
     @PostMapping("api/v1/ams/amsorders/saleOrderSync")
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 
@@ -191,4 +194,13 @@ public interface AmsFeign {
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize);
 
+    @PostMapping(value =  "api/v1/ams/amstransrequirements/bindSale")
+    RESTfulResult bindSale(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amsplanchilds/getMaterial")
+    RESTfulResult getMaterial(@RequestParam String prodCode,
+                              @RequestParam Integer apiId,
+                              @RequestParam Integer pageNum,
+                              @RequestParam Integer pageSize);
+
 }

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

@@ -533,14 +533,17 @@ public interface RmsFeign {
                                           @RequestParam("pageSize") Integer pageSize);
 
 
+    @PostMapping(value = "api/v1/rms/rmstransrange/insertTransRange")
+    Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmstransrange/deleteTransRange")
+    Map<String, Object> deleteTransRange(@RequestBody(required = false) Map<String, Object> map);
     /**
      * 集装箱的相关方法
      *
      * @param map
      * @return
      */
-    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertTransRange")
-    Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/rms/rmsShipContainer/insetShipContainer")
     Map<String, Object> insetShipContainer(@RequestBody(required = false) Map<String, Object> map);
@@ -632,6 +635,15 @@ public interface RmsFeign {
 
     @PutMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysUpdate/{id}")
     Map<String, Object> rmsexpansecategorysupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("/api/v1/rms/dilbusinesstypes/getBusinessType")
+    Map<String, Object> getBusinessType(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/dilbusinesstypes/insertBusinessType")
+    Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -0,0 +1,94 @@
+package com.steerinfo.dil.feign;
+
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+@FeignClient(value = "SSO",url = "${openfeign.SSOFeign.url}")
+public interface SSOFeign {
+
+    /**
+     * 登录
+     * @param loginName
+     * @param password
+     * @return
+     */
+    @PostMapping("/auth/login")
+    JSONObject login(@RequestParam String loginName,
+                     @RequestParam String password);
+
+    /**
+     * 新增用户
+     * @param token
+     * @param userCode
+     * @param userName
+     * @param orgCode
+     * @param orgName
+     * @param groupId
+     * @param companyId
+     * @param orgId
+     * @return
+     */
+    @PostMapping("/v1/sysusers/")
+    JSONObject addUser(@RequestHeader("Authorization") String token,
+//            @HeaderMap Map<String,Object> headerMap,
+                                @RequestParam String userName,
+                               @RequestParam String userCode,
+                               @RequestParam String orgName,
+                               @RequestParam String orgCode,
+                               @RequestParam String groupId,
+                               @RequestParam String companyId,
+                               @RequestParam String orgId);
+
+    @DeleteMapping("/v1/sysusers/{userId}")
+    JSONObject deleteUser(@RequestHeader("Authorization") String token,
+                          @PathVariable String userId);
+
+    @GetMapping("/v1/sysroles/getRolesUser")
+    JSONObject getRolesUser(@RequestHeader("Authorization") String token,
+                       @RequestParam String companyId);
+
+    /**
+     * 授权用户角色
+     * @param token
+     * @param userId
+     * @param userCode
+     * @param roleId
+     * @return
+     */
+    @PostMapping("/v1/sysuserroles/")
+    JSONObject addUserroles(@RequestHeader("Authorization") String token,
+                                    @RequestParam String userId,
+                                    @RequestParam String userCode,
+                                    @RequestParam String roleId);
+
+
+    /**
+     * 解除用户角色权限
+     * @param token
+     * @param userRoleId
+     * @return
+     */
+    @DeleteMapping("/v1/sysuserroles/{userRoleId}")
+    Map<String,Object> sysuserrole(@RequestHeader("Authorization") String token,
+                                   @PathVariable(name = "userRoleId") String userRoleId);
+
+    /**
+     * 获取用户角色权限
+     * @param token
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/v1/sysuserroles/")
+    Map<String,Object> getSysuserrole(@RequestHeader("Authorization") String token,
+                                      @RequestParam("userId") String userId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize);
+
+}

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

@@ -79,14 +79,13 @@ public interface TmsFeign {
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize);
+
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
     Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize);
+
 
     @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
     Map<String, Object> syncQualityResult(Map<String, Object> map);
@@ -155,6 +154,24 @@ public interface TmsFeign {
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize);
 
+
+    @PostMapping("api/v1/tms/tmsweightresults/purchaseTrainWeightList")
+    Map<String, Object> purchaseTrainWeightList(@RequestBody(required = false) Map<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
+
+
+    @PostMapping("api/v1/tms/tmsunloadresults/purchaseTrainUnloadList")
+    Map<String, Object> purchaseTrainUnloadList(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsweightresults/purchaseTrainWeight")
+    Map<String, Object> purchaseTrainWeight(Map<String, Object> map);
+
+
     @PostMapping("api/v1/tms/tmsunloadresults/getUnloadResultList")
     Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
                                             @RequestParam Integer apiId,
@@ -186,9 +203,10 @@ public interface TmsFeign {
                                              @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoad")
-    Map<String, Object> purchaseTrainLoad(Map<String, Object> map,
-                                          @RequestParam String userId,
-                                          @RequestParam String userName);
+    Map<String, Object> purchaseTrainLoad(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/purchaseTrainUnload")
+    Map<String, Object> purchaseTrainUnload(Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/changeSaleTransOrder")
     Map<String, Object> changeSaleTransOrder(Map<String, Object> map);

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

@@ -79,4 +79,9 @@ public interface BackgroundProcessingMapper {
 
     //清空进厂信息
     int clearEnDetails(Map<String,Object> map);
+
+    Map<String, Object> getUserInfo(String userName);
+
+    List<Map<String, Object>> getCapacityList(BigDecimal personnelId);
+
 }

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

@@ -3,10 +3,16 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.SystemFile;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface SystemFileMapper extends IBaseMapper<SystemFile, String> {
 
     SystemFile insertAll(SystemFile systemFile);
+
+    List<Map<String, Object>> getFileInfo(String[] uuidList);
+
 }

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

@@ -52,5 +52,17 @@ public interface UniversalMapper {
 
     String getWlUrl();
 
-    int checkTrainOrder(Map<String, Object> map);
+    //查询采购火运重复装车数量
+    int countTrainLoad(Map<String, Object> map);
+
+    //查询采购火运对应运单及计量实绩
+    List<Map<String, Object>>  findTrainWeight(Map<String, Object> map);
+
+    //查询采购火运对应运单及卸货实绩
+    List<Map<String, Object>>  findTrainUnload(Map<String, Object> map);
+
+    List<Map<String, Object>> getBusinessTypeLike(Map<String, Object> map);
+
+    List<Map<String, Object>> getOrderIds(Map<String, Object> map);
+
 }

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

@@ -137,4 +137,12 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
         int i = dilCidCapacityMapper.insertSelective(dilCidCapacity);
         return i;
     }
+
+    public Map<String,Object> bpLogin(String userName) {
+        Map<String,Object> map = backgroundProcessingMapper.getUserInfo(userName);
+        if("司机".equals(map.get("personnelPost"))) {
+            List<Map<String,Object>> capacityList = backgroundProcessingMapper.getCapacityList(DataChange.dataToBigDecimal(map.get("personnelId")));
+        }
+        return map;
+    }
 }

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

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * POIExcelToHtml 文件转换：
@@ -478,4 +480,104 @@ public class FtpFileUtil {
         }
         return true;
     }
+
+
+    //重写下载图片方法
+    public Map<String,Object> downloadFileNew(String fileName, String filePath) throws IOException {
+        InputStream inputStream;
+        String data = fileName + "预览失败";
+        String type = "";
+        String workhtml = null;
+        File temp = File.createTempFile("temp", ".temp");
+        try {
+            this.connectToServer();
+            // 设置传输二进制文件
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            ftpClient.enterLocalPassiveMode();
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                throw new IOException("failed to connect to the FTP Server:" + FTP_ADDRESS);
+            }
+
+            String directory = filePath.substring(0, filePath.lastIndexOf("/") + 1);
+            // 进入文件所在目录，注意编码格式，以能够正确识别中文目录
+            boolean cdStatus = ftpClient.changeWorkingDirectory(directory);
+            if (!cdStatus) {
+                return new HashMap<>();
+            }
+            String file = filePath.substring(filePath.lastIndexOf("/") + 1);
+            // 检验文件是否存在
+            inputStream = ftpClient.retrieveFileStream(file);
+            String suffixName;
+            if (inputStream != null) {
+                if (file != null && file.contains(SPOT)) {
+                    POIWordToHtml poiWordToHtml = new POIWordToHtml();
+                    suffixName = file.substring(file.indexOf(".") + 1);
+                    switch (suffixName) {
+                        case "docx":
+                            data = poiWordToHtml.readWordImgToHtml(inputStream);
+                            type = suffixName;
+
+                            break;
+                        case "doc":
+                            data = poiWordToHtml.docToHtml(inputStream);
+                            type = suffixName;
+
+                            break;
+
+                        case "xlsx":
+                        case "xls":
+                            data = POIExcelToHtml.excelToHtml(inputStream);
+                            type = suffixName;
+
+                            break;
+                        case "pptx":
+                        case "ppt":
+                            data = POIPptToHtml.pptToHtml(inputStream, suffixName);
+                            type = suffixName;
+
+                            break;
+                        case "jpg":
+                        case "gif":
+                        case "png":
+                        case "jpeg":
+                        case "jpe":
+                            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                            IOUtils.copy(inputStream, stream);
+                            String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
+                            data = "data:image/" + suffixName + ";base64," + imgStr;
+                            type = suffixName;
+                            stream.close();
+                            break;
+                        case "txt":
+                            ByteArrayOutputStream txtStream = new ByteArrayOutputStream();
+                            IOUtils.copy(inputStream, txtStream);
+                            data = txtStream.toString();
+                            type = suffixName;
+
+                            break;
+                        default:
+                            data = fileName + "文件暂时不支持预览。";
+                            break;
+                    }
+                }
+                inputStream.close();
+                ftpClient.completePendingCommand();
+            }
+        } catch (FTPConnectionClosedException e) {
+            System.out.println("ftp连接被关闭！");
+            throw e;
+        } catch (Exception e) {
+            System.out.println("ERR : upload file " + fileName + " from ftp : failed!" + e.getMessage());
+        } finally {
+            if (ftpClient.isConnected()) {
+                closeConnect();
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("data",data);
+        map.put("type",type);
+        return map;
+    }
 }

src/main/resources/application-dev.yml

@@ -51,13 +51,15 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:localhost:8038}
   EmsFeign:
     url: ${TMSFEIGN_URL:localhost:8096}
+  SSOFeign:
+    url: ${SSOFEIGN_URL:172.16.90.214:9001}
 
 
 #远程调用

src/main/resources/application-prod.yml

@@ -42,6 +42,8 @@ openfeign:
     url: ${OTMSFEIGN_URL:172.16.90.214:8038}
   EmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.214:8096}
+  SSOFeign:
+    url: ${SSOFEIGN_URL:172.16.90.214:9001}
 
 
 #远程调用

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

@@ -2,301 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.BackgroundProcessingMapper">
 
-    <update id="closePurOrderMoreTrips" parameterType="string">
-        update AMS_PURCHASE_ORDER APO
-        set APO.IS_MORE_TRIPS = null
-        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
-    </update>
-
-    <update id="updatePurOrderOrgId" parameterType="java.util.Map">
-        update AMS_PURCHASE_ORDER APO
-        set APO.PURCHASING_ORGANIZATION_ID = #{orgId}
-        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
-    </update>
-    <update id="allowEnfactory">
-        UPDATE TMSTRUCK_ENFACTORY_RESULT TER
-        SET TER.INSERT_UPDATE_REMARK = 'OK'
-        WHERE TER.RESULT_ID = (SELECT TER.RESULT_ID FROM OMSTRUCK_ORDER OO
-            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
-            LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-            WHERE OO.ORDER_NUMBER = #{orderNumber})
-    </update>
-
-    <select id="getOrderType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
-        select OO.ORDER_TYPE from OMSTRUCK_ORDER OO
-        where oo.ORDER_ID = #{orderId}
-    </select>
-
-    <select id="getOrderMesByOrderNum" resultType="java.util.Map">
-        select OO.ORDER_ID  "orderId",
-               OO.ORDER_TYPE    "orderType",
-               TTR.RESULT_TOTAL_ID  "resultTotalId"
-        from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
-    </select>
-
-    <select id="getEnFactoryResult" resultType="java.util.Map">
-        select TER.RESULT_ID    "resultId",
-               TER.RESULT_ENTRY_GATE_TIME   "time"
-        from TMSTRUCK_ENFACTORY_RESULT TER
-        where TER.RESULT_TOTAL_ID = #{resultTotalId}
-          and  TER.SEGMEN_SQE = #{sqe}
-    </select>
-
-    <select id="loadResult" resultType="java.util.Map">
-        select T.RESULT_ID    "resultId",
-               T.RESULT_LOAD_END_TIME   "time"
-        from TMSTRUCK_LOAD_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="unloadResult" resultType="java.util.Map">
-        select T.RESULT_ID    "resultId",
-               T.RESULT_END_TIME   "time"
-        from TMSTRUCK_UNLOAD_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="weightResult" resultType="java.util.Map">
-        select T.WEIGHT_TASK_RESULT_ID    "resultId",
-               T.RESULT_TARE_WEIGHT_TIME   "time"
-        from TMSTRUCK_WEIGHT_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.GROSS_SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="outFactoryResult" resultType="java.util.Map">
-        select T.RESULT_ID    "resultId",
-               T.RESULT_OUT_GATE_TIME   "time"
-        from TMSTRUCK_LEAVE_FACTORY_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="getAllPurOrder" resultType="java.lang.Integer">
-        select OO.ORDER_ID
-        from OMSTRUCK_ORDER OO
-        left join AMS_PURCHASE_ORDER APO
-            on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
-        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
-          and OO.ORDER_TYPE in (5,6,7,8,17,18)
-          and OO.ORDER_STATUS in (3,4)
-    </select>
-
-    <delete id="deleteOrders" parameterType="arraylist">
-        delete
-        from OMSTRUCK_ORDER OO
-        where OO.ORDER_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")" >
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteOrderMaterials" parameterType="arraylist">
-        delete
-        from OMSTRUCK_ORDER_MATERIAL OOM
-        where OOM.ORDER_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")" >
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="batchByOrderIdForTotalDelete" parameterType="arraylist">
-        delete from TMSTRUCK_TOTAL_RESULT TTR
-        where TTR.ORDER_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="enFactoryCheck" parameterType="decimal" resultType="int">
-        SELECT
-            TER.SEGMEN_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_ENFACTORY_RESULT TER
-        WHERE
-            TER.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY TER.SEGMEN_SQE
-        HAVING count( TER.SEGMEN_SQE ) > 1
+    <select id="getUserInfo" resultType="java.util.Map">
+        SELECT RP.PERSONNEL_ID "personnelId",
+               RP.IDENTITY_CARD "idCard",
+               RP.PERSONNEL_POST  "personnelPost"
+                   FROM RMS_PERSONNEL RP
+        WHERE RP.PERSONNEL_PHONE = #{userName}
     </select>
-
-    <select id="loadCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.SEGMENT_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_LOAD_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.SEGMENT_SQE
-        HAVING count( T.SEGMENT_SQE ) > 1
-    </select>
-
-    <select id="unloadCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.SEGMENT_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_UNLOAD_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.SEGMENT_SQE
-        HAVING count( T.SEGMENT_SQE ) > 1
-    </select>
-
-    <select id="weightCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.GROSS_SEGMENT_SQE   "segmentSqe"
-        FROM
-            TMSTRUCK_WEIGHT_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.GROSS_SEGMENT_SQE
-        HAVING count( T.GROSS_SEGMENT_SQE  ) > 1
+    <select id="getCapacityList" resultType="java.util.Map">
+        SELECT RC.CAPACITY_NUMBER FROM RMS_CAPACITY_DRIVER RCD
+        LEFT JOIN RMS_CAPACITY RC on RCD.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE RCD.PERSONNEL_ID = #{personnelId}
     </select>
 
-    <select id="outFactoryCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.SEGMENT_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_LEAVE_FACTORY_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.SEGMENT_SQE
-        HAVING count( T.SEGMENT_SQE ) > 1
-    </select>
-    <select id="getDetailsForEnAndQue" resultType="java.util.Map">
-        SELECT OO .ORDER_ID "orderId",
-               TTR .RESULT_TOTAL_ID "resultTotalId",
-               OO .CAPACITY_ID "capacityId"
-        FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO .ORDER_ID = TTR .ORDER_ID
-                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR .RESULT_TOTAL_ID = TTR .RESULT_TOTAL_ID  AND TWR .RESULT_NET_WEIGHT IS NOT NULL
-        WHERE  TWR .WEIGHT_TASK_RESULT_ID IS NULL AND OO .ORDER_TYPE = 1 AND OO .ORDER_STATUS = 5 AND OO .ORDER_NUMBER= #{orderNumber}
-        FETCH NEXT 1 ROWS ONLY
-    </select>
-
-    <delete id="deleteEnFactoryUnnecessaryResult">
-        delete from TMSTRUCK_ENFACTORY_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-  <delete id="deleteLoadUnnecessaryResult">
-        delete from TMSTRUCK_LOAD_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteUnloadUnnecessaryResult">
-        delete from TMSTRUCK_UNLOAD_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteWeightUnnecessaryResult">
-        delete from TMSTRUCK_WEIGHT_RESULT where WEIGHT_TASK_RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteOutFactoryUnnecessaryResult">
-        delete from TMSTRUCK_LEAVE_FACTORY_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <update id="updateOrderCanWork" parameterType="string">
-        update OMSTRUCK_ORDER OO
-        set oo.CAN_WORK = 2
-        where oo.ORDER_NUMBER = #{orderNumber}
-    </update>
-    <update id="updateOrderStatus" parameterType="java.util.Map">
-        update OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = #{orderStatus},
-            OO.INSERT_UPDATE_REMARK = '管理员操作修改状态'
-        WHERE OO.ORDER_NUMBER = #{orderNumber}
-    </update>
-    <delete id="deleteExtraWeight">
-        DELETE FROM TMSTRUCK_WEIGHT_RESULT WHERE WEIGHT_TASK_RESULT_ID IN
-         (
-             SELECT
-                 WEIGHT_TASK_RESULT_ID
-             FROM
-                 TMSTRUCK_WEIGHT_RESULT
-             WHERE RESULT_TOTAL_ID=#{resultTotalId}
-             FETCH NEXT
-                (
-                --查询需要删除的数量
-                SELECT COUNT(WEIGHT_TASK_RESULT_ID)-1
-                FROM TMSTRUCK_WEIGHT_RESULT
-                WHERE RESULT_TOTAL_ID=#{resultTotalId}
-                GROUP BY RESULT_TOTAL_ID
-                )
-            ROWS ONLY
-        )
-    </delete>
-    <delete id="deleteExtraLoad">
-        DELETE FROM TMSTRUCK_LOAD_RESULT WHERE RESULT_ID IN
-           (
-               SELECT
-                   RESULT_ID
-               FROM
-                   TMSTRUCK_LOAD_RESULT
-               WHERE RESULT_TOTAL_ID=#{resultTotalId}
-               FETCH NEXT
-                    (
-                    --查询需要删除的数量
-                    SELECT COUNT(RESULT_ID)-1
-                    FROM TMSTRUCK_LOAD_RESULT
-                    WHERE RESULT_TOTAL_ID=#{resultTotalId}
-                    GROUP BY RESULT_TOTAL_ID
-                    )
-                ROWS ONLY
-            )
-    </delete>
-    <delete id="deleteExtraUnload">
-        DELETE FROM TMSTRUCK_UNLOAD_RESULT WHERE RESULT_ID IN
-           (
-               SELECT
-                   RESULT_ID
-               FROM
-                   TMSTRUCK_UNLOAD_RESULT
-               WHERE RESULT_TOTAL_ID=#{resultTotalId}
-               FETCH NEXT
-                (
-                --查询需要删除的数量
-                SELECT COUNT(RESULT_ID)-1
-                FROM TMSTRUCK_UNLOAD_RESULT
-                WHERE RESULT_TOTAL_ID=#{resultTotalId}
-                GROUP BY RESULT_TOTAL_ID
-                )
-                ROWS ONLY
-            )
-    </delete>
-    <insert id="insertNotUpload">
-        INSERT INTO AMS_NOT_UPLOADED_EAS
-        ("ORDER_ID", "NO", "RESULT_POUND_NO", "CAPACITY_NUMBER", "RESULT_CROSS_CALCULATE_NUMBER", "RESULT_TARE_CALCULATE_NUMBER", "RESULT_CROSS_WEIGHT", "RESULT_TARE_WEIGHT", "RESULT_NET_WEIGHT", "RESULT_CROSS_WEIGHT_TIME", "RESULT_TARE_WEIGHT_TIME",
-         "EAS_ENTRY_ID", "INSERT_USERNAME", "INSERT_TIME", "UPDATE_USERNAME", "UPDATE_TIME", "INSERT_UPDATE_REMARK")
-        VALUES
-        (#{orderId}, #{purchaseOrderNo}, #{poundNo}, #{capacityNo}, #{grossTruckCalculateSecond}, #{tareTruckCalculateSecond}, #{grossWeightSecond}, #{tareWeightSecond}, #{netWeightSecond}, #{grossWeigtTimeSecond}, #{tareWeightTimeSecond},
-         (SELECT EAS_ENTRY_ID FROM AMS_PURCHASE_ORDER WHERE PURCHASE_ORDER_NO=#{purchaseOrderNo} AND DELETED=0), NULL, NULL, NULL, NULL, NULL)
-    </insert>
-    <update id="resetPrintNumber">
-        UPDATE OMSTRUCK_ORDER
-        SET PRINTNUMBER=0,
-            PRINTDATE = null
-        WHERE ORDER_ID = #{orderId}
-    </update>
-    <update id="clearEnDetails">
-        UPDATE TMSTRUCK_ENFACTORY_RESULT
-        SET RESULT_ENTRY_MODE = NULL ,RESULT_ENTRY_GATE_TIME = NULL,INSERT_TIME = NULL
-        WHERE RESULT_TOTAL_ID = #{resultTotalId}
-    </update>
 </mapper>

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

@@ -119,7 +119,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
   </select>
-  <insert id="batchInsert" parameterType="java.util.List">
+    <insert id="batchInsert" parameterType="java.util.List">
     insert into SYSTEM_FILE 
       (ID, 
       FILENAME, FILEPATH)
@@ -165,4 +165,15 @@
     values (#{id,jdbcType=VARCHAR}, #{filename,jdbcType=VARCHAR}, #{filepath,jdbcType=VARCHAR}
            )
   </insert>
+  <select id="getFileInfo" resultType="java.util.Map" parameterType="java.util.List">
+    SELECT
+    SF.FILENAME "FILENAME" ,
+    SF.FILEPATH "FILEPATH"
+    FROM SYSTEM_FILE SF
+    WHERE SF.ID IN
+    <foreach collection="uuidList" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </select>
+
 </mapper>

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

@@ -253,10 +253,17 @@
             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')">
                 AND RC.SSO_CODE = #{orgCode}
             </if>
+            <if test="capacityType != null and capacityType != '' ">
+                AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
+            </if>
+            <if test="capacityType == null">
+                AND RCT.CAPACITY_TYPE_NAME != '火车'
+            </if>
         )
         <where>
             <if test="index!=null and index!=''">
@@ -436,16 +443,114 @@
         </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
-    <select id="checkTrainOrder" resultType="java.lang.Integer">
+    <select id="countTrainLoad" resultType="java.lang.Integer">
         SELECT COUNT(*)
-        FROM OMS_TRANS_ORDER
+        FROM 	TMS_LOAD_RESULT TLR
+        LEFT JOIN OMS_TRANS_ORDER OTO ON TLR .TRANS_ORDER_ID =OTO .TRANS_ORDER_ID
+        LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
+        LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
+        LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
+        LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
         <where>
-            INSERT_TIME > SYSDATE-1
-            AND CAPACITY_ID IN
+            OTO.DELETED != 1
+            AND ATR.SERIAL_NUMBER =#{requirementNumber}
+            AND TLR.LOAD_START_TIME = to_date(#{loadTime}, 'yyyymmdd')
+            AND OTO.CAPACITY_ID IN
             <foreach collection="list" item="item"  open="(" close=")" separator="," >
                 #{item.车号}
             </foreach>
         </where>
     </select>
+    <select id="getBusinessTypeLike" resultType="java.util.Map">
+        select * from(
+        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>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="businessType!=null and businessType!=''">
+                AND  "businessTypeId" = #{businessType}
+            </if>
+            <if test="businessScene!=null and businessScene!=''">
+                AND  "businessScene" = #{businessScene}
+            </if>
+            <if test="transportType!=null and transportType!=''">
+                AND REGEXP_LIKE("transportType", #{transportType})
+            </if>
+            <if test="materialTypeName!=null and materialTypeName!=''">
+                AND REGEXP_LIKE("materialTypeName", #{materialTypeName})
+            </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="findTrainWeight" resultType="java.util.Map">
+        <foreach collection="list" item="item"  separator=" UNION " >
+            SELECT OTO .TRANS_ORDER_ID "transOrderId",
+            TWR .RESULT_ID "resultId",
+            #{item.车号} "capacityId",
+            #{item.净重} "netWeight",
+            #{item.皮重} "tareWeight",
+            #{item.毛重} "grossWeight"
+            FROM 	OMS_TRANS_ORDER OTO
+            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
+            LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
+            LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
+            LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
+            <where>
+                OTO.DELETED != 1
+                AND ATR.SERIAL_NUMBER =#{requirementNumber}
+                AND OTO.CAPACITY_ID = #{item.车号}
+            </where>
+        </foreach>
+    </select>
+    <select id="findTrainUnload" resultType="java.util.Map">
+        <foreach collection="list" item="item"  separator=" UNION " >
+            SELECT OTO .TRANS_ORDER_ID "transOrderId",
+            TUR .RESULT_ID "resultId",
+            #{item.车号} "capacityId",
+            #{item.净重} "unloadWeight"
+            FROM 	OMS_TRANS_ORDER OTO
+            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
+            LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
+            LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
+            LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
+            <where>
+                OTO.DELETED != 1
+                AND ATR.SERIAL_NUMBER =#{requirementNumber}
+                AND OTO.CAPACITY_ID = #{item.车号}
+            </where>
+        </foreach>
+    </select>
+    <select id="getOrderIds" resultType="java.util.Map">
+        SELECT oto.TRANS_ORDER_ID FROM OMS_TRANS_ORDER OTO
+        left join RMS_PERSONNEL RP
+        on rp.PERSONNEL_ID = oto.DRIVER_ID
+        left join RMS_PERSONNEL RP2
+        on RP2.PERSONNEL_ID = oto.DRIVER_ID2
+        where (rp.PERSONNEL_JOB_NUMBER = #{jobNumber}
+        or rp2.PERSONNEL_JOB_NUMBER =  #{jobNumber})
+        and oto.deleted = 5
+    </select>
 
 </mapper>

src/main/resources/log4j.properties

@@ -20,7 +20,7 @@ log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RUNNING.File =/logs/log/running.log
 log4j.appender.RUNNING.Append = true
 log4j.appender.RUNNING.Threshold = INFO
-log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
+log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n