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

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -1218,14 +1219,17 @@ public class AMScontroller{
     })
     @PostMapping("/getSporadicOrdersList")
     public RESTfulResult getSporadicOrdersList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer orderType,
-                                            Integer issueStatus,
-                                            String con,
-                                            Integer dispatchStatus) {
-        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus);
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               Integer issueStatus,
+                                               String con,
+                                               Integer dispatchStatus,
+                                               Integer sporadicStatus,
+                                               String carrierSsoId,
+                                               String userId) {
+        return amsFeign.getSporadicOrdersList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, issueStatus, con,dispatchStatus,sporadicStatus,carrierSsoId,userId);
     }
 
     @ApiModelProperty(value = "查看物资详情")
@@ -1250,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/TMSController.java

@@ -1421,9 +1421,9 @@ public class TMSController extends BaseRESTfulController {
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer orderType,String con
+                                                     Integer orderType,String con, String carrierSsoId
     ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId);
     }
 
 

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

@@ -139,7 +139,7 @@ public class UniversalController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="查询所有空闲的运力信息")
+    @ApiOperation(value="查询所有运力信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
@@ -158,16 +158,15 @@ public class UniversalController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         if(index != null){
-            mapValue.put("index","%" + index + "%");
+            mapValue.put("index", index);
         }
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
         }
-        BigDecimal carrierId = null;
         if (carrierSsoId != null) {
-          carrierId = universalMapper.getCarrierIdBySSO(carrierSsoId);
+          BigDecimal carrierId = universalMapper.getCarrierIdBySSO(carrierSsoId);
+          mapValue.put("carrierId",carrierId);
         }
-        mapValue.put("carrierId",carrierId);
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -407,7 +406,7 @@ public class UniversalController extends BaseRESTfulController {
     }
 
     @ApiModelProperty(value = "返回sha1加密字符串")
-    @PostMapping("/sha1DigestUtils")
+    @RequestMapping(value = "/sha1DigestUtils", method = {RequestMethod.GET,RequestMethod.POST})
     public String sha1DigestUtils(String text){
         return universalService.sha1DigestUtils(text);
     }

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

@@ -1246,7 +1246,10 @@ public interface AmsFeign {
                                               @RequestParam Integer orderType,
                                               @RequestParam Integer issueStatus,
                                               @RequestParam String con,
-                                              @RequestParam Integer dispatchStatus);
+                                              @RequestParam Integer dispatchStatus,
+                                              @RequestParam Integer sporadicStatus,
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String userId);
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/seeAllMaterials")
     RESTfulResult seeAllMaterials(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1262,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/TmsTruckFeign.java

@@ -192,7 +192,8 @@ public interface TmsTruckFeign {
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("con") String con
+                                               @RequestParam("con") String con,
+                                               @RequestParam("carrierSsoId")String carrierSsoId
     );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")

src/main/resources/application-dev.yml

@@ -8,9 +8,9 @@ spring:
     name: dil-api
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    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:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:192.168.1.107:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 

src/main/resources/application-prod.yml

@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.108:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

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

@@ -153,30 +153,31 @@
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID
-                 WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
+                 WHERE RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RC.CARRIER_ID = #{carrierId}
             </if>
-             ) RCRC
-        <if test="index != null">
-            where RCRC."capacityNumber" LIKE #{index}
-        </if>
-        <if test="index != null">
-            or RCRC."carrierName" LIKE #{index}
+            <if test="index != null">
+                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
+            </if>
+        )
+        <where>
+            <if test="capacityNumber != null">
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "capacityNumber"
         </if>
-<!--        <where>-->
-<!--            <if test="capacityNumber != null">-->
-<!--                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">-->
-<!--                    "capacityNumber" like '%${item}%'-->
-<!--                </foreach>-->
-<!--            </if>-->
-<!--            <if test="carrierName != null">-->
-<!--                and-->
-<!--                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">-->
-<!--                    "carrierName" like '%${item}%'-->
-<!--                </foreach>-->
-<!--            </if>-->
-<!--        </where>-->
     </select>
 
     <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >