'销售'

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

@@ -0,0 +1,38 @@
+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;
+
+/*
+ * 后台处理程序
+ */
+
+@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

@@ -681,6 +681,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,
@@ -798,4 +805,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

@@ -5,6 +5,8 @@ import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -41,6 +43,32 @@ 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"),
+            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getFinishTruckOrderInfo")
+    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);
+    }
+
     @PostMapping(value = "/addtmstruckArrivalResult")
     public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartFile file){
         return tmsTruckFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
@@ -59,4 +87,40 @@ 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);
+    }
+
+    @PostMapping("/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception{
+        return tmsTruckFeign.fullPathVisualizationByCarNumber(mapValue);
+    }
+
 }

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();
     }
 
     /**
@@ -2104,6 +2105,7 @@ public class TMSController extends BaseRESTfulController {
 
 
 
+
     @ApiOperation(value="查询零星中转统计报表")
     @PostMapping("/getLXInwardReport")
     public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2127,4 +2129,40 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
+    @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 tmsTruckFeign.getReceiptResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示满货箱的照片")
+    @PostMapping("/getReceiptPhoto")
+    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

@@ -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;
@@ -744,8 +745,10 @@ public class UniversalController extends BaseRESTfulController {
 
         //List<String> list = universalService.getWarrantyAndPrint(orderNumber);
         List<String> list= universalService.getWarranty(orderNumber);
-        if(list.get(0).equals("0")){
-            return failed("质保书正在紧张制作中，请耐心等待！");
+        if(list.get(0).equals("-1")){
+            return failed(-1,"质保书正在紧张制作中，请耐心等待！");
+        }else if(list.get(0).equals("-2")){
+            return failed(-2,"该车还未装货");
         }
         return success(list);
     }
@@ -789,4 +792,28 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult getXiNanCarrier() {
         return success(universalMapper.getXiNanCarrier());
     }
+
+    @ApiModelProperty(value = "边输边查发站到站")
+    @GetMapping("/getArrivalByLike")
+    public RESTfulResult getArrivalByLike(@RequestParam("index") String index){
+        List <Map<String,Object>> list = universalMapper.getArrivalByLike(index == null ? "" : index);
+        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;
+    }
 }

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

@@ -989,8 +989,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/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

@@ -469,5 +469,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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.*;
 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;
 
@@ -520,8 +522,33 @@ public interface TmsTruckFeign {
                                           @RequestParam String con
                                          );
 
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/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
+    );
 
+    @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/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")
@@ -540,7 +567,36 @@ public interface TmsTruckFeign {
 
 //    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult", headers = "content-type=multipart/form-data",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 //    public  RESTfulResult addTmstruckReceiptResult(@RequestPart("file")MultipartRequest request,@RequestParam("num") Integer num,@RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
+    @PostMapping("/api/v1/truckTms/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(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/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/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/BackgroundProcessingMapper.java

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

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

@@ -180,4 +180,9 @@ public interface UniversalMapper {
     Integer getNotReceiveOrderQuantity(String capacityNumber);
 
     List<Map<String,Object>> getXiNanCarrier();
+    //边输边查发站到站
+    List<Map<String, Object>> getArrivalByLike(String index);
+
+    //查询已下发订单数量  -->APP小红点
+    Integer getOrderNum(String capacityNumber);
 }

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

@@ -0,0 +1,8 @@
+package com.steerinfo.dil.service.impl;
+
+import org.springframework.stereotype.Service;
+
+@Service(value = "backgroundProcessingService")
+public class BackgroundProcessingServiceImpl {
+
+}

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;
@@ -81,26 +84,32 @@ public class UniversalServiceImpl implements UniversalService {
 
     @Override
     public List<String> getWarranty(String orderNumber) {
+        List<String> list = new ArrayList<>();
         //回传金蝶
         //根据orderNumber查询
         Map<String,Object> map = getWarrantyToES(orderNumber);
-        String string = joinFeign.sendWarranty(map);
-        Map<String,Object> waMap = JSON.parseObject(string);
-        List<String> list = new ArrayList<>();
-        //成功
-        if(waMap.get("kdStatus").equals("1")){
-            List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
-            Map<String,Object> map1 = reportList.get(0);
-            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
-            Map.Entry<String,Object> entry;
-            while(it.hasNext()){
-                entry =  it.next();
-                String value = (String) entry.getValue();
-                list.add(value);
+        String string = null;
+        try{
+             string = joinFeign.sendWarranty(map);
+            Map<String,Object> waMap = JSON.parseObject(string);
+            //成功
+            if(waMap.get("kdStatus").equals("1")){
+                List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
+                Map<String,Object> map1 = reportList.get(0);
+                Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+                Map.Entry<String,Object> entry;
+                while(it.hasNext()){
+                    entry =  it.next();
+                    String value = (String) entry.getValue();
+                    list.add(value);
+                }
+            }    //失败
+            else{
+                list.add("-1");
             }
-        }//失败
-        else{
-            list.add("0");
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            list.add("-2");
         }
         return list;
     }
@@ -197,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

@@ -22,13 +22,13 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
@@ -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/application-prod.yml

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

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/BackgroundProcessingMapper.xml

@@ -0,0 +1,14 @@
+<?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>
+</mapper>

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>
 
 
@@ -941,4 +940,19 @@
         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>
 </mapper>