Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

pom.xml

@@ -53,7 +53,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.24</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -1418,11 +1418,12 @@ public class AMScontroller{
     public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  Integer apiId) {
+                                                  Integer apiId,
+                                                  String consigneeSsoId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1430,11 +1431,12 @@ public class AMScontroller{
     Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId){
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")
@@ -1449,11 +1451,13 @@ public class AMScontroller{
                                                               Integer pageSize,
                                                               Integer apiId,
                                                               String con,
-                                                              Integer shipperId
+                                                              Integer shipperId,
+                                                              Integer saleType,
+                                                              String consigneeSsoId
 //                                                              String startDate,
 //                                                              String endDate
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1838,4 +1842,39 @@ public class AMScontroller{
         return amsFeign.getInwardPriceBy(mapvalue);
     }
 
-}
+    @ApiOperation(value = "删除销售订单")
+    @PostMapping("/deleteSaleOrderById")
+    public Map<String,Object> deleteSaleOrderById(@RequestParam Integer saleOrderId){
+        return amsFeign.deleteSaleOrderById(saleOrderId);
+    }
+
+    @ApiModelProperty(value = "查询出销售订单下的所有数据")
+    @PostMapping("/getAllSaleMessages")
+    public RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId) {
+        return amsFeign.getAllSaleMessages(saleOrderId);
+    }
+
+    @ApiModelProperty(value = "修改承运商授权")
+    @PostMapping("/updateTruckNoCarrier")
+    public Map<String,Object> updateTruckNoCarrier(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateTruckNoCarrier(mapValue);
+    }
+
+    @ApiModelProperty(value = "批量上传销售订单")
+    @PostMapping("/uploadSaleOrderList")
+    public Map<String,Object> uploadSaleOrderList(@RequestBody List<Map<String,Object>> saleOrderIdList) {
+        return amsFeign.uploadSaleOrderList(saleOrderIdList);
+    }
+
+    @ApiModelProperty(value = "自动匹配出最近的一个地址")
+    @PostMapping("/matchingAddressRecently")
+    public RESTfulResult matchingAddressRecently(@RequestParam Integer receiveId) {
+        return amsFeign.matchingAddressRecently(new BigDecimal(receiveId));
+    }
+
+    @ApiModelProperty(value = "自动匹配上一条运单的司机电话")
+    @PostMapping("/matchingDriverTelRecently")
+    public RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber) {
+        return amsFeign.matchingDriverTelRecently(capacityNumber);
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.service.impl.BackgroundProcessingServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/*
+ * 后台处理程序
+ */
+
+@RestController
+@RequestMapping("${api.version}/bp")
+public class BackgroundProcessingController extends BaseRESTfulController {
+
+    @Autowired
+    private BackgroundProcessingMapper backgroundProcessingMapper;
+
+    @Autowired
+    private BackgroundProcessingServiceImpl backgroundProcessingService;
+
+
+    @ApiOperation(value = "关闭一车多趟方法")
+    @PostMapping("/closePurOrderMoreTrips")
+    public RESTfulResult closePurOrderMoreTrips(String purchaseOrderNo) {
+        int i = backgroundProcessingMapper.closePurOrderMoreTrips(purchaseOrderNo);
+        if(i != 1){
+            return failed("关闭失败！没有此采购订单");
+        }
+        return success("关闭成功");
+    }
+}

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

@@ -305,10 +305,11 @@ public class OMSController {
                                             Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            @RequestParam String carrierSsoId
+                                            @RequestParam String carrierSsoId,
+                                                   Integer shipperId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId,shipperId);
     }
 
 
