Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

skyouc

2 天以前 add402ec68d150cd8b13c231ce991cf49889259c

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

@@ -11,11 +11,11 @@
import com.vincent.rsf.server.manager.controller.params.WarehouseStockParam;
import com.vincent.rsf.server.manager.entity.StockItem;
import com.vincent.rsf.server.manager.entity.ViewStockManage;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.enums.ViewStockType;
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;
@@ -35,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)) {
@@ -138,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());
       }