tijiao

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

@@ -645,7 +645,7 @@ public class OMSController {
                                                  Integer pageSize,
                                                  Integer type,
                                                  Integer orderStatus,
-                                                 Integer carrierId,
+                                                 String carrierId,
                                                  String  con) {
         return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con);
     }
@@ -653,6 +653,9 @@ public class OMSController {
     @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
     @PostMapping("/updateOmstruckOrder")
     public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
+        Integer orderId = Integer.parseInt(map.get("orderId").toString()) ;
+        map.remove("orderId");
+        map.put("orderId",orderId);
         return omsFeign.updateOmstruckOrder(map);
     }
 

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

@@ -80,6 +80,34 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "查询所有发货单位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/queryAllSupplierByLike")
+    public RESTfulResult queryAllSupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index","%" + index + "%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryAllSupplierByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryAllSupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+
     @ApiModelProperty(value = "通过物资ID查询该物资的发货单位信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -360,7 +360,7 @@ public interface OmsFeign {
                                                        @RequestParam("pageNum") Integer pageNum,
                                                        @RequestParam("pageSize") Integer pageSize,
                                                        @RequestParam("orderStatus") Integer orderStatus,
-                                                       @RequestParam("carrierId") Integer carrierId,
+                                                       @RequestParam("carrierId") String carrierId,
                                                        @RequestParam("type") Integer type,
                                                        @RequestParam("con") String con
                                                        );

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

@@ -64,4 +64,7 @@ public interface UniversalMapper {
 
     // 模糊查询收货单位
     List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
+
+    //模糊查询所有发货单位
+    List<Map<String, Object>> queryAllSupplierByLike(Map<String, Object> mapValue);
 }

src/main/resources/bootstrap.yml

@@ -46,7 +46,7 @@ openfeign:
     WMSFeign:
       url: ${WMSFEIGN_URL:172.16.33.166:8093}
     OMSFeign:
-      url: ${OMSFEIGN_URL:172.16.33.166:8095}
+      url: ${OMSFEIGN_URL:localhost:8095}
     RmsFeign:
       url: ${RMSFEIGN_URL:172.16.33.166:8060}
   #测试环境

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

@@ -501,4 +501,18 @@
         </if>
         order by "consigneeCompanyName"
     </select>
+    <select id="queryAllSupplierByLike" resultType="java.util.Map">
+        select *
+        from (
+        select distinct RS.SUPPLIER_ID      "supplierId",
+        RS.SUPPLIER_NAME    "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        from RMS_SUPPLIER RS
+        )
+        <where>
+            <if test="index != null">
+                "supplierName" like #{index}
+            </if>
+        </where>
+    </select>
 </mapper>