luobang 2 years ago
parent
commit
905ccaab50

+ 7 - 1
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -2160,7 +2160,13 @@ public class AMScontroller{
 
     @ApiOperation("钢坯需求计划派单")
     @PostMapping("/addBilletRequirement")
-    public RESTfulResult addBilletRequirement(@RequestBody Map<String,Object> map) {
+    public Map<String,Object> addBilletRequirement(@RequestBody Map<String,Object> map) {
         return amsFeign.addBilletRequirement(map);
     }
+
+    @ApiOperation("钢坯炉号抽取")
+    @PostMapping("/checkBillet")
+    public Map<String,Object> checkBillet(@RequestBody Map<String,Object> map) {
+        return amsFeign.checkBillet(map);
+    }
 }

+ 4 - 1
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1818,7 +1818,7 @@ public interface AmsFeign {
     Map<String, Object> closeDueDate(@RequestParam BigDecimal requirementId);
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/addBilletRequirement")
-    RESTfulResult addBilletRequirement(@RequestBody Map<String, Object> map);
+    Map<String,Object> addBilletRequirement(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getBilletRequirementList")
     Map<String, Object> getBilletRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1829,4 +1829,7 @@ public interface AmsFeign {
                                                  @RequestParam String index,
                                                  @RequestParam String startTime,
                                                  @RequestParam String endTime);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/checkBillet")
+    Map<String, Object> checkBillet(@RequestBody Map<String, Object> map);
 }

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

@@ -1353,7 +1353,7 @@
 
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO
-        SET OO.CAN_WORK = 1
+        SET OO.ORDER_STATUS = 7
         WHERE OO.ORDER_ID IN
         (SELECT OO.ORDER_ID
         FROM OMSTRUCK_ORDER OO