@@ -727,8 +728,8 @@ public class OMSController {
 
     @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
     @PostMapping("/getCapacityAllOrder")
-    public Map<String, Object> getCapacityAllOrder(String capacityNumber){
-        return omsFeign.getCapacityAllOrder(capacityNumber);
+    public Map<String, Object> getCapacityAllOrder(String capacityNumber, String date){
+        return omsFeign.getCapacityAllOrder(capacityNumber,date);
     }
 
     @ApiOperation(value = "根据运单id关闭运输订单")

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.config.ImageFileUtils;
+import com.steerinfo.dil.feign.OtmsFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -16,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
 import java.awt.*;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -24,15 +26,18 @@ import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/otms")
 public class OTMSController {
+
     @Autowired
-    private TmsTruckFeign tmsTruckFeign;
+    private OtmsFeign otmsFeign;
     @Autowired
     private ImageFileUtils imageFileUtils;
     @ApiOperation(value="全路径展示接口")
     @PostMapping("/fullPath")
     public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception {
-        return tmsTruckFeign.fullPath(orderNumber);
+        return otmsFeign.fullPath(orderNumber);
     }
+
+    @ApiOperation(value = "在途订单列表")
     @PostMapping("/getInTransitTransportation")
     public RESTfulResult getInTransitTransportation(@RequestBody(required=false)   Map<String,Object> mapValue,
                                                     @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
@@ -40,10 +45,21 @@ public class OTMSController {
                                                     @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     )
     {
-        return tmsTruckFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+        return otmsFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value = "有异常订单列表")
+    @PostMapping("/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody(required=false)   Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    )
+    {
+        return otmsFeign.getHaveAbnormalTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
-    @ApiOperation("查询在途运输")
+    @ApiOperation("已完成订单列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
@@ -51,32 +67,138 @@ public class OTMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer")
     })
     @PostMapping("/getFinishTruckOrderInfo")
-    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                 @RequestParam(required = false,defaultValue = "468",name = "apiId")Integer apiId,
                                                  @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
                                                  @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     ){
-        return tmsTruckFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+        return otmsFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
+    @ApiOperation(value = "获得抵达实集")
     @PostMapping(value = "/addtmstruckArrivalResult")
     public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartFile file){
-        return tmsTruckFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
+        return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
     }
 
     @PostMapping(value = "/addTmstruckReceiptResult")
     public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
+        //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
+        //第一张和第二张必填
         files.add(request.getFile("file0"));
         files.add(request.getFile("file1"));
+        //第三张选填
+        if (request.getFile("file2")!=null){
+            files.add(request.getFile("file2"));
+        }
+        //追加的三张，num=6则取到file3,4,5
+        for(int i=3;i<num;i++){
+            if(request.getFile("file"+i)!=null){
+                files.add(request.getFile("file"+i));
+            }
+        }
+        //上传图片,追加的三张图片放在fourFiles里
+        List<String> fourFiles=new ArrayList<>();
         Map<String,Object> mapValue=new HashMap<>();
         for (int i=0;i<files.size();i++){
             MultipartFile file=files.get(i);
             String url = imageFileUtils.updateFile(file);
             mapValue.put("url"+i,url);
+            if(i>=3) {
+                fourFiles.add(url);
+            }
+        }
+        mapValue.put("fourFiles",fourFiles);
+        return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
+    }
+
+    @ApiOperation(value="查询当前报警类型")
+    @PostMapping(value = "/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch(){
+        return otmsFeign.selectWarnSwitch();
+    }
+
+
+    @ApiOperation(value="是否开启运输报警状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "warnSwitch", value = "运输报警状态", required = false, dataType = "String")
+    })
+    @PostMapping(value = "/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio){
+        return otmsFeign.inTransitWarn(warnSwitch,radio);
+    }
+
+    @ApiOperation(value="获得异常信息")
+    @PostMapping("/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "orderNumbers") String orderNumbers,
+                                                  @RequestParam(name = "pageSize") Integer pageSize){
+        mapValue=mapValue!=null?mapValue:new HashMap<>();
+        mapValue.put("orderNumbers",orderNumbers);
+        return otmsFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="车牌号和时间查询路径")
+    @PostMapping("/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception{
+        return otmsFeign.fullPathVisualizationByCarNumber(mapValue);
+    }
+
+    @ApiOperation("厂外抵达作业")
+    @PostMapping("/getArrivalResult")
+    public Map<String,Object> getArrivalResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return otmsFeign.getArrivalResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示满货箱的照片")
+    @PostMapping("/getArrivalPhoto")
+    public String getArrivalPhoto(@RequestParam String orderNumber){
+        return otmsFeign.getArrivalPhoto(orderNumber);
+    }
+
+    @ApiOperation("厂外抵达作业")
+    @PostMapping("/getReceiptResult")
+    public Map<String,Object> getReceiptResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return otmsFeign.getReceiptResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
+        Map<String,Object> map=otmsFeign.getReceivingPhotoByUrl(orderNumber);
+        if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
+            String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
+            map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
+        }
+        if(map.containsKey("resultSignedNotePhoto") && map.get("resultSignedNotePhoto")!=null){
+            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultSignedNotePhoto").toString());
+            map.put("resultSignedNotePhoto",resultSignedNotePhoto);
         }
-        return tmsTruckFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
+        if(map.containsKey("resultReceiveNotePhoto") && map.get("resultReceiveNotePhoto")!=null){
+            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultReceiveNotePhoto").toString());
+            map.put("resultReceiveNotePhoto",resultSignedNotePhoto);
+        }
+        return map;
     }
 
+    @GetMapping("/getCurrentLocation")
+    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
+        return otmsFeign.getCurrentLocation(capcityNumber);
+    }
 
 }

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

@@ -1,8 +1,7 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.QmsTruckFeign;
+import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -21,25 +20,24 @@ import java.util.Map;
 public class QMSController extends BaseRESTfulController {
 
     @Autowired
-    private QmsTruckFeign qmsTruckFeign;
+    private QmsFeign qmsFeign;
 
     @ApiOperation(value="触发电子围栏-->新增排队实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/addQueueResult")
-    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> map){
-        return qmsTruckFeign.addQueueResult(map);
+    public Map<String, Object> addQueueResult(String vno){
+        return qmsFeign.addQueueResult(vno);
     }
 
-
     @ApiOperation(value="指令接收-->新增排队链表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/addQueueList")
-    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
-        return qmsTruckFeign.addQueueList(mapValue);
+    public Map<String, Object> addQueueList(String resultId){
+        return qmsFeign.addQueueList(resultId);
     }
 
     @ApiOperation(value="指令接收")
@@ -58,7 +56,7 @@ public class QMSController extends BaseRESTfulController {
                                             Integer queueType,
                                             String con
     ){
-        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
+        return qmsFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
     }
 
 
@@ -77,7 +75,7 @@ public class QMSController extends BaseRESTfulController {
                                              Integer pageSize,
                                              String con
     ){
-        return qmsTruckFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return qmsFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
 
@@ -94,38 +92,13 @@ public class QMSController extends BaseRESTfulController {
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer gridId,
-                                                     String con
-    ){
-        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, gridId,con);
-    }
-
-
-    @ApiOperation(value="查询进厂排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllQueueMes")
-    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer gatepostId,
-                                              String con
+                                                     Integer locationId,
+                                                     String capacityNumber,
+                                                     Integer isSpelling
     ){
-        return qmsTruckFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
+        return qmsFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
     }
 
-    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
-    @PostMapping("/changeQueue")
-    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.changeQueue(mapValue);
-    }
-
-
     @ApiOperation(value="查询排队转移")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -141,17 +114,7 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-
