zhou zhou
23 小时以前 ccc07c8fd9164a3d9195f42ba7fc7131f6c8324e
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -9,9 +9,11 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.OrderOutGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -41,6 +43,8 @@
    private OutStockItemService outStockItemService;
    @Autowired
    private DictDataService dictDataService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @GetMapping("/outStockTaskItem/{barcode}")
    @ApiOperation("快速拣货查询")
@@ -107,12 +111,14 @@
    @RequestMapping(value = "/orderOut/list")
    public R pdaPageList(@RequestParam(required = true) String orderNo,
                         @RequestParam(required = true) String orderType,
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "5") Integer limit) {
        Page<WkOrder> page = new Page<>(curr, limit);
        LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
        wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
        wkOrderLambdaQueryWrapper.eq(WkOrder::getWkType, orderType);
        wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo);
        Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper);
        return R.ok(wkOrderPage);
@@ -135,16 +141,22 @@
    @PostMapping("/orderOut/getOutLocView")
    public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
        // 参数 param.getOrderItemId()//出库预览
        //参数 param.getOrderItemId()//出库预览
        if (Cools.isEmpty(param)) {
            return R.error("参数不能为空");
        }
        OrderOutTaskParam orderOutTaskParam = new OrderOutTaskParam();
        orderOutTaskParam.setOrderId(param.getOrderItemId());
        orderOutTaskParam.setWaveId(param.getWaveId());
        return outStockService.getOrderOutTaskItem(orderOutTaskParam,param.getOrderItemId());
    }
    //
    @PostMapping("/orderOut/getOutLocRun")
    public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
        //参数 param.getOrderItemId()//出库执行
        return R.ok();
    }
    //
    // @PostMapping("/orderOut/getOutLocRun")
    // public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
    // //参数 param.getOrderItemId()//出库执行
    //
    // return R.ok();
    // }
}