多加入参数和修改规则

cl

6 天以前 e23efd75ca74df6b35a0c03b8e8fc0712c9d4544

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java

@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -25,6 +26,7 @@
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.service.CloudWmsNotifyLogService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -51,6 +53,16 @@
    private OutStockService outStockService;
    @Autowired
    private OutStockItemService outStockItemService;
    @Autowired
    private CloudWmsNotifyLogService cloudWmsNotifyLogService;

    @ApiOperation("手动触发云仓回馈（出库通知单，放行暂缓上报）")
    @PostMapping("/outStock/cloudWmsReport/submit")
    @PreAuthorize("hasAuthority('manager:outStock:list')")
    public R submitCloudWmsReportOutbound(@RequestBody(required = false) Map<String, Object> body) {
        String code = body != null && body.get("code") != null ? String.valueOf(body.get("code")).trim() : null;
        return cloudWmsNotifyLogService.manualFlushToNotifyByOrderCode(code, false);
    }

    @PreAuthorize("hasAuthority('manager:outStock:list')")
    @PostMapping("/outStock/page")
@@ -58,8 +70,8 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
        QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
        List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
        queryWrapper.in("type", list);
//        List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
//        queryWrapper.in("type", list);
        return R.ok().add(outStockService.page(pageParam, queryWrapper));
    }

@@ -91,6 +103,15 @@
    @GetMapping("/outStock/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(outStockService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:outStock:list')")
    @PostMapping("/outStock/matnr/page")
    @ApiOperation("出库单选物料分页（支持库位状态筛选、库存数量与库位状态展示）")
    public R pageMatnr(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
        return R.ok().add(outStockService.pageMatnrForOutStock(pageParam, map));
    }

    @PreAuthorize("hasAuthority('manager:outStock:save')")
@@ -256,6 +277,17 @@
        return outStockService.saveOutStock(params, getLoginUserId());
    }

    @GetMapping("/outStock/complete/{id}")
    @ApiOperation("完成出库单")
    @PreAuthorize("hasAuthority('manager:outStock:update')")
    public R complete(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            return R.error("参数不能为空！！");
        }
        return outStockService.completeOutOrderById(id);
    }


    @ApiOperation("单据信息修改")
    @PostMapping("/outStock/items/update")
    @PreAuthorize("hasAuthority('manager:outStock:update')")