-
-    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueCancel")
-    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueCancel(mapValue);
+        return qmsFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="查询排队取消")
@@ -169,26 +132,25 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return qmsFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
-    @ApiOperation(value="通过Id查询排队取消实绩")
+    @ApiOperation(value="修改排队取消实绩：时间、原因")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
-    @PostMapping("/getQueueCancelByResultId/{resultId}")
-    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
-        return qmsTruckFeign.getQueueCancelByResultId(resultId);
+    @PostMapping("/updateQueueCancel")
+    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.updateQueueCancel(mapValue);
     }
 
-
-    @ApiOperation(value="修改排队取消实绩：时间、原因")
+    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
-    @PostMapping("/updateQueueCancel")
-    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
-        return qmsTruckFeign.updateQueueCancel(mapValue);
+    @PostMapping("/queueCancel")
+    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueCancel(mapValue);
     }
 
 
@@ -198,7 +160,7 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/queueCutInLine")
     public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueCutInLine(mapValue);
+        return qmsFeign.queueCutInLine(mapValue);
     }
 
 
@@ -217,16 +179,7 @@ public class QMSController extends BaseRESTfulController {
                                               Integer pageSize,
                                               String con
     ){
-        return qmsTruckFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="排队结束-->修改deleted = 1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
-    })
-    @PostMapping("/queueEndByPDA")
-    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.queueEnd(mapValue);
+        return qmsFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="查询排队结束")
@@ -244,29 +197,9 @@ public class QMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  String con
     ){
-        return qmsTruckFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="汽车监控")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/capacityMonitor")
-    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer gridType,
-                                               String con
-    ){
-        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
+        return qmsFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
-
     @ApiOperation(value="链表监控")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -280,105 +213,207 @@ public class QMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           String con
-    ){return qmsTruckFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
-    @PostMapping("/getQueueStatusList")
-    public Map<String, Object> getQueueStatusList(){
-        return qmsTruckFeign.getQueueStatusList();
+                                           Integer isSpelling
+    ){return qmsFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,isSpelling);
     }
 
     @ApiOperation(value="通过车牌号查询司机接单")
     @PostMapping("/getOrderReceive/{capacityNumber}")
     public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
-        return qmsTruckFeign.getOrderReceive(capacityNumber);
+        return qmsFeign.getOrderReceive(capacityNumber);
     }
 
     @ApiOperation(value="通过车牌号取消排队")
     @PostMapping("/cancelQueue")
     public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue){
-        return qmsTruckFeign.cancelQueue(mapValue);
+        return qmsFeign.cancelQueue(mapValue);
     }
 
-    @ApiOperation(value="查询执行中订单")
+    @ApiOperation(value="钢材科允许进厂")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
     })
-    @PostMapping("/getAllExecutionOrder")
-    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize,
-                                                    Integer orderType,
-                                                    Integer status,
-                                                    String con
-    ){
-        return qmsTruckFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
+    @PostMapping("/allowEnFactory")
+    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.allowEnFactory(mapValue);
     }
 
-    @ApiOperation(value="查询某一个门岗的排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getListQueueMes")
-    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
-        return qmsTruckFeign.getListQueueMes(mapValue);
+    @ApiOperation(value="APP端司机查看排队信息")
+    @GetMapping("getQueueResultByTotalId")
+    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        return  qmsFeign.getQueueResultByTotalId(resultTotalId);
     }
 
 
-    @ApiOperation(value="查询仓库排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueApply")
-    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer platformId,
-                                                      String con
-    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    @ApiOperation(value="单拼链表查看详情")
+    @PostMapping("/getListMonitorMes")
+    public Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getListMonitorMes(mapValue);
     }
-    @ApiOperation(value="查询仓库排队转移")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueChange")
-    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-
-                                                       String con
-    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+
+    @ApiOperation(value="多拼链表查看详情")
+    @PostMapping("/getSpellingListMonitorMes")
+    public Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.getSpellingListMonitorMes(mapValue);
     }
 
 
-    @ApiOperation(value="查询仓库排队结束")
+    @ApiOperation(value="排队结束-->修改deleted = 1")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
-    @PostMapping("/getWarehouseQueueEndMes")
-    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize,
-                                                       String con
-    ){return qmsTruckFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    @PostMapping("/queueEndByPDA")
+    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.queueEnd(mapValue);
     }
+
+
+//    @ApiOperation(value="查询进厂排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllQueueMes")
+//    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              Integer apiId,
+//                                              Integer pageNum,
+//                                              Integer pageSize,
+//                                              Integer gatepostId,
+//                                              String con
+//    ){
+//        return qmsFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
+//    }
+
+//    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
+//    @PostMapping("/changeQueue")
+//    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.changeQueue(mapValue);
+//    }
+
+
+
+
+//    @ApiOperation(value="通过Id查询排队取消实绩")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getQueueCancelByResultId/{resultId}")
+//    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
+//        return qmsFeign.getQueueCancelByResultId(resultId);
+//    }
+
+
+
+//    @ApiOperation(value="汽车监控")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/capacityMonitor")
+//    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               Integer apiId,
+//                                               Integer pageNum,
+//                                               Integer pageSize,
+//                                               Integer gridType,
+//                                               String con
+//    ){
+//        return qmsFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
+//    }
+
+
+
+
+//    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
+//    @PostMapping("/getQueueStatusList")
+//    public Map<String, Object> getQueueStatusList(){
+//        return qmsFeign.getQueueStatusList();
+//    }
+
+
+
+//    @ApiOperation(value="查询执行中订单")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllExecutionOrder")
+//    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    Integer apiId,
+//                                                    Integer pageNum,
+//                                                    Integer pageSize,
+//                                                    Integer orderType,
+//                                                    Integer status,
+//                                                    String con
+//    ){
+//        return qmsFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
+//    }
+
+//    @ApiOperation(value="查询某一个门岗的排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getListQueueMes")
+//    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return qmsFeign.getListQueueMes(mapValue);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueApply")
+//    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                      Integer apiId,
+//                                                      Integer pageNum,
+//                                                      Integer pageSize,
+//                                                      Integer platformId,
+//                                                      String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+//    @ApiOperation(value="查询仓库排队转移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueChange")
+//    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+
+
+//    @ApiOperation(value="查询仓库排队结束")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueEndMes")
+//    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                       Integer apiId,
+//                                                       Integer pageNum,
+//                                                       Integer pageSize,
+//                                                       String con
+//    ){return qmsFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+//    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.config.ImageFileUtils;
 import com.steerinfo.dil.feign.TmsshipFeign;
 import com.steerinfo.dil.feign.TmsTrainFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
@@ -35,6 +36,8 @@ public class TMSController extends BaseRESTfulController {
     TmsshipFeign tmsshipFeign;
     @Autowired
     UniversalMapper universalMapper;
+    @Autowired
+    private ImageFileUtils imageFileUtils;
     /*======================================船运==========================================*/
 
     /**
@@ -1950,9 +1953,11 @@ public class TMSController extends BaseRESTfulController {
                                           Integer pageSize,
                                           String startTime,
                                           String endTime,
-                                          String carrierSsoId
+                                          String carrierSsoId,
+                                                Integer orderType,
+                                                Integer shipperId
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId);
     }
 
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")
@@ -2123,8 +2128,10 @@ public class TMSController extends BaseRESTfulController {
                                                   Integer apiId,
                                                   Integer pageNum,
                                                   Integer pageSize,
+                                                  String startTime,
+                                                  String endTime,
                                                   String con){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con);
     }
 
     @ApiOperation("厂外抵达作业")
@@ -2163,4 +2170,18 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber){
         return tmsTruckFeign.getReceivingPhoto(orderNumber);
     }
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
+        Map<String,Object> map=tmsTruckFeign.getReceivingPhotoByUrl(orderNumber);
+        if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
+            String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
+            map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
+        }
+        if(map.containsKey("resultSignedNotePhoto") && map.get("resultSignedNotePhoto")!=null){
+            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultSignedNotePhoto").toString());
+            map.put("resultSignedNotePhoto",resultSignedNotePhoto);
+        }
+        return map;
+    }
 }

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
@@ -246,6 +247,20 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "船名边输边查")
+    @PostMapping("/getShipNameMesByLike")
+    public  RESTfulResult getShipNameMesByLike(@RequestParam("index") String index,Integer materialId) {
+        Map<String, Object> map = new HashMap<>();
+        if(materialId != null){
+            map.put("materialId",materialId);
+        }
+        if(index != null){
+            map.put("index","%" + index + "%");
+        }
+        List<Map<String,Object>>list = universalMapper.getShipNameMesByLike(map);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查用车单位")
     @PostMapping("/getRequireUnitName")
     public RESTfulResult getRequireUnitName(@RequestParam("index") String index) {
@@ -686,9 +701,6 @@ public class UniversalController extends BaseRESTfulController {
         if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null")) {
             mapValue.put("materialSpecificationText", materialSpecificationText);
         }
-        if (materialModelText != null && !materialModelText.equals("undefined") && !materialModelText.equals("null")) {
-            mapValue.put("materialModelText", materialModelText);
-        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getSteelMaterial(mapValue);
@@ -786,6 +798,12 @@ public class UniversalController extends BaseRESTfulController {
         return universalMapper.getNotReceiveOrderQuantity(capacityNumber);
     }
 
+    @ApiOperation(value = "西南水泥独用下拉框")
+    @GetMapping("/getXiNanCarrier")
+    public RESTfulResult getXiNanCarrier() {
+        return success(universalMapper.getXiNanCarrier());
+    }
+
     @ApiModelProperty(value = "边输边查发站到站")
     @GetMapping("/getArrivalByLike")
     public RESTfulResult getArrivalByLike(@RequestParam("index") String index){
@@ -793,4 +811,26 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "司机APP订单小红点")
+    @GetMapping("/getOrderNum")
+    public int getOrderNum(@RequestParam("capacityNumber") String capacityNumber){
+        return universalMapper.getOrderNum(capacityNumber);
+    }
+
+    @ApiModelProperty(value = "补录计量实绩")
+    @PostMapping("/recordingWeightResult")
+    public int recordingWeightResult(@RequestBody(required = false)List<Map<String,Object>>mapList){
+        try {
+            return universalService.recordingWeightResult(mapList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return 1;
+    }
+
+    @ApiModelProperty(value = "获取仓库月台")
+    @GetMapping("/getSteelWarehouse")
+    public List<Map<String, Object>> getSteelWarehouse(){
+        return universalMapper.getSteelWarehouse();
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.QMSFeign;
-import com.steerinfo.dil.feign.QmsTruckFeign;
+import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -29,7 +28,7 @@ public class WMSController extends BaseRESTfulController {
     @Autowired
     WMSFeign wmsFeign;
     @Autowired
-    QMSFeign qmsFeign;
+    QmsFeign qmsFeign;
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
@@ -989,8 +988,10 @@ public class WMSController extends BaseRESTfulController {
                                                         @RequestParam(value = "apiId") Integer apiId,
                                                         @RequestParam(value = "warehouseId") Integer warehouseId,
                                                         @RequestParam(value = "status") Integer status,
+                                                        @RequestParam(value = "startTime",required = false)String startTime,
+                                                        @RequestParam(value = "endTime",required = false)String endTime,
                                                         @RequestParam(value = "con") String con) {
-        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
+        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,startTime,endTime,con);
     }
 //    根据对应的入库实绩id修改入库状态为预留
     @PostMapping("/changeReserved")

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

@@ -0,0 +1,41 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.feign.TmsTruckFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("apis")
+public class ZhongJiaoXingLuContoller {
+
+    private TmsTruckFeign tmsTruckFeign;
+
+    //偏离预警回调示例
+    @PostMapping("/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
+        tmsTruckFeign.abnormalLineWarn(data);
+
+        return "success";
+    }
+    //停车预警回调示例
+    @PostMapping("/parkWarn")
+    public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
+        tmsTruckFeign.parkWarn(data);
+        return "success";
+    }
+    //离线预警回调示例
+    @PostMapping("/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
+
+        tmsTruckFeign.offLineWarn(data);
+        return "success";
+    }
+
+
+}

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

@@ -1350,7 +1350,8 @@ public interface AmsFeign {
     Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
-                                           @RequestParam Integer apiId);
+                                           @RequestParam Integer apiId,
+                                           @RequestParam(required = false) String consigneeSsoId);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1360,7 +1361,8 @@ public interface AmsFeign {
     Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId);
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1368,7 +1370,9 @@ public interface AmsFeign {
                                                        @RequestParam("pageSize") Integer pageSize,
                                                        @RequestParam("apiId") Integer apiId,
                                                        @RequestParam("con") String con,
-                                                       @RequestParam Integer shipperId
+                                                       @RequestParam Integer shipperId,
+                                                       @RequestParam(required = false) Integer saleType,
+                                                       @RequestParam(required = false) String consigneeSsoId
 //                                                       @RequestParam String startDate,
 //                                                       @RequestParam String endDate
     );
@@ -1625,4 +1629,28 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
     Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
 
+
+    //删除销售订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderById")
+    Map<String,Object> deleteSaleOrderById(@RequestParam Integer saleOrderId);
+
+    //查询出销售订单下的所有数据
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAllSaleMessages")
+    RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId);
+
+    // 修改承运商授权
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateTruckNoCarrier")
+    Map<String, Object> updateTruckNoCarrier(@RequestBody Map<String, Object> mapValue);
+
+    // 批量上传销售订单到金蝶
+    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrderList")
+    Map<String, Object> uploadSaleOrderList(@RequestBody List<Map<String, Object>> saleOrderIdList);
+
+    // 自动匹配出最近的一个地址
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingAddressRecently")
+    RESTfulResult matchingAddressRecently(@RequestParam BigDecimal receiveId);
+
+    // 自动匹配上一条运单的司机电话
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingDriverTelRecently")
+    RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber);
 }

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

@@ -137,7 +137,8 @@ public interface OmsFeign {
                                             @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierSsoId")  String carrierSsoId
+                                            @RequestParam("carrierSsoId")  String carrierSsoId,
+                                            @RequestParam("shipperId") Integer shipperId
     );
 
     /**
@@ -404,7 +405,7 @@ public interface OmsFeign {
 
     @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
     @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
-    Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber);
+    Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber,@RequestParam  String date);
 
     @ApiOperation(value = "根据运单id关闭运输订单")
     @PostMapping("api/v1/oms/omstruckorderseparates/closeOrder")

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

@@ -0,0 +1,110 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.Map;
+@FeignClient(value = "DAL-OTMS-API-DEV", url = "${openfeign.OTMSFeign.url}")
+public interface OtmsFeign {
+    //在途订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getInTransitTransportation")
+    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    //已完成订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getFinishTruckOrderInfo")
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    );
+    //有异常订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                       @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                       @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                       @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    //车牌号和时间查询路径
+    @PostMapping("/api/v1/otms/pathDisplay/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
+
+    //改变当前报警类型
+    @PostMapping(value = "/api/v1/otms/pathDisplay/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
+
+
+    //查询当前报警类型
+    @PostMapping(value = "/api/v1/otms/pathDisplay/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch();
+
+    //通过运输订单号查询全路径
+    @PostMapping("/api/v1/otms/pathDisplay/fullPath")
+    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
+
+    //获得抵达列表
+//    @PostMapping("/api/v1/otms/tmstruckarrivalresults/getArrivalResultInfo")
+//    Map<String, Object> getArrivalResultInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+//                                         @RequestParam Integer apiId,
+//                                         @RequestParam Integer pageNum,
+//                                         @RequestParam Integer pageSize,
+//                                         @RequestParam String con,
+//                                         @RequestParam String startTime,
+//                                         @RequestParam String endTime
+//    );
+
+    //通过运输订单号获得抵达图片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
+    String getReceiptPhoto(@RequestParam String orderNumber);
+
+    //获取收货作业照片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+    //获得抵达实集
+    @PostMapping(value = "/api/v1/otms/tmstruckarrivalresults/addtmstruckArrivalResult",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestPart("file") MultipartFile file);
+
+    //添加签收图片
+    @PostMapping(value = "/api/v1/otms/pathDisplay/addTmstruckReceiptResult")
+    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("num") Integer num, @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, @RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
+
+    //获得异常信息
+    @PostMapping("/api/v1/otms/pathDisplay/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "pageSize") Integer pageSize);
+
+    //抵达信息列表
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalResult")
+    Map<String, Object> getArrivalResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime);
+
+    //获得抵达图片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
+    String getArrivalPhoto(@RequestParam String orderNumber);
+
+    //获得签收实绩
+    @PostMapping("/api/v1/otms/pathDisplay/getReceiptResult")
+    Map<String, Object> getReceiptResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime
+    );
+    @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
+    public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
+}

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

@@ -1,20 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author luobang
- * @create 2021-10-13 9:09
- */
-@FeignClient(value = "DAL-TRICK-QMS-DEV",url = "${openfeign.OMSFeign.url}")
-public interface QMSFeign {
-    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
-    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
-                                     @RequestParam int size);
-}

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

