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

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

@@ -1039,6 +1039,26 @@ public class AMScontroller{
         }
         return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
     }
+
+    @ApiModelProperty(value = "展示运输计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getPlanOrder")
+    public Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            Integer planId,
+                                            Integer requirementId,
+                                            Integer orderStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPlanOrder(mapValue, pageNum, pageSize, apiId,planId,requirementId,orderStatus);
+    }
     /**
      *用车单位提出需求
      *新增用车需求

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

@@ -36,5 +36,6 @@ public class DilVersionController {
     @PostMapping("/addAppVersion/{version}")
     public String addAppVersion(@PathVariable("version") String version) {
         return dilVersionService.addAppVersion(version);
+
     }
 }

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

@@ -1231,11 +1231,12 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer orderType,
-                                               String con,
+                                               String startTime,
+                                               String endTime,
                                                String userId,
                                                String userIds
     ){
-        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con,userId,userIds);
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, startTime,endTime,userId,userIds);
     }
 
     @ApiOperation(value="通过运输订单id查询物资信息")
@@ -1999,8 +2000,24 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getPurInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+    @ApiOperation(value="查询内转运输实绩")
+    @PostMapping("/getInwardReport")
+    public Map<String, Object> getInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          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);
     }
+
+    @ApiOperation(value="发送留皮计量委托(neizhuan)")
+    @GetMapping("/sendLiuPiMeasureCommission")
+    public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
+        return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
+    }
 }

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

@@ -614,6 +614,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiModelProperty(value = "边输边查物资")
+    @GetMapping("/getMaterialByLike")
+    public RESTfulResult getMaterialByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialByLike(index == null ? "" : index);
+        return success(list);
+    }
+
     @ApiOperation(value="通过一个carrierSsoId获得承运商对象")
     @GetMapping("/getRmsCarrierByCarrierSsoId")
     public RESTfulResult getRmsCarrierByCarrierSsoId(String carrierSsoId){

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

@@ -30,7 +30,6 @@ public class WMSController extends BaseRESTfulController {
     WMSFeign wmsFeign;
     @Autowired
     QMSFeign qmsFeign;
-
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
@@ -227,7 +226,12 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
         return resTfulResult;
     }
-
+    //获取已下发的钢材的每个炉号的数量
+    @PostMapping("/getFurnaceNoAmount")
+    public Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getFurnaceNoAmount(map);
+        return resTfulResult;
+    }
     //更新状态
     @PostMapping("/updateStatus")
     public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -1141,6 +1141,22 @@ public interface AmsFeign {
                                          @RequestParam Integer planStatus,
                                          @RequestParam String carrierId,
                                          @RequestParam Integer planId);
+
+    @ApiOperation(value="展示运输计划下的运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(还没有设置表头)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getPlanOrder")
+    Map<String, Object> getPlanOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planId,
+                                        @RequestParam Integer requirementId,
+                                         @RequestParam Integer orderStatus
+
+                                     );
+
     /**
      *新增用车需求
      */

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

@@ -103,7 +103,8 @@ public interface TmsTruckFeign {
                                                      @RequestParam("pageNum")   Integer pageNum,
                                                      @RequestParam("pageSize")  Integer pageSize,
                                                      @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("con")       String con,
+                                                     @RequestParam("startTime") String startTime,
+                                                     @RequestParam("endTime") String endTime,
                                                      @RequestParam("userId")    String userId,
                                                      @RequestParam("userIds")   String userIds
     );
@@ -435,10 +436,22 @@ public interface TmsTruckFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam String startTime,
                                            @RequestParam String endTime);
+//内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReport")
+    Map<String, Object> getInwardReport(@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/tmstruckmeasurecommissions/sendMeasureCommission")
     Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
+
+    //发送留皮计量委托
+    @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
+    Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
     }
 
 

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

@@ -453,6 +453,9 @@ public interface WMSFeign {
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
     Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/wms/inboundResult/getFurnaceNoAmount")
+    Map<String, Object> getFurnaceNoAmount(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * 库管员下发倒垛单
      *

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

@@ -134,5 +134,9 @@ public interface UniversalMapper {
     //根据订单Id查询物资
     List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
 
+    //边输边查物资
+    List<Map<String, Object>> getMaterialByLike(String index);
+
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
+
 }

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

@@ -730,7 +730,24 @@
                 on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OOM.ORDER_ID = #{orderId}
     </select>
+
+
+    <select id="getMaterialByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_ID   "materialId",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "value",
+                        CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION) || RM.MATERIAL_MODEL "materialName"
+                 from RMS_MATERIAL RM
+                 where instr(RM.MATERIAL_NAME, #{index}) > 0
+             )
+        where rownum &lt; 10
+    </select>
+
     <select id="getRmsCarrierByCarrierSsoId" resultType="java.util.Map">
-        select r_carrier.CARRIER_NAME "carrierName",r_carrier.CARRIER_ID "carrierId" from RMS_CARRIER r_carrier where  r_carrier.CARRIER_SSO_ID=#{carrierSsoId}
+        select r_carrier.CARRIER_NAME "carrierName", r_carrier.CARRIER_ID "carrierId"
+        from RMS_CARRIER r_carrier
+        where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
+
     </select>
 </mapper>