zouzhd 3 rokov pred
rodič
commit
83efa88658

+ 13 - 3
src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -62,12 +62,22 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
 
-    @PostMapping("/insertWmspOutboundScanResult")
-    public Map<String, Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval) {
-        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
+    @PostMapping(value = "/deletewmspOutboundResult")
+    public Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId){
+        return wmsFeign.deleteWmspOutboundResult(resultId);
+    }
+
+    @PostMapping("/insertwmspOutboundScanResult")
+    public Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertwmspOutboundScanResult(map);
         return resTfulResult;
     }
 
+    @PostMapping("/outbountResultToSuccess")
+    public Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId){
+        return wmsFeign.outbountResultToSuccess(resultId);
+    }
+
     @PostMapping("/updataResultStatus")
     public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
         Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);

+ 19 - 3
src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -51,13 +51,29 @@ public interface WMSFeign {
     @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
     Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
 
+    /**
+     * 逻辑删除出库单
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/deletewmspOutboundResult")
+    Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
+
     /**
      * 新增出库扫描实绩
-     * @param mapval
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
+    Map<String,Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 装卸工PDA前端点击出库
+     * @param resultId
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/insertWmspOutboundScanResult")
-    Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
+    @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
+    Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId);
 
     /**
      * 更新出库状态

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -79,5 +79,5 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8099
+  port: 8080