@@ -0,0 +1,210 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 17:19
+ */
+
+@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
+public interface QmsFeign {
+
+    @RequestMapping(value = "/api/v1/queueTruck/qmsqueuegrids/getStackingId",method = RequestMethod.POST)
+    Map<String,Object> getStackingId(@RequestParam BigDecimal warehouseId,
+                                     @RequestParam int size);
+
+    /*
+    QmsQueueResultController /  QmsQueueListController
+     */
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
+     Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
+     Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
+     Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("queueType") Integer queueType,
+                                            @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
+     Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
+     Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("locationId") Integer locationId,
+                                                     @RequestParam("capacityNumber")String capacityNumber,
+                                                     @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
+     Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
+     Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
+     Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
+     Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
+     Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
+     Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
+    Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
+     Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con")String con
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
+     Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("isSpelling")Integer isSpelling
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
+     Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
+     Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
+    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
+    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListMonitorMes")
+    Map<String, Object> getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/getSpellingListMonitorMes")
+    Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
+//     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                              @RequestParam("apiId") Integer apiId,
+//                                              @RequestParam("pageNum") Integer pageNum,
+//                                              @RequestParam("pageSize") Integer pageSize,
+//                                              @RequestParam("gatepostId") Integer gatepostId,
+//                                              @RequestParam("con")String con
+//    );
+
+    
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
+//     Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
+//
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
+//     Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
+//     Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                               @RequestParam("apiId") Integer apiId,
+//                                               @RequestParam("pageNum") Integer pageNum,
+//                                               @RequestParam("pageSize") Integer pageSize,
+//                                               @RequestParam("gridType") Integer gridType,
+//                                               @RequestParam("con")String con
+//    );
+    
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
+//     Map<String, Object> getQueueStatusList();
+
+
+    
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
+//     Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                    @RequestParam("apiId") Integer apiId,
+//                                                    @RequestParam("pageNum") Integer pageNum,
+//                                                    @RequestParam("pageSize") Integer pageSize,
+//                                                    @RequestParam("orderType")Integer orderType,
+//                                                    @RequestParam("status")Integer status,
+//                                                    @RequestParam("con")String con
+//    );
+
+
+//
+//    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
+//    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
+//    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+//    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
+//    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                @RequestParam("apiId") Integer apiId,
+//                                                @RequestParam("pageNum") Integer pageNum,
+//                                                @RequestParam("pageSize") Integer pageSize,
+//                                                @RequestParam("con")String con
+//    );
+
+}

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

