Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

昨天 23ce02b630df91f468290c638aa5811fd04e8c9d

Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java

@@ -206,4 +206,18 @@
       return pdaOutStockService.containerRebinding(param,getLoginUserId());
    }

    @PostMapping("/orderOut/buffStore/callEmpty")
    @ApiOperation("灌桶入库呼叫空桶")
    public R buffStoreCallEmpty(@RequestBody PdaGeneralParam param) {
        param.getSta1();
        return R.ok();
    }

    @PostMapping("/orderOut/buffStore/callNewMat")
    @ApiOperation("灌桶入库呼叫新料")
    public R buffStoreCallNewMat(@RequestBody PdaGeneralParam param) {
        param.getSta2();
        return R.ok();
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java

@@ -36,4 +36,8 @@

    private List<TaskItem> taskItemList;

    //灌桶入库
    private String sta1;
    private String sta2;

}