”修改“

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

@@ -807,7 +807,25 @@ public class OMSController {
 
     @ApiOperation(value = "装机查询所以已装车的订单信息")
     @PostMapping("/getCapacityTypeByUserId")
-    public Map<String, Object> getCapacityTypeByUserId(@RequestBody (required = false) Map<String, Object> map){
+    public Map<String, Object> getCapacityTypeByUserId(@RequestBody (required = false) Map<String, Object> map) {
         return omsFeign.getCapacityTypeByUserId(map);
     }
+
+    @ApiOperation(value = "查询钢材订单号")
+    @GetMapping("getSteelOrderNum")
+    public Map<String, Object> getSteelOrderNum(String capacityId){
+        return omsFeign.getSteelOrderNum(capacityId);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @GetMapping("getMesToSteelDepartment")
+    public Map<String, Object> getMesToSteelDepartment(Integer orderId){
+        return omsFeign.getMesToSteelDepartment(orderId);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @PostMapping("updateMaterialMes")
+    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.updateMaterialMes(map);
+    }
 }

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

@@ -2144,4 +2144,23 @@ public class TMSController extends BaseRESTfulController {
     public String getReceiptPhoto(@RequestParam String orderNumber){
         return tmsTruckFeign.getReceiptPhoto(orderNumber);
     }
+
+
+    @ApiOperation("厂外收货作业")
+    @PostMapping("/getReceivingResult")
+    public Map<String,Object> getReceivingResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return tmsTruckFeign.getReceivingResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhoto")
+    public Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber){
+        return tmsTruckFeign.getReceivingPhoto(orderNumber);
+    }
 }

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

@@ -785,4 +785,12 @@ public class UniversalController extends BaseRESTfulController {
     public Integer getNotReceiveOrderQuantity(@RequestParam("capacityNumber") String capacityNumber){
         return universalMapper.getNotReceiveOrderQuantity(capacityNumber);
     }
+
+    @ApiModelProperty(value = "边输边查发站到站")
+    @GetMapping("/getArrivalByLike")
+    public RESTfulResult getArrivalByLike(@RequestParam("index") String index){
+        List <Map<String,Object>> list = universalMapper.getArrivalByLike(index == null ? "" : index);
+        return success(list);
+    }
+
 }

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

@@ -469,11 +469,22 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
     Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
 
+
     @PostMapping("api/v1/oms/omstruckorderseparates/getLoadForLoadCarResult")
     Map<String,Object> getLoadForLoadCarResult(Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityTypeByUserId")
     Map<String,Object> getCapacityTypeByUserId(Map<String, Object> map);
 
+
+    @GetMapping("api/v1/oms/omstruckmatetialorders/getSteelOrderNum")
+    public Map<String, Object> getSteelOrderNum(@RequestParam("capacityId") String capacityId);
+
+    @GetMapping("api/v1/oms/omstruckmatetialorders/getMesToSteelDepartment")
+    public Map<String, Object> getMesToSteelDepartment(@RequestParam("orderId")Integer orderId);
+
+    @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
+    public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
+
 }
 

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

@@ -532,6 +532,19 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptPhoto")
     String getReceiptPhoto(@RequestParam String orderNumber);
 
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingResult")
+    Map<String, Object> getReceivingResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
+    Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
+
     @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
     public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
     @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")

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

@@ -178,4 +178,7 @@ public interface UniversalMapper {
     List<Map<String,Object>> getNoListCarrier();
     //通过车牌号查询未接收的订单数量（用于APP显示未接收小红点）
     Integer getNotReceiveOrderQuantity(String capacityNumber);
+
+    //边输边查发站到站
+    List<Map<String, Object>> getArrivalByLike(String index);
 }

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

@@ -749,7 +749,8 @@
 
     <select id="getCapacityType" resultType="java.util.Map" parameterType="java.util.Map">
         select RCT.CAPACITY_TYPE_ID "capacityTypeId",
-               RCT.CAPACITY_TYPE_NAME "capacityTypeName"
+                RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+                RCT.WHETHER_CAR "whether"
         from RMS_CAPACITY_TYPE RCT
         <if test="index!=null">
         where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
@@ -930,4 +931,11 @@
         where OO.CAPACITY_ID = (select CAPACITY_ID from RMS_CAPACITY where CAPACITY_NUMBER = #{capacityNumber})
         and OO.ORDER_STATUS = 4
     </select>
+
+    <select id="getArrivalByLike" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT RAS.ARRIVAL_NAME AS "arrivalName",
+               RAS.ARRIVAL_ID AS "arrivalId"
+        FROM RMSTRAIN_ARRIVAL_SEND RAS
+        WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
+    </select>
 </mapper>