@@ -1,193 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/1 17:19
- */
-
-@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
-public interface QmsTruckFeign {
-
-    /*
-    QmsQueueResultController /  QmsQueueListController
-     */
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
-    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
-    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
-    public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("apiId") Integer apiId,
-                                            @RequestParam("pageNum") Integer pageNum,
-                                            @RequestParam("pageSize") Integer pageSize,
-                                            @RequestParam("queueType") Integer queueType,
-                                            @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
-    public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             @RequestParam("apiId") Integer apiId,
-                                             @RequestParam("pageNum") Integer pageNum,
-                                             @RequestParam("pageSize") Integer pageSize,
-                                             @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
-    public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("gatepostId") Integer gatepostId,
-                                              @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
-    public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam("apiId") Integer apiId,
-                                                     @RequestParam("pageNum") Integer pageNum,
-                                                     @RequestParam("pageSize") Integer pageSize,
-                                                     @RequestParam("gridId") Integer gridId,
-                                                     @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
-    public Map<String, Object> changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
-    public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
-    public Map<String, Object> queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
-    public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
-    public Map<String, Object> getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
-    public Map<String, Object> updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
-    public Map<String, Object> queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
-    public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
-    public Map<String, Object> queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
-    public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam("apiId") Integer apiId,
-                                                 @RequestParam("pageNum") Integer pageNum,
-                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
-    public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("gridType") Integer gridType,
-                                               @RequestParam("con")String con
-    );
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
-    public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("con")String con
-    );
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
-    public Map<String, Object> getQueueStatusList();
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
-    public Map<String, Object> getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
-    public Map<String, Object> cancelQueue(@RequestBody Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
-    public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                    @RequestParam("apiId") Integer apiId,
-                                                    @RequestParam("pageNum") Integer pageNum,
-                                                    @RequestParam("pageSize") Integer pageSize,
-                                                    @RequestParam("orderType")Integer orderType,
-                                                    @RequestParam("status")Integer status,
-                                                    @RequestParam("con")String con
-    );
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
-    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
-
-
-
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
-    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("con")String con
-    );
-    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
-    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("con")String con
-    );
-}

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

@@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -389,7 +390,9 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                          @RequestParam("startTime") String startTime,
                                          @RequestParam("endTime")   String endTime,
-                                      @RequestParam("carrierSsoId")   String carrierSsoId
+                                      @RequestParam("carrierSsoId")   String carrierSsoId,
+                                         @RequestParam("orderType") Integer orderType,
+                                         @RequestParam("shipperId") Integer shipperId
     );
 
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
@@ -516,6 +519,8 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer apiId,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime,
                                           @RequestParam String con
                                          );
 
@@ -542,9 +547,10 @@ public interface TmsTruckFeign {
                                          @RequestParam String endTime
     );
 
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
+    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
     Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
