Explorar o código

修改提货单

txf %!s(int64=3) %!d(string=hai) anos
pai
achega
c3f90926d4

+ 18 - 0
src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -797,4 +797,22 @@ public class OMSController {
     public Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map){
         return omsFeign.getTimeOrderResult(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);
+    }
 }

+ 8 - 0
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -777,4 +777,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);
+    }
+
 }

+ 9 - 0
src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -468,5 +468,14 @@ public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
     Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
+
+    @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);
 }
 

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

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

+ 7 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -923,4 +923,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>