3.28

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

@@ -421,6 +421,20 @@ public class AMScontroller{
         return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, deleted);
     }
 
+    @PostMapping("/getInwardContractPrice")
+    @ApiOperation(value = "查询内转汽运单价信息")
+    public Map<String, Object> getInwardContractPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId,
+                                                             Integer deleted) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted);
+    }
+
+
     /**
      * 新增汽运单价
      * @param mapVal
@@ -431,6 +445,14 @@ public class AMScontroller{
     Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody Map<String, Object> mapVal) {
         return amsFeign.addAmsContractTransportUnitPrice1(mapVal);
     }
+
+
+    @PostMapping("insertInwardPrice")
+    @ApiOperation(value = "新增内转运输单价")
+    Map<String, Object> insertInwardPrice(@RequestBody Map<String, Object> mapVal) {
+        return amsFeign.insertInwardPrice(mapVal);
+    }
+
     @PostMapping("deleteAmsContractTransportPrice1")
     @ApiOperation(value = "通过主键id删除汽运单价")
     Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId) {
@@ -1069,7 +1091,7 @@ public class AMScontroller{
     }
     //删除用车需求
     @PostMapping("/deleteTruckRequirement/{requirementId}")
-    public Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
+    public Map<String,Object> deleteTruckReqgetTruckRequirementListuirement(@PathVariable("requirementId") BigDecimal requirementId) {
         return amsFeign.deleteTruckRequirement(requirementId);
     }
     //下发用车需求
@@ -1697,4 +1719,29 @@ public class AMScontroller{
     public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
         return amsFeign.refuseDispatchSaleOrderList(mapList);
     }
+
+    @ApiOperation(value="获取零星订单的物资详情")
+    @PostMapping(value = "/getSporadic")
+    public Map<String, Object> getSporadic(Integer sporadicId) {
+        return amsFeign.getSporadic(sporadicId);
+    }
+
+    @ApiOperation(value = "查零星订单物资详情")
+    @PostMapping("/getSporadicOfOrder")
+    public Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer sporadicId
+    ) {
+        return amsFeign.getSporadicOfOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,sporadicId);
+    }
+
+
+    @ApiOperation(value = "查询内转物流运输单价")
+    @PostMapping("/getInwardPriceBy")
+    public Map<String,Object>getInwardPriceBy(@RequestBody(required = false)Map<String,Object>mapvalue){
+        return amsFeign.getInwardPriceBy(mapvalue);
+    }
+
 }

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

@@ -561,4 +561,35 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.addLossFeeOfCoke(map);
     }
 
+    /**
+     * 展示详单信息
+     *
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示内转汽运未生成账单的作业详单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "还没定", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "orderType", value = "1:计时,2:计数，3：计重，4：包月", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getInwardWeightDetailsOrder")
+    public Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           String carrierSsoId,
+                                                           Integer detailStatus,
+                                                           Integer orderType,
+                                                           String userId) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId);
+    }
+
 }

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

@@ -748,6 +748,25 @@ public class OMSController {
         return omsFeign.getAllLoadUnloadResult(mapValue);
     }
 
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEnd")
+    public Map<String, Object> getTimeTaskEnd(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEnd(mapValue);
+    }
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEndDetail")
+    public Map<String, Object> getTimeTaskEndDetail(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEndDetail(mapValue);
+    }
+
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getPauseTimeTaskDetail")
+    public Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId){
+        return omsFeign.getPauseTimeTaskDetail(orderId);
+    }
+
     @ApiOperation(value="批量关闭运输订单")
     @PostMapping("/batchCloseOrder")
     public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
@@ -773,4 +792,9 @@ public class OMSController {
         return omsFeign.closeInwardOrder(orderId);
     }
 
+    @ApiOperation(value = "计时查询进程")
+    @PostMapping("/getTimeOrderResult")
+    public Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map){
+        return omsFeign.getTimeOrderResult(map);
+    }
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -206,8 +207,8 @@ public class RMScontroller {
         return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
     //    处理承运商照片
-    @PostMapping("/uploadCarrier1")
-    public int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile){
+    @PostMapping(value = "/uploadCarrier1")
+    public String uploadCarrier1(@RequestParam ("file") MultipartFile multipartFile){
         return rmsFeign.uploadCarrier1(multipartFile);
     }
     //    处理承运商照片

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

@@ -1817,9 +1817,12 @@ public class TMSController extends BaseRESTfulController {
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              String con
+                                              String con,
+                                              String  userId,
+                                              String startTime,
+                                              String endTime
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -1932,7 +1935,8 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               String startTime, String endTime,
+                                               String startTime,
+                                               String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1943,7 +1947,8 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          String startTime, String endTime,
+                                          String startTime,
+                                          String endTime,
                                           String carrierSsoId
     ){
         return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
@@ -2010,6 +2015,8 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+
+
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);
@@ -2021,6 +2028,34 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
     }
 
+
+    @ApiOperation(value="新增计时作业实绩")
+    @PostMapping("/addTimeTaskResult")
+    public Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.addTimeTaskResult(map);
+    }
+
+    @ApiOperation(value="计时判断是否开始")
+    @PostMapping("/JudgeTimeTask")
+    public Map<String, Object> JudgeTimeTask(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTask(map);
+    }
+
+
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/unitSureEndTimeout")
+    public Map<String, Object> unitSureEndTimeout(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.unitSureEndTimeout(map);
+    }
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/JudgeTimeTaskPause")
+    public Map<String, Object> JudgeTimeTaskPause(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTaskPause(map);
+    }
+
+
     @ApiOperation(value="对内转车辆装货点进行统计")
     @PostMapping("/getLoading")
     public Map<String, Object> getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2033,6 +2068,23 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
 
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoaderResult")
+    public Map<String, Object> getLoaderResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getLoaderResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
+
+
+
     @ApiOperation(value="对内转车辆装卸货点进行统计")
     @PostMapping("/getUnLoading")
     public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2044,4 +2096,22 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+
+
+
+
+
+
+    @ApiOperation(value="查询零星中转统计报表")
+    @PostMapping("/getLXInwardReport")
+    public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String startTime,
+                                           String endTime
+    ){
+        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
 }

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

@@ -178,6 +178,38 @@ public class UniversalController extends BaseRESTfulController {
     }
 
 
+
+
+    @ApiOperation(value="查询运力类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityType")
+    public RESTfulResult getCapacityType(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null&&!index.equals("null")){
+            mapValue.put("index", index);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getCapacityType(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
+        return success(pageList);
+    }
+
+
+
     @ApiOperation(value="通过订单ID查询订单下所有物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -631,11 +663,38 @@ public class UniversalController extends BaseRESTfulController {
        return success(carrier);
     }
 
+
     @ApiOperation(value = "质保书前端展示")
     @PostMapping("/getWarranty")
-    public RESTfulResult getWarranty(@RequestParam("orderNumber") String orderNumber){
+    public RESTfulResult getWarranty(@RequestParam("orderNumber") String orderNumber) {
 
-       List<String> list = universalService.getWarrantyAndPrint(orderNumber);
+        //List<String> list = universalService.getWarrantyAndPrint(orderNumber);
+        List<String> list= universalService.getWarranty(orderNumber);
+        if(list.get(0).equals("0")){
+            return failed("质保书正在紧张制作中，请耐心等待！");
+        }
         return success(list);
     }
+    @ApiOperation(value = "查询待分解计划数量")
+    @PostMapping("/getPlanCount")
+    public Integer getPlanCount(){
+        return universalMapper.getPlanCount();
+    }
+
+    @ApiOperation(value = "查询承运起止地点下拉框")
+    @GetMapping("/getTransRange")
+    public RESTfulResult getTransRange(){
+        return success(universalMapper.getTransRange());
+
+    }
+
+//    //测试质保书回显
+//    @PostMapping("/getTest")
+//    public RESTfulResult getTest(@RequestBody Map<String,Object> map){
+//       List<String> list = universalService.getTest(map);
+//       if(list.get(0).equals("0")){
+//           return failed("质保书正在紧张制作中，请耐心等待！");
+//       }
+//       return success(list);
+//    }
 }

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

@@ -545,8 +545,7 @@ public class WMSController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String con,
                                         String startTime,
-                                        String endTime
-                                      ) {
+                                        String endTime) {
         return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 

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

@@ -1538,4 +1538,37 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
     Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amstrucksporadicorders/getSporadic")
+    Map<String, Object> getSporadic(@RequestParam Integer sporadicId);
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/getSporadicOfOrder")
+    Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        @RequestParam Integer apiId,
+                                                        @RequestParam Integer pageNum,
+                                                        @RequestParam Integer pageSize,
+                                                        @RequestParam Integer sporadicId);
+
+    /*
+    新增内转运输单价
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/insertInwardPrice")
+    Map<String, Object> insertInwardPrice(Map<String, Object> mapVal);
+
+
+    @ApiOperation(value="查询汽运单价信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardContractPrice")
+    Map<String, Object> getInwardContractPrice(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("deleted") Integer deleted);
+    //根据物资查询运输物资单价
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
+    Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
+
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.sun.corba.se.spi.ior.ObjectKey;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -222,4 +223,25 @@ public interface BmstruckFeign {
 
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addLossFeeOfCoke")
     RESTfulResult addLossFeeOfCoke(@RequestBody Map<String, Object> map);
+
+    /**
+     * 内转结算详单
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @param carrierSsoId
+     * @param detailStatus
+     * @param orderType
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getInwardWeightDetailsOrder")
+    Map<String, Object> getInwardWeightDetailsOrder(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                    @RequestParam("pageNum") Integer pageNum,
+                                                    @RequestParam("pageSize") Integer pageSize,
+                                                    @RequestParam("apiId") Integer apiId,
+                                                    @RequestParam("carrierSsoId") String carrierSsoId,
+                                                    @RequestParam("detailStatus") Integer detailStatus,
+                                                    @RequestParam("orderType") Integer orderType,
+                                                    @RequestParam("userId") String userId);
 }

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

@@ -19,4 +19,7 @@ public interface JoinFeign {
     @PostMapping("api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult")
     Map<String, Object> receiveTmsTruckWeightResult(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("api/v1/join/wmsoutboundresult/sendWarranty")
+    String sendWarranty(@RequestBody Map<String, Object> map);
+
 }

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

@@ -8,6 +8,7 @@ import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -455,5 +456,17 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
     Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
 
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeOrderResult")
+    Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEnd")
+
+
+    Map<String, Object> getTimeTaskEnd(@RequestBody Map<String, Object> mapValue);
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEndDetail")
+    Map<String, Object> getTimeTaskEndDetail(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
+    Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
 }
 

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -108,14 +109,14 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
     //    处理承运商照片
-    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier1")
-    int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile);
+    @PostMapping(value = "api/v1/rms/rmscarrier/uploadCarrier1" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCarrier1(@RequestPart("file") MultipartFile multipartFile);
     //    处理承运商照片
     @PostMapping("api/v1/rms/rmscarrier/uploadCarrier2")
-    int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile);
+    int uploadCarrier2(@RequestParam("file")MultipartFile multipartFile);
     //    处理承运商照片
     @PostMapping("api/v1/rms/rmscarrier/uploadCarrier3")
-    int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile);
+    int uploadCarrier3(@RequestPart("file") MultipartFile multipartFile);
     //    更新承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
     Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);

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

@@ -329,7 +329,10 @@ public interface TmsTruckFeign {
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con") String con);
+                                              @RequestParam("con") String con,
+                                              @RequestParam("userId") String userId,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -454,6 +457,11 @@ public interface TmsTruckFeign {
     Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
 
 
+    //新增计时作业实绩
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
+    Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);
+
+
     @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
     Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer apiId,
@@ -469,7 +477,35 @@ public interface TmsTruckFeign {
                                      @RequestParam Integer pageSize,
                                      @RequestParam String startTime,
                                      @RequestParam String endTime);
-    }
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderResult")
+    Map<String, Object> getLoaderResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
+    Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/unitSureEndTimeout")
+    Map<String, Object> unitSureEndTimeout(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTaskPause")
+    Map<String, Object> JudgeTimeTaskPause(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLXInwardReport")
+    Map<String, Object> getLXInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+}
 
 
 

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

@@ -140,4 +140,17 @@ public interface UniversalMapper {
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
     List<Map<String,Object>> getWarranty(String orderNumber);
+
+    List<Map<String, Object>> getCapacityType(Map<String, Object> mapValue);
+
+    Integer getPlanCount();
+
+    List<Map<String, Object>> getTransRange();
+
+
+    BigDecimal getResultMaterialId(String orderNumber);
+
+    Map<String, Object> selectNum(String orderNumber);
+
+    List<Map<String, Object>> selectOutbound(String orderNumber);
 }

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -17,4 +17,8 @@ public interface UniversalService {
     Map<String, Object> getNowLineMes(Map<String, Object> map);
 
     List<String> getWarrantyAndPrint(String orderNumber);
+
+    List<String> getWarranty(java.lang.String orderNumber);
+
+    List<String> getTest(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -1,7 +1,11 @@
 package com.steerinfo.dil.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.UniversalService;
+import com.steerinfo.dil.util.ESUtil;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -9,10 +13,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.sql.Blob;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ author    :TXF
@@ -24,6 +25,12 @@ public class UniversalServiceImpl implements UniversalService {
 
     @Resource
     private UniversalMapper universalMapper;
+
+    @Autowired
+    private JoinFeign joinFeign;
+
+    @Autowired
+    private ESUtil esUtil;
     /**
      * 打印提货单
      * @param orderNumber 运输订单号
@@ -72,6 +79,66 @@ public class UniversalServiceImpl implements UniversalService {
         return list;
     }
 
+    @Override
+    public List<String> getWarranty(String orderNumber) {
+        //回传金蝶
+        //根据orderNumber查询
+        Map<String,Object> map = getWarrantyToES(orderNumber);
+        String string = joinFeign.sendWarranty(map);
+        Map<String,Object> waMap = JSON.parseObject(string);
+        List<String> list = new ArrayList<>();
+        //成功
+        if(waMap.get("kdStatus").equals("1")){
+            List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
+            Map<String,Object> map1 = reportList.get(0);
+            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+            Map.Entry<String,Object> entry;
+            while(it.hasNext()){
+                entry =  it.next();
+                String value = (String) entry.getValue();
+                list.add(value);
+            }
+        }//失败
+        else{
+            list.add("0");
+        }
+        return list;
+    }
+
+    @Override
+    public List<String> getTest(Map<String, Object> map) {
+        List<String> list = new ArrayList<>();
+        //成功
+        if(map.get("kdStatus").equals("1")){
+            List<Map<String,Object>> reportList = (List<Map<String,Object>>) map.get("qcReportList");
+            Map<String,Object> map1 = reportList.get(0);
+            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+            Map.Entry<String,Object> entry;
+            while(it.hasNext()){
+                entry =  it.next();
+                String value = (String) entry.getValue();
+                list.add(value);
+            }
+        }//失败
+        else{
+            list.add("0");
+        }
+        return list;
+    }
+
+    //出库与金蝶打通接口(获得质保书)
+    public Map<String,Object> getWarrantyToES(String orderNumber) {
+        Map<String, Object> input = new HashMap<>();
+        Map<String, Object> head = universalMapper.selectNum(orderNumber);
+        input.put("head", head);
+        List<Map<String, Object>> mapList = universalMapper.selectOutbound(orderNumber);
+        input.put("entries",mapList);
+        Map<String,Object> totalMap = esUtil.getTotalMap();
+        //组装报文
+        totalMap.put("input",input);
+        return totalMap;
+    }
+
 
     /**
      * sha1加密字符串

src/main/java/com/steerinfo/dil/util/ESUtil.java

@@ -0,0 +1,66 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class ESUtil {
+
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "A004";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "dgQcReportHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/resources/application-dev.yml

@@ -22,18 +22,19 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8006}
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+
 server:
   port: 8019

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -147,7 +147,6 @@
 
     <!--  获取所有的运力信息 -->
     <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-
         SELECT *
         FROM (
                  SELECT
@@ -321,14 +320,13 @@
                         RW.WAREHOUSE_ID   "warehouseId",
                         RW.WAREHOUSE_NAME "warehouseName"
                  from RMS_WAREHOUSE RW
-                 <where>
+                 where RW.DELETED = 0
                      <if test="type != null">
-                         RW.WAREHOUSE_TYPE_ID = #{type}
+                      and   RW.WAREHOUSE_TYPE_ID = #{type}
                      </if>
                      <if test="index != null">
-                         instr(RW.WAREHOUSE_NAME, #{index}) > 0
+                      and   instr(RW.WAREHOUSE_NAME, #{index}) > 0
                      </if>
-                 </where>
              )
         <where>
             <if test="warehouseName != null">
@@ -747,9 +745,20 @@
         select r_carrier.CARRIER_NAME "carrierName", r_carrier.CARRIER_ID "carrierId"
         from RMS_CARRIER r_carrier
         where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
+    <select id="getCapacityType" resultType="java.util.Map" parameterType="java.util.Map">
+        select RCT.CAPACITY_TYPE_ID "capacityTypeId",
+               RCT.CAPACITY_TYPE_NAME "capacityTypeName"
+        from RMS_CAPACITY_TYPE RCT
+        <if test="index!=null">
+        where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        </if>
+
 
     </select>
 
+
     <select id="getWarranty" resultType="java.util.Map" parameterType="java.lang.String">
         select oom.WARRANTY_CODE "warrantyCode"
         from OMSTRUCK_ORDER oo
@@ -757,4 +766,58 @@
         on oom.ORDER_ID = oo.ORDER_ID
         where oo.ORDER_NUMBER = #{orderNumber}
     </select>
+    <select id="getPlanCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT( * )
+        FROM
+            ( SELECT AIR2.REQUIREMENT_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
+                LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
+        WHERE
+            AIR.REQUIREMENT_STATUS = 2
+          AND AIR.DELETED = 0
+    </select>
+    <select id="getTransRange" resultType="java.util.Map">
+        SELECT
+        RTR.TRANS_RANGE_ID "value",
+        RTR.TRANS_RANGE_VALUE "label",
+        RTR.TRANS_RANGE_ID  "id"
+        FROM
+        RMS_TRANS_RANGE RTR
+    </select>
+
+    <select id="getResultMaterialId" resultType="DECIMAL" parameterType="DECIMAL">
+    select worm.RESULT_MATERIAL_ID from WMSP_OUTBOUND_RESULT_MATERIAL worm
+    where worm.OUTBOUND_RESULT_ID = #{resultId} and worm.STATUS=2
+  </select>
+
+    <select id="selectOutbound" parameterType="java.lang.String" resultType="java.util.Map">
+            select distinct
+            substr(rm.MATERIAL_SPECIFICATION,2) "size",
+            rm.MATERIAL_MODEL "brand",
+            rms.MATERIAL_FURNACE_NUMBER "heatNum"
+            from OMSTRUCK_ORDER oo
+            left join WMSP_OUTBOUND_RESULT wor
+            on wor.BILL_LADING_ID = oo.ORDER_ID
+            left join WMSP_OUTBOUND_RESULT_MATERIAL worm
+            on worm.OUTBOUND_RESULT_ID = wor.RESULT_ID
+            left join RMS_MATERIAL rm
+            on rm.MATERIAL_ID = worm.MATERIAL_ID
+            left join WMSP_OUTBOUND_SCAN_RESULT wosr
+            on wosr.RESULT_MATERIAL_ID = worm.RESULT_MATERIAL_ID
+            left join WMSP_INBOUND_SCAN_RESULT wisr
+            on wisr.RESULT_MATERIAL = wosr.RESULT_MATERIAL
+            left join RMS_MATERIAL_STEEL rms
+            on rms.MATERIAL_STEEL_ID = wisr.MATERIAL_ID
+        where oo.ORDER_NUMBER= #{orderNumber}
+    </select>
+
+    <select id="selectNum" parameterType="java.lang.String" resultType="java.util.Map">
+        select distinct
+        rc.CAPACITY_NUMBER "carNum",
+        oo.ORDER_NUMBER "driveNo"
+        from OMSTRUCK_ORDER oo
+        left join RMS_CAPACITY rc
+        on rc.CAPACITY_ID = oo.CAPACITY_ID
+        where oo.ORDER_NUMBER= #{ORDER_NUMBER}
+    </select>
 </mapper>