-
+    @PostMapping("/api/v1/truckTms/pathDisplay/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
     @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
     public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
     @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")
@@ -570,6 +576,34 @@ public interface TmsTruckFeign {
                                                  @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     );
 
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch();
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    @PostMapping("/api/v1/truckTms/pathDisplay/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "pageSize") Integer pageSize);
+
+
+    @ApiOperation(value = "获取收货作业照片")
+    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
 }
 
 

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

@@ -858,6 +858,8 @@ public interface WMSFeign {
                                                 @RequestParam(value = "apiId") Integer apiId,
                                                  @RequestParam(value = "warehouseId") Integer warehouseId,
                                                  @RequestParam(value = "status") Integer status,
+                                                 @RequestParam(value = "startTime",required = false)String startTime,
+                                                 @RequestParam(value = "endTime",required = false)String endTime,
                                                  @RequestParam(value = "con") String con);
 
 

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

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import org.mapstruct.Mapper;
+
+import java.util.Map;
+
+@Mapper
+public interface BackgroundProcessingMapper {
+    //通过采购订单号关闭一车多趟
+    int closePurOrderMoreTrips(String purchaseOrderNo);
+
+    int updatePurOrgId(Integer orderId);
+
+    Integer getOrderType(Integer orderId);
+
+}

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

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 public interface DilVersionMapper extends IBaseMapper<DilVersion, BigDecimal> {
 
     //查询最大主键
-    @Select("select max(DV.VERSION_ID) + 1 from DIL_VERSION")
+    @Select("select max(DV.VERSION_ID) + 1 from DIL_VERSION DV")
     BigDecimal selectMaxId();
 
     //查询最新的APP版本号

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

@@ -179,6 +179,17 @@ public interface UniversalMapper {
     //通过车牌号查询未接收的订单数量（用于APP显示未接收小红点）
     Integer getNotReceiveOrderQuantity(String capacityNumber);
 
+    List<Map<String,Object>> getXiNanCarrier();
     //边输边查发站到站
     List<Map<String, Object>> getArrivalByLike(String index);
+
+    //查询已下发订单数量  -->APP小红点
+    Integer getOrderNum(String capacityNumber);
+
+
+    //仓库月台下拉框
+    List<Map<String, Object>> getSteelWarehouse();
+
+    List<Map<String, Object>> getShipNameMesByLike(Map<String, Object> map);
+
 }

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

@@ -0,0 +1,5 @@
+package com.steerinfo.dil.service;
+
+public interface IBackgroundProcessService {
+    int updatePurOrgId(Integer orderId);
+}

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

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.service.IBackgroundProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service(value = "backgroundProcessingService")
+public class BackgroundProcessingServiceImpl implements IBackgroundProcessService {
+
+    @Autowired
+    BackgroundProcessingMapper backgroundProcessingMapper;
+
+    @Override
+    public  int updatePurOrgId(Integer orderId) {
+        //获取订单类型
+        Integer orderType = backgroundProcessingMapper.getOrderType(orderId);
+        if(orderType == 10 || orderType == 20){
+            backgroundProcessingMapper.updatePurOrgId(orderId);
+        }
+        return 1;
+    }
+}

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

@@ -1,14 +1,17 @@
 package com.steerinfo.dil.service.impl;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.UniversalService;
 import com.steerinfo.dil.util.ESUtil;
+import com.steerinfo.dil.util.HTTPRequestUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.sql.Blob;
@@ -203,4 +206,25 @@ public class UniversalServiceImpl implements UniversalService {
     public List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId) {
         return universalMapper.getMaterialIdByOrderId(orderId);
     }
+
+    public int recordingWeightResult(List<Map<String, Object>> mapList) throws IOException {
+        String URL = "http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult";
+        String jsonData = null;
+        String jsonString= JSON.toJSONString(mapList);
+        jsonData = HTTPRequestUtils.send(URL, jsonString,"utf-8");
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("code"));
+            if("SUCCESS".equals(code)){
+                return 1;
+            }else{
+                return 0;
+            }
+        }else{
+            System.out.println("短信发送失败：" + jsonData);
+            return 0;
+        }
+    }
 }

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

@@ -0,0 +1,126 @@
+package com.steerinfo.dil.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HTTPRequestUtils {
+    /**
+     * 发送post请求
+     * @param url  路径
+     * @param json  参数(json类型)
+     * @param encoding 编码格式
+     * @return
+     * @throws ParseException
+     * @throws IOException
+     */
+    public static String send(String url, String json, String encoding) throws ParseException, IOException {
+        String body = "";
+
+        //创建httpclient对象
+        CloseableHttpClient client = HttpClients.createDefault();
+        //创建post方式请求对象
+        HttpPost httpPost = new HttpPost(url);
+
+        //装填参数
+        StringEntity s = new StringEntity(json.toString(), "utf-8");
+        s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,"application/json"));
+        //设置参数到请求对象中
+        httpPost.setEntity(s);
+        System.out.println("请求地址：" + url);
+        System.out.println(json);
+        httpPost.setHeader("Content-type", "application/json");
+        httpPost.setHeader("-UserAgent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+
+        //执行请求操作，并拿到结果（同步阻塞）
+        CloseableHttpResponse response = client.execute(httpPost);
+        System.out.println(response);
+        //获取结果实体
+        HttpEntity entity = response.getEntity();
+        System.out.println(entity);
+        if (entity != null) {
+            //按指定编码转换结果实体为String类型
+            body = EntityUtils.toString(entity, encoding);
+        }
+        EntityUtils.consume(entity);
+        //释放链接
+        response.close();
+        return body;
+    }
+
+
+    public static String getJsonData(JSONObject jsonParam,String urls) {
+        StringBuffer sb=new StringBuffer();
+        try {
+            // 创建url资源
+            URL url = new URL(urls);
+            // 建立http连接
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            // 设置允许输出
+            conn.setDoOutput(true);
+            // 设置允许输入
+            conn.setDoInput(true);
+            // 设置不用缓存
+            conn.setUseCaches(false);
+            // 设置传递方式
+            conn.setRequestMethod("POST");
+            // 设置维持长连接
+            conn.setRequestProperty("Connection", "Keep-Alive");
+            // 设置文件字符集:
+            conn.setRequestProperty("Charset", "UTF-8");
+            // 转换为字节数组
+            byte[] data = (jsonParam.toString()).getBytes();
+            // 设置文件长度
+            conn.setRequestProperty("Content-Length", String.valueOf(data.length));
+            // 设置文件类型:
+            conn.setRequestProperty("contentType", "application/json");
+            // 开始连接请求
+            conn.connect();
+            OutputStream out = new DataOutputStream(conn.getOutputStream()) ;
+            // 写入请求的字符串
+            out.write((jsonParam.toString()).getBytes());
+            out.flush();
+            out.close();
+            System.out.println(conn.getResponseCode());
+
+            // 请求返回的状态
+            if (HttpURLConnection.HTTP_OK == conn.getResponseCode()){
+                System.out.println("连接成功");
+                // 请求返回的数据
+                InputStream in1 = conn.getInputStream();
+                try {
+                    String readLine = new String();
+                    BufferedReader responseReader=new BufferedReader(new InputStreamReader(in1,"UTF-8"));
+                    while((readLine=responseReader.readLine())!=null){
+                        sb.append(readLine).append("\n");
+                    }
+                    responseReader.close();
+                    System.out.println(sb.toString());
+
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+            } else {
+                System.out.println("error++");
+            }
+        } catch (Exception e) {
+
+        }
+        return sb.toString();
+
+    }
+
+
+}

src/main/resources/application-dev.yml

@@ -32,14 +32,16 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
+  OTMSFeign:
+    url: ${OTMSFEIGN_URL:172.16.33.162:8038}
 piction:
-  # path: /usr/share/nginx/html/image
-  #  path: /test/data/nginx/html/image
-  path: C:\Users\24390\Desktop\work\a
-#  path: /shared
+  #path: /usr/share/nginx/html/image
+  #path: /test/data/nginx/html/image
+  #path: D:\Code\work\jpg
+  path: /shared
 
 server:
   port: 8019

src/main/resources/application-prod.yml

@@ -36,6 +36,8 @@ openfeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
+  OTMSFeign:
+    url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image

src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ eureka:
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 genxml:
-  pth: com/a
+  pth: com/agit
 cache:
   level: 2
 redis:

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
+    <update id="updatePurOrgId">
+    </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>
+</mapper>

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

@@ -687,12 +687,17 @@
         from (
                  select DB.BATCH_ID                                                         "batchId",
                         DB.RESULT_FOREIGN_SHIP_NAME                                         "foreignShipName",
+
                         CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
                  from DIL_BATCH DB
                           left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
                  where DB.RESULT_FOREIGN_SHIP_NAME is not null
+                <if test="materialId != null">
+                    and DB.MATERIAL_ID = #{materialId}
+                </if>
              )
         where instr("foreignShipName", #{index}) > 0
+
     </select>
 
     <select id="getPortId" resultType="java.util.Map">
@@ -828,18 +833,17 @@
         RM.MATERIAL_NAME "materialName",
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        AND RM.MATERIAL_ID != 2533
         <if test="materialNameText != null">
-            AND (instr(RM.MATERIAL_NAME, #{materialNameText}) > 0)
+            AND (instr(RM.MATERIAL_NAME || RM.MATERIAL_MODEL, #{materialNameText}) > 0)
         </if>
         <if test="materialSpecificationText != null">
             AND (instr(RM.MATERIAL_SPECIFICATION, #{materialSpecificationText}) > 0)
         </if>
-        <if test="materialModelText != null">
-            AND (instr(RM.MATERIAL_MODEL, #{materialModelText}) > 0)
-        </if>
         )
         <where>
             <if test="materialName != null">
@@ -868,7 +872,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialId" desc
+            order by "materialCode" desc
         </if>
     </select>
 
@@ -932,10 +936,50 @@
         and OO.ORDER_STATUS = 4
     </select>
 
+    <select id="getXiNanCarrier" resultType="java.util.Map" >
+        SELECT RCA.CARRIER_ID   "id",
+               RCA.CARRIER_ID   "value",
+               RCA.CARRIER_NAME "label"
+        FROM RMS_CARRIER RCA
+        WHERE RCA.CARRIER_NAME LIKE '%西南水泥%'
+    </select>
+
     <select id="getArrivalByLike" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT RAS.ARRIVAL_NAME AS "arrivalName",
                RAS.ARRIVAL_ID AS "arrivalId"
         FROM RMSTRAIN_ARRIVAL_SEND RAS
         WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
     </select>
+
+    <select id="getOrderNum" parameterType="string" resultType="java.lang.Integer">
+        SELECT COUNT(OO.ORDER_ID)
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+              AND OO.ORDER_STATUS = 4
+    </select>
+
+    
+    <select id="getSteelWarehouse" resultType="java.util.Map">
+        SELECT RW.WAREHOUSE_ID   "id",
+               RW.WAREHOUSE_NAME "value"
+        FROM RMS_WAREHOUSE RW
+        WHERE RW.WAREHOUSE_TYPE_ID = 9
+    </select>
+
+    <select id="getShipNameMesByLike" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DB.RESULT_FOREIGN_SHIP_NAME "value",
+               RS.SUPPLIER_ID "supplierId",
+               RS.SUPPLIER_NAME "supplierName",
+               APO.PURCHASE_ORDER_ID "purchaseOrderId",
+               APO.PURCHASE_ORDER_NO  "purchaseOrderNo"
+               FROM DIL_BATCH DB
+               left join AMS_PURCHASE_ORDER APO
+               ON APO.BATCH_ID = DB.BATCH_ID
+               left join RMS_SUPPLIER RS
+               ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+               WHERE  APO.PURCHASE_ORDER_ID IS NOT NULL
+               and DB.RESULT_FOREIGN_SHIP_NAME like #{index}
+               and DB.MATERIAL_ID = #{materialId}
+    </select>
 </mapper>