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

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

@@ -680,6 +680,13 @@ public class OMSController {
         return omsFeign.getOrderResult(map);
     }
 
+    @ApiOperation(value = "装机查询所以已装车的订单信息")
+    @PostMapping("/getLoadForLoadCarResult")
+    public  Map<String, Object> getLoadForLoadCarResult(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.getLoadForLoadCarResult(map);
+    }
+
+
     @ApiOperation(value = "查询未下发的零星物资订单")
     @PostMapping("/getOthersOrderMesToSend")
     public Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -797,4 +804,28 @@ public class OMSController {
     public Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map){
         return omsFeign.getTimeOrderResult(map);
     }
+
+    @ApiOperation(value = "装机查询所以已装车的订单信息")
+    @PostMapping("/getCapacityTypeByUserId")
+    public Map<String, Object> getCapacityTypeByUserId(@RequestBody (required = false) Map<String, Object> map) {
+        return omsFeign.getCapacityTypeByUserId(map);
+    }
+
+    @ApiOperation(value = "查询钢材订单号")
+    @GetMapping("getSteelOrderNum")
+    public Map<String, Object> getSteelOrderNum(String capacityId){
+        return omsFeign.getSteelOrderNum(capacityId);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @GetMapping("getMesToSteelDepartment")
+    public Map<String, Object> getMesToSteelDepartment(Integer orderId){
+        return omsFeign.getMesToSteelDepartment(orderId);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @PostMapping("updateMaterialMes")
+    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.updateMaterialMes(map);
+    }
 }

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

@@ -43,6 +43,16 @@ public class OTMSController {
         return tmsTruckFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
+    @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 tmsTruckFeign.getHaveAbnormalTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
     @ApiOperation("查询在途运输")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -51,8 +61,8 @@ 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
     ){
@@ -78,5 +88,36 @@ public class OTMSController {
         return tmsTruckFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
     }
 
+    @PostMapping(value = "/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch(){
+        return tmsTruckFeign.selectWarnSwitch();
+    }
+
+    /**是否开启运输报警状态
+     * warnSwitchaddTmstruckTotalResult
+     * @param
+     * @returninTransitOrderMileage
+     */
+    @ApiOperation(value="是否开启运输报警状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "warnSwitch", value = "运输报警状态", required = false, dataType = "String")
+    })
+    @PostMapping(value = "/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio){
+        return tmsTruckFeign.inTransitWarn(warnSwitch,radio);
+    }
+
+    @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 tmsTruckFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
+    }
+
+
 
 }

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

@@ -557,17 +557,18 @@ public class TMSController extends BaseRESTfulController {
                                                               Integer pageNum,
                                                               Integer pageSize,
                                                               Integer apiId,
-                                                              Integer status) {
+                                                              Integer status,
+                                                              String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
     @ApiOperation(value = "新增提货委托")
-    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
-        return tmsshipFeign.insertshipDeliveryAttorney(amsshipDeliveryAttorney);
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.insertshipDeliveryAttorney(map);
     }
 
     @PostMapping("deleteByAttorneyId/{attorneyId}")
@@ -646,9 +647,9 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.sendDeliveryNotice(noticeId);
     }
     //船舶动态表
-    @PostMapping("/selectAll")
-    Map<String, Object> selectAll(){
-        return tmsshipFeign.selectAll();
+    @PostMapping("/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics(){
+        return tmsshipFeign.selectAllShipDynamaics();
     }
 
     /**
@@ -2102,6 +2103,7 @@ public class TMSController extends BaseRESTfulController {
 
 
 
+
     @ApiOperation(value="查询零星中转统计报表")
     @PostMapping("/getLXInwardReport")
     public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2142,4 +2144,23 @@ public class TMSController extends BaseRESTfulController {
     public String getReceiptPhoto(@RequestParam String orderNumber){
         return tmsTruckFeign.getReceiptPhoto(orderNumber);
     }
+
+
+    @ApiOperation("厂外收货作业")
+    @PostMapping("/getReceivingResult")
+    public Map<String,Object> getReceivingResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return tmsTruckFeign.getReceivingResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhoto")
+    public Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber){
+        return tmsTruckFeign.getReceivingPhoto(orderNumber);
+    }
 }

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

@@ -785,4 +785,12 @@ public class UniversalController extends BaseRESTfulController {
     public Integer getNotReceiveOrderQuantity(@RequestParam("capacityNumber") String capacityNumber){
         return universalMapper.getNotReceiveOrderQuantity(capacityNumber);
     }
+
+    @ApiModelProperty(value = "边输边查发站到站")
+    @GetMapping("/getArrivalByLike")
+    public RESTfulResult getArrivalByLike(@RequestParam("index") String index){
+        List <Map<String,Object>> list = universalMapper.getArrivalByLike(index == null ? "" : index);
+        return success(list);
+    }
+
 }

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

@@ -131,6 +131,14 @@ public class WMSHController extends BaseRESTfulController {
         return wmshFeign.addWarehousingResult(wmshInboundResult);
     }
 
+    @PostMapping("clearWmshGridMaterial")
+    @ApiOperation(value = "添加港存库入库实绩")
+    RESTfulResult clearWmshGridMaterial(@RequestBody Map<String, Object> wmshInboundResult) {
+        return wmshFeign.clearWmshGridMaterial(wmshInboundResult);
+    }
+
+
+
     @PostMapping("addResult")
     @ApiOperation(value = "添加港存库出库实绩")
     RESTfulResult addResult(@RequestBody Map<String, Object> map) {

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/OmsFeign.java

@@ -468,5 +468,23 @@ public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
     Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
+
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getLoadForLoadCarResult")
+    Map<String,Object> getLoadForLoadCarResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityTypeByUserId")
+    Map<String,Object> getCapacityTypeByUserId(Map<String, Object> map);
+
+
+    @GetMapping("api/v1/oms/omstruckmatetialorders/getSteelOrderNum")
+    public Map<String, Object> getSteelOrderNum(@RequestParam("capacityId") String capacityId);
+
+    @GetMapping("api/v1/oms/omstruckmatetialorders/getMesToSteelDepartment")
+    public Map<String, Object> getMesToSteelDepartment(@RequestParam("orderId")Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
+    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
+
 }
 

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

@@ -532,6 +532,19 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptPhoto")
     String getReceiptPhoto(@RequestParam String orderNumber);
 
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingResult")
+    Map<String, Object> getReceivingResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
+    Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
+
     @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
     public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
     @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")
@@ -556,6 +569,30 @@ public interface TmsTruckFeign {
                                                  @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
                                                  @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     );
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch();
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    @PostMapping("/api/v1/truckTms/pathDisplay/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "pageSize") Integer pageSize);
 }
 
 

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

@@ -579,7 +579,7 @@ public interface TmsshipFeign {
                                              @RequestParam String con);
 
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupList")
-      Map<String, Object>      getGroupList (@RequestBody(required = false) Map<String, Object> mapValue,
+      Map<String, Object> getGroupList (@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
                                              @RequestParam Integer apiId,
@@ -634,16 +634,17 @@ public interface TmsshipFeign {
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
-                                                 @RequestParam Integer status);
+                                                 @RequestParam Integer status,
+                                                       @RequestParam String con);
 
     /**
      * 新增提货委托
      *
-     * @param amsshipDeliveryAttorney
+     * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
-    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody(required = false) Map<String, Object> map);
 
     /**
      * 逻辑删除提货委托
@@ -743,8 +744,8 @@ public interface TmsshipFeign {
     Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
 
     //船舶动态表
-    @PostMapping("api/v1/shipTms/shipdynamics/selectAll")
-    Map<String, Object> selectAll();
+    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics();
 
 
     //获取合同水分值，实装吨位，水分吨位

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

@@ -123,4 +123,7 @@ public interface WMSHFeign {
     @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/addResult")
     RESTfulResult addResult(@RequestBody(required = false) Map<String, Object> map);
 
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/clearWmshGridMaterial")
+    RESTfulResult clearWmshGridMaterial(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
 }

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

@@ -178,4 +178,7 @@ public interface UniversalMapper {
     List<Map<String,Object>> getNoListCarrier();
     //通过车牌号查询未接收的订单数量（用于APP显示未接收小红点）
     Integer getNotReceiveOrderQuantity(String capacityNumber);
+
+    //边输边查发站到站
+    List<Map<String, Object>> getArrivalByLike(String index);
 }

src/main/resources/application-dev.yml

@@ -38,8 +38,8 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  path: C:\Users\24390\Desktop\work\a
-#  path: /shared
+  #path: C:\Users\24390\Desktop\work\a
+  path: /shared
 
 server:
   port: 8019

src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ eureka:
     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/UniversalMapper.xml

@@ -320,7 +320,7 @@
                         RW.WAREHOUSE_ID   "warehouseId",
                         RW.WAREHOUSE_NAME "warehouseName"
                  from RMS_WAREHOUSE RW
-                 where RW.DELETED = 0
+                 where DELETED=0
                      <if test="type != null">
                       and   RW.WAREHOUSE_TYPE_ID = #{type}
                      </if>
@@ -749,13 +749,12 @@
 
     <select id="getCapacityType" resultType="java.util.Map" parameterType="java.util.Map">
         select RCT.CAPACITY_TYPE_ID "capacityTypeId",
-               RCT.CAPACITY_TYPE_NAME "capacityTypeName"
+                RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+                RCT.WHETHER_CAR "whether"
         from RMS_CAPACITY_TYPE RCT
         <if test="index!=null">
         where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
         </if>
-
-
     </select>
 
 
@@ -932,4 +931,11 @@
         where OO.CAPACITY_ID = (select CAPACITY_ID from RMS_CAPACITY where CAPACITY_NUMBER = #{capacityNumber})
         and OO.ORDER_STATUS = 4
     </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>
 </mapper>