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

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

@@ -987,9 +987,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer status,
                                                  Integer resultType,
+                                                 Integer resultId,
                                                  String con) {
 
-        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,con);
+        return tmsTrainFeign.getAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status, resultType,resultId,con);
     }
 
     @ApiOperation(value = "通过Id查询请车作业")
@@ -1056,8 +1057,9 @@ public class TMSController extends BaseRESTfulController {
                                                         Integer pageNum,
                                                         Integer pageSize,
                                                         Integer resultType,
+                                                        Integer status,
                                                         String con) {
-        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,con);
+        return tmsTrainFeign.getApproveAllWagonPlease(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,status,con);
     }
 
     @ApiOperation(value = "通过Id查询批车作业")
@@ -1452,9 +1454,31 @@ public class TMSController extends BaseRESTfulController {
     //*********************************内转物流tms-train*********************************************************************
     @PostMapping("/addTrainLoadResultForConverted")
     @ApiOperation(value = "内转物流新增装车")
-    public Map<String, Object> addTrainLoadResultForConverted(Map<String, Object> tmstrainLoadingResult) {
-        Map<String, Object> mes = tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
-        return mes;
+    public Map<String, Object> addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
+    }
+
+    @ApiOperation(value = "内转新增卸车实绩")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/addTmsTrainUnloadResultForNZ")
+    public Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map) {
+        return tmsTrainFeign.addTmsTrainUnloadResultForNZ(map);
+    }
+
+    @ApiOperation(value = "查询车皮物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(213)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getMaterialAndCarByLoadingId")
+    public Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            Integer apiId,
+            Integer pageNum,
+            Integer pageSize,
+            Integer loadingId,
+            Integer unloadingId) {
+        return tmsTrainFeign.getMaterialAndCarByLoadingId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, loadingId, unloadingId);
     }
 
     @PostMapping("/selectLoadByResultId/{resultId}")
@@ -1482,11 +1506,10 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
     }
 
-    @PostMapping("/addWagonApprove")
-    @ApiOperation(value = "内转物流新增装车")
-    public Map<String, Object> addWagonApprove(Map<String, Object> tmstrainLoadingResult) {
-        Map<String, Object> mes = tmsTrainFeign.addWagonApprove(tmstrainLoadingResult);
-        return mes;
+    @PostMapping("/addWagonPleaseForNZ")
+    @ApiOperation(value = "内转物流新增请车")
+    public Map<String, Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {
+        return tmsTrainFeign.addPleaseForNZ(tmstrainLoadingResult);
     }
 
     @ApiOperation(value = "内转查询请车作业信息")

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

@@ -137,4 +137,34 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
         return success(pageList);
     }
+
+
+    @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("/getMaterialMesByOrderId")
+    public RESTfulResult getMaterialMesByOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String orderId
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(orderId != null){
+            mapValue.put("orderId", orderId);
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getMaterialMesByOrderId(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
 }

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

@@ -125,8 +125,9 @@ public interface TmsTrainFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("status") Integer status,
-                                                 @RequestParam("resultType") Integer resultType,
-                                                 @RequestParam("con") String con
+                                           @RequestParam("resultType") Integer resultType,
+                                           @RequestParam("resultId") Integer resultId,
+                                           @RequestParam("con") String con
                                                  );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
@@ -160,8 +161,9 @@ public interface TmsTrainFeign {
                                                   @RequestParam("apiId") Integer apiId,
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
-                                                        @RequestParam("resultType") Integer resultType,
-                                                        @RequestParam("con") String con
+                                                  @RequestParam("resultType") Integer resultType,
+                                                  @RequestParam("status") Integer status,
+                                                  @RequestParam("con") String con
     );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
@@ -176,19 +178,25 @@ public interface TmsTrainFeign {
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
     public Map<String, Object> deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId);
+
     //*****************************************内转物流***************************************************
+
     @PostMapping("api/v1/trainTms/tmstrainloadingresults/addTrainLoadResultForConverted")
     Map<String,Object>  addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
     @PostMapping ("api/v1/trainTms/tmstrainloadingresults/selectLoadByResultId/{resultId}")
     Map<String,Object> selectLoadByResultId(@PathVariable("resultId")BigDecimal resultId);
+
     @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoadForConverted")
     Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
                                                         @RequestParam("apiId") Integer apiId,
                                                         @RequestParam("pageNum") Integer pageNum,
                                                         @RequestParam("pageSize") Integer pageSize,
                                                         @RequestParam("con") String con);
+
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
     Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
+
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
     Map<String,Object> getApproveByResultId(@PathVariable("resultId")BigDecimal resultId);
 
@@ -198,11 +206,25 @@ public interface TmsTrainFeign {
                                                             @RequestParam("pageNum") Integer pageNum,
                                                             @RequestParam("pageSize") Integer pageSize,
                                                             @RequestParam("con") String con);
+
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectTrainUnLoadResultForConverted")
-    Map<String,Object>  selectTrainUnLoadResultForConverted(@RequestParam("apiId") Integer apiId,
+    Map<String,Object>  selectTrainUnLoadResultForConverted(
+                                                            @RequestParam("apiId") Integer apiId,
                                                             @RequestParam("pageNum") Integer pageNum,
                                                             @RequestParam("pageSize") Integer pageSize,
                                                             @RequestParam("con") String con);
-    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonApprove")
-    Map<String,Object> addWagonApprove(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPleaseForNZ")
+    Map<String,Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/addTmsTrainUnloadResultForNZ")
+    Map<String, Object> addTmsTrainUnloadResultForNZ(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getMaterialAndCarByLoadingId")
+    Map<String, Object> getMaterialAndCarByLoadingId(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            @RequestParam("apiId") Integer apiId,
+            @RequestParam("pageNum") Integer pageNum,
+            @RequestParam("pageSize") Integer pageSize,
+            @RequestParam("loadingId")Integer loadingId,
+            @RequestParam("unloadingId")Integer unloadingId);
 }

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

@@ -27,4 +27,7 @@ public interface UniversalMapper {
 
     //模糊查询承运商的运力信息
     List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
+
+    //通过运输订单ID查询物资子表（针对钢材）
+    List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
 }

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

@@ -13,4 +13,5 @@ public interface UniversalService {
     //打印提货单
     Map<String, Object> printTiHuoDan(String orderNumber);
 
+
 }

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

@@ -146,4 +146,42 @@
             and RCA.CARRIER_NAME LIKE #{index}
     </select>
 
+<!--    通过订单ID查询物资子表信息  -->
+    <select id="getMaterialMesByOrderId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select RM.MATERIAL_NAME               "materialName",
+                        RM.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+                        OOM.ORDER_MATERIAL_NUMBER      "orderMaterialNumber"
+
+                 from OMSTRUCK_ORDER_MATERIAL OOM
+                          left join RMS_MATERIAL RM
+                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 where OOM.ORDER_ID = #{orderId}
+             )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTheoreticalWeight != null">
+            and
+                <foreach collection="materialTheoreticalWeight" item="item" open="(" separator="or" close=")">
+                    "materialTheoreticalWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialNumber != null">
+                and
+                <foreach collection="orderMaterialNumber" item="item" open="(" separator="or" close=")">
+                    "orderMaterialNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialName" desc
+        </if>
+    </select>
+
 </mapper>