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

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

@@ -1227,8 +1227,9 @@ public class AMScontroller{
                                                String con,
                                                Integer dispatchStatus,
                                                Integer sporadicStatus,
-                                               String carrierSsoId) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId);
+                                               String carrierSsoId,
+                                               String userId) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId);
     }
 
     @ApiModelProperty(value = "查看物资详情")
@@ -1253,12 +1254,28 @@ public class AMScontroller{
         return amsFeign.deleteSporadicOrders(sporadicOrderId);
     }
 
+
+
+
     @ApiOperation(value="下发零星物资订单")
     @PostMapping("/issueSporadicOrders")
     public Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList) {
         return amsFeign.issueSporadicOrders(mapList);
     }
 
+    @ApiOperation(value="停止零星订单一车多趟")
+    @PostMapping("/closeSporadicOrder")
+    public Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.closeSporadicOrder(map);
+    }
+
+
+    @ApiOperation(value="内转零星物流添加运输计划")
+    @PostMapping("/addInwardSporadicOrder")
+    public Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map) {
+        return amsFeign.addInwardSporadicOrder(map);
+    }
+
     @ApiOperation(value="新增零星物资进出厂（以及销售钢材退货）")
     @PostMapping("/addSporadicOrders")
     public Map<String, Object> addSporadicOrders(@RequestBody Map<String,Object> mapValue) {

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

@@ -139,7 +139,11 @@ public class OMSController {
     public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map) {
         return omsFeign.driverReceiveOrRefuse(map);
     }
-
+    @ApiOperation(value="撤销订单")
+    @PostMapping("/undoOrder")
+    public Map<String, Object> undoOrder(@RequestBody Map<String,Object> map) {
+        return omsFeign.undoOrder(map);
+    }
 
     @ApiOperation(value="司机接单信息")
     @ApiImplicitParams({

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

@@ -1061,4 +1061,9 @@ public class RMScontroller {
         return rmsFeign.getConsigneeFarId(state);
     }
 
+    @PostMapping("/isInHere")
+    public Integer isInHere(@RequestParam String personnelJobNumber) {
+        return rmsFeign.isInHere(personnelJobNumber);
+    }
+
 }

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

@@ -1248,7 +1248,8 @@ public interface AmsFeign {
                                               @RequestParam String con,
                                               @RequestParam Integer dispatchStatus,
                                               @RequestParam Integer sporadicStatus,
-                                              @RequestParam String carrierSsoId);
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String userId);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1264,6 +1265,14 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amstrucksporadicorders/issueSporadicOrders")
     Map<String, Object> issueSporadicOrders(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/closeSporadicOrder")
+    Map<String, Object> closeSporadicOrder(@RequestBody Map<String, Object> map);
+
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/addInwardSporadicOrder")
+    Map<String, Object> addInwardSporadicOrder(@RequestBody Map<String, Object> map);
+
     @PostMapping("/api/v1/ams/amstrucksporadicorders/addSporadicOrders")
     Map<String, Object> addSporadicOrders(@RequestBody Map<String, Object> mapValue);
 

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

@@ -63,6 +63,11 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse")
     public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/oms/omstruckorders/undoOrder")
+    Map<String, Object> undoOrder(@RequestBody Map<String, Object> map);
+
+
+
     @PostMapping("api/v1/oms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
     public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,

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

@@ -575,4 +575,8 @@ public interface RmsFeign {
     @ApiOperation(value = "边输边查收货客户父节点")
     @PostMapping(value = "api/v1/rms/rmsconsignee/getConsigneeFarId")
     Map<String, Object> getConsigneeFarId(@RequestParam("state") String state);
+
+    @ApiOperation(value = "边输边查收货客户父节点")
+    @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
+    Integer isInHere(@RequestParam String personnelJobNumber);
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:192.168.1.107:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:

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

@@ -148,7 +148,8 @@
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
-                        RCA.CARRIER_NAME       "carrierName"
+                        RCA.CARRIER_NAME       "carrierName",
+                        RC.INSERT_UPDATE_REMARK "remark"
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID