1

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

@@ -103,6 +103,13 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.getTransOrderList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value="查询运输订单所有运输实绩")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/getTransResult")
+    public Map<String, Object> getTransResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.getTransResult(map);
+    }
+
     @ApiOperation(value="同步进厂")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/syncEnfactoryResult")
@@ -127,6 +134,7 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.syncWeightResult(map);
     }
 
+
     @ApiOperation(value="销售派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleDispatchOrder")
@@ -141,6 +149,160 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  Integer pageNum,
                                                  Integer pageSize) {
-        return tmsFeign.getSaleTransOrderList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return tmsFeign.getSaleTransOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="同步质检")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncQualityResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"质检实绩"})
+    public Map<String, Object> syncQualityResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncQualityResult(map);
+    }
+    @ApiOperation(value="签到")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/signIn")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"签到实绩"})
+    public Map<String, Object> signIn(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.signIn(map);
+    }
+
+    @ApiOperation(value="换车头")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/replaceFront")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"换车头实绩"})
+    public Map<String, Object> replaceFront(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.replaceFront(map);
+    }
+
+    @ApiOperation(value="装货")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/load")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
+    public Map<String, Object> load(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.load(map);
+    }
+
+    @ApiOperation(value="卸货")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/unload")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"卸货实绩"})
+    public Map<String, Object> unload(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.unload(map);
+    }
+
+    @ApiOperation(value="抵达")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/arrival")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"抵达实绩"})
+    public Map<String, Object> arrival(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.arrival(map);
+    }
+
+    @ApiOperation(value="签收")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/receipt")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"签收实绩"})
+    public Map<String, Object> receipt(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.receipt(map);
+    }
+
+
+    @ApiOperation(value="查询厂内车辆数")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/getCountEnfactory")
+    public Map<String, Object> getCountEnfactory(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.getCountEnfactory(map == null ? new HashMap<>():map);
+    }
+
+    @ApiOperation(value = "查询签到")
+    @PostMapping("/getSignInResultList")
+    public Map<String, Object> getSignInResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return tmsFeign.getSignInResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询换车头")
+    @PostMapping("/getReplaceFrontResultList")
+    public Map<String, Object> getReplaceFrontResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize) {
+        return tmsFeign.getReplaceFrontResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询进厂")
+    @PostMapping("/getEnfactoryResultList")
+    public Map<String, Object> getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getEnfactoryResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value = "查询出厂")
+    @PostMapping("/getOutfactoryResultList")
+    public Map<String, Object> getTmsOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getOutfactoryResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询装货")
+    @PostMapping("/getLoadResultList")
+    public Map<String, Object> getLoadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getLoadResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value = "查询卸货")
+    @PostMapping("/getUnloadResultList")
+    public Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getUnloadResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询计量")
+    @PostMapping("/getWeightResultList")
+    public Map<String, Object> getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getWeightResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询质检")
+    @PostMapping("/getQualityResultList")
+    public Map<String, Object> getQualityResult(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getQualityResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询抵达")
+    @PostMapping("/getArrivalResultList")
+    public Map<String, Object> getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getArrivalResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询签收")
+    @PostMapping("/getReceiptResultList")
+    public Map<String, Object> getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize){
+            return tmsFeign.getReceiptResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
+        }
 }

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

@@ -50,6 +50,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/changeTransOrder")
     Map<String, Object> changeTransOrder(Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/omstransorders/getTransResult")
+    Map<String, Object> getTransResult(Map<String, Object> map);
+
     @PostMapping("api/v1/tms/tmsenfactoryresults/syncEnfactoryResult")
     Map<String, Object> syncEnfactoryResult(Map<String, Object> map);
 
@@ -59,6 +62,7 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmsweightresults/syncWeightResult")
     Map<String, Object> syncWeightResult(Map<String, Object> map);
 
+
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
@@ -67,6 +71,91 @@ public interface TmsFeign {
                                           @RequestParam  Integer apiId,
                                           @RequestParam  Integer pageNum,
                                           @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
+    Map<String, Object> syncQualityResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmssigninresults/signIn")
+    Map<String, Object> signIn(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsreplacefrontresults/replaceFront")
+    Map<String, Object> replaceFront(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/tmsloadresults/load")
+    Map<String, Object> load(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/unload")
+    Map<String, Object> unload(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsarrivalresults/arrival")
+    Map<String, Object> arrival(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsreceiptresults/receipt")
+    Map<String, Object> receipt(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/getCountEnfactory")
+    Map<String, Object>  getCountEnfactory(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmssigninresults/getSignInResultList")
+    Map<String, Object> getSignInResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam  Integer apiId,
+                                            @RequestParam  Integer pageNum,
+                                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsreplacefrontresults/getReplaceFrontResultList")
+    Map<String, Object> getReplaceFrontResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                  @RequestParam  Integer apiId,
+                                                  @RequestParam  Integer pageNum,
+                                                  @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsenfactoryresults/getEnfactoryResultList")
+    Map<String, Object> getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam  Integer apiId,
+                                          @RequestParam  Integer pageNum,
+                                          @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsoutfactoryresults/getOutfactoryResultList")
+    Map<String, Object> getOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                              @RequestParam  Integer apiId,
+                                              @RequestParam  Integer pageNum,
+                                              @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsloadresults/getLoadResultList")
+    Map<String, Object> getLoadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                   @RequestParam  Integer apiId,
+                                                   @RequestParam  Integer pageNum,
+                                                   @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsunloadresults/getUnloadResultList")
+    Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam  Integer apiId,
+                                          @RequestParam  Integer pageNum,
+                                          @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsweightresults/getWeightResultList")
+    Map<String, Object> getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam  Integer apiId,
+                                            @RequestParam  Integer pageNum,
+                                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsqualityresults/getQualityResultList")
+    Map<String, Object> getQualityResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam  Integer apiId,
+                                            @RequestParam  Integer pageNum,
+                                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsarrivalresults/getArrivalResultList")
+    Map<String, Object> getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam  Integer apiId,
+                                         @RequestParam  Integer pageNum,
+                                         @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsreceiptresults/getReceiptResultList")
+    Map<String, Object> getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam  Integer apiId,
+                                         @RequestParam  Integer pageNum,
+                                         @RequestParam  Integer pageSize);
 }