ERP单据下发功能优化

skyouc

7 天以前 353df597e34cad4ba672d92fc9a05b780c5036dd

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

@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.service.WarehouseStockService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
@@ -34,8 +35,7 @@
    @Autowired
    private WarehouseStockService warehouseStockService;


    @PreAuthorize("hasAuthority('manager:locItem:list')")
//    @PreAuthorize("hasAuthority('manager:locItem:list')")
    @PostMapping("/page")
    public R page(@RequestBody Map<String, Object> param) {
        if (Objects.isNull(param)) {
@@ -44,7 +44,7 @@
        BaseParam baseParam = buildParam(param, BaseParam.class);
        PageParam<ViewStockManage, BaseParam> pageParam = new PageParam<>(baseParam, ViewStockManage.class);
        WarehouseStockParam stockParam = JSONObject.parseObject(JSONObject.toJSONString(param), WarehouseStockParam.class);
        String type = stockParam.getAggType();
        String type = Objects.isNull(stockParam.getAggType()) ? ViewStockType.VIEW_STOCK_TYPE_MATNR.val : stockParam.getAggType();
        ViewStockManage stock = stockParam.getStock();
        QueryWrapper<ViewStockManage> wrapper = new QueryWrapper<>();

@@ -59,6 +59,9 @@
        } else {
            wrapper.groupBy("matnr_id");
        }

        FieldsUtils.setFieldsFilters(wrapper, pageParam, ViewStockManage.class);

        IPage<ViewStockManage> pageResult = warehouseStockService.pageByStock(pageParam, wrapper);
        List<ViewStockManage> records = pageResult.getRecords();
        for (ViewStockManage record : records) {
@@ -82,7 +85,7 @@
        BaseParam baseParam = buildParam(param, BaseParam.class);
        PageParam<StockItem, BaseParam> pageParam = new PageParam<>(baseParam, StockItem.class);
        WarehouseStockParam stockParam = JSONObject.parseObject(JSONObject.toJSONString(param), WarehouseStockParam.class);
        String type = stockParam.getAggType();
        String type = Objects.isNull(stockParam.getAggType()) ? ViewStockType.VIEW_STOCK_TYPE_MATNR.val : stockParam.getAggType();
        ViewStockManage stock = stockParam.getStock();
        QueryWrapper<StockItem> wrapper = new QueryWrapper<>();

@@ -120,7 +123,7 @@
        BaseParam baseParam = buildParam(param, BaseParam.class);
        PageParam<ViewStockManage, BaseParam> pageParam = new PageParam<>(baseParam, ViewStockManage.class);
        WarehouseStockParam stockParam = JSONObject.parseObject(JSONObject.toJSONString(param), WarehouseStockParam.class);
        String type = stockParam.getAggType();
        String type = Objects.isNull(stockParam.getAggType()) ? ViewStockType.VIEW_STOCK_TYPE_MATNR.val : stockParam.getAggType();
        if (Objects.isNull(type)) {
            return R.error("参数不能为空！！");
        }
@@ -134,7 +137,11 @@
       } else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_WAREHOUSE.val)) {
            wrapper.eq(ViewStockManage::getWarehouse, stock.getWarehouse());
       } else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_FIELDSINDEX.val)) {
            wrapper.eq(ViewStockManage::getFieldsIndex, stock.getFieldsIndex());
            if (StringUtils.isBlank(stock.getFieldsIndex())) {
                wrapper.isNull(ViewStockManage::getFieldsIndex);
            } else {
                wrapper.eq(ViewStockManage::getFieldsIndex, stock.getFieldsIndex());
            }
        } else {
            wrapper.eq(ViewStockManage::getMatnrCode, stock.getMatnrCode());
       }