#

luxiaotao1123

2021-03-26 186505641e95a73bac6cf3ddfe640acb3d06de6d

 src/main/java/zy/cloud/wms/manager/controller/PriorController.java

@@ -13,9 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.Prior;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.PriorService;
@@ -32,18 +30,19 @@
    @Autowired
    private NodeService nodeService;

    /**
     * 安全库存警告分页
     * @param curr
     * @param limit
     * @param param
     * @return
     */
    @RequestMapping(value = "/safeSto/list/auth")
    @ManagerAuth
    public R safeStoList(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Prior> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(priorService.selectPage(new Page<>(curr, limit), wrapper));
        return R.ok(priorService.getSafeQtyPage(toPage(curr, limit, param, SafeStoDo.class)));
    }

    /***************************************************/