合并辅料

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.OmsFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

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

@@ -4,9 +4,11 @@ import com.steerinfo.dil.feign.TmsshipFeign;
 import com.steerinfo.dil.feign.TmsTrainFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -642,6 +644,12 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getPierId();
     }
 
+    @ApiOperation(value="查询特定所有的物资")
+    @GetMapping("/getFuMaterial/{type}")
+    public Map<String, Object> getFuMaterial(@PathVariable("type")Integer type){
+        return tmsTruckFeign.getFuMaterial(type);
+    }
+
     @GetMapping("getResultNumber")
     @ApiOperation(value = "得到实绩编号下拉")
     public Map<String, Object> getResultNumber(){
@@ -1125,8 +1133,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize) {
-        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+                                          Integer pageSize,
+                                                Integer orderType) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
     }
 
 
@@ -1168,7 +1177,7 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
     }
 
-    @ApiOperation(value="更新卸货实绩 实际上是更新实绩")
+    @ApiOperation(value="添加卸货实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
@@ -1177,6 +1186,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.addUnloadResult(mapValue);
     }
 
+    @ApiOperation(value="更新卸货实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/updateUnloadResult")
+    public Map<String, Object> updateUnloadResult(@RequestBody Map<String, Object> mapValue){
+        return tmsTruckFeign.updateUnloadResult(mapValue);
+    }
     //****************************************TmstruckReceiptResultController*******************************
 
 
@@ -1192,9 +1209,10 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
+                                          Integer pageSize,
+                                                Integer orderType
     ){
-        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
     }
 
 
@@ -1213,9 +1231,10 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize
+                                               Integer pageSize,
+                                                     Integer orderType
     ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType);
     }
 
     @ApiOperation(value="PAD扫描汽车出厂实绩")

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -105,7 +106,8 @@ public interface TmsTruckFeign {
     public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize);
+                                          @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("orderType") Integer orderType);
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
     public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
@@ -129,6 +131,8 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
     public Map<String, Object> addUnloadResult(@RequestBody Map<String, Object> mapValue);
 
+    @PostMapping("api/v1/truckTms/tmstruckunloadresult/updateUnloadResult")
+    public Map<String, Object> updateUnloadResult(@RequestBody Map<String, Object> mapValue);
 
     /*
     TmstruckReceiptResultController
@@ -139,7 +143,8 @@ public interface TmsTruckFeign {
     public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize);
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderType") Integer orderType);
 
     /*
     TmstruckLeaveFactoryResultController
@@ -150,7 +155,9 @@ public interface TmsTruckFeign {
     public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize);
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("orderType") Integer orderType
+    );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
     public Map<String, Object> addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
@@ -221,6 +228,9 @@ public interface TmsTruckFeign {
 
     @GetMapping("api/v1/truckTms/dropDown/getPort")
     Map<String, Object> getPort();
+
+    @GetMapping("api/v1/truckTms/dropDown/getFuMaterial/{type}")
+    Map<String, Object> getFuMaterial(@PathVariable("type")Integer type);
 }
 
 

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:dev-discovery.steerinfo.com}:${EUREKA_PORT:80}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:paas-discovery-test.steerinfo.com}:${EUREKA_PORT:80}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/