全文搜索

luxiaotao1123

2020-06-22 928c9d244ffde8c53fbb1e1abe3ce4f0e73ecff4

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.service.LocDetlService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.service.LocDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -30,16 +30,26 @@
        return R.ok(locDetlService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/stock/out/list/auth")
    @ManagerAuth
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
    }

    @RequestMapping(value = "/locDetl/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -51,13 +61,17 @@
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else {
                wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
                if (entry.getKey().equals("locNo")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                } else {
                    wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                }
            }
        }
    }

    @RequestMapping(value = "/locDetl/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "库位明细添加")
    public R add(LocDetl locDetl) {
        locDetl.setModiUser(getUserId());
        locDetl.setModiTime(new Date());
@@ -68,7 +82,7 @@
    }

   @RequestMapping(value = "/locDetl/update/auth")
   @ManagerAuth
   @ManagerAuth(memo = "库位明细修改")
    public R update(LocDetl locDetl){
        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
            return R.error();
@@ -80,7 +94,7 @@
    }

    @RequestMapping(value = "/locDetl/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "库位明细删除")
    public R delete(@RequestParam String param){
        List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
        if (Cools.isEmpty(list)){
@@ -93,7 +107,7 @@
    }

    @RequestMapping(value = "/locDetl/export/auth")
    @ManagerAuth
    @ManagerAuth(memo = "库位明细导出")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();