出库再入库

skyouc

3 天以前 88fc713144a877a4257b4173fbfadafd926c94de

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

@@ -1,12 +1,12 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.LocAroundBind;
import com.zy.asrs.entity.param.InitDeviceLocParams;
import com.zy.asrs.service.LocAroundBindService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -32,22 +32,26 @@

    @RequestMapping(value = "/locAroundBind/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 Map<String, Object> param){
    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) {
        EntityWrapper<LocAroundBind> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        allLike(LocAroundBind.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(locAroundBindService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -64,10 +68,10 @@
        return R.ok();
    }

   @RequestMapping(value = "/locAroundBind/update/auth")
   @ManagerAuth
    public R update(LocAroundBind locAroundBind){
        if (Cools.isEmpty(locAroundBind) || null==locAroundBind.getId()){
    @RequestMapping(value = "/locAroundBind/update/auth")
    @ManagerAuth
    public R update(LocAroundBind locAroundBind) {
        if (Cools.isEmpty(locAroundBind) || null == locAroundBind.getId()) {
            return R.error();
        }
        locAroundBindService.updateById(locAroundBind);
@@ -76,8 +80,8 @@

    @RequestMapping(value = "/locAroundBind/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            locAroundBindService.deleteById(id);
        }
        return R.ok();
@@ -85,7 +89,7 @@

    @RequestMapping(value = "/locAroundBind/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<LocAroundBind> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("locAroundBind"));
@@ -101,7 +105,7 @@
        wrapper.like("id", condition);
        Page<LocAroundBind> page = locAroundBindService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocAroundBind locAroundBind : page.getRecords()){
        for (LocAroundBind locAroundBind : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", locAroundBind.getId());
            map.put("value", locAroundBind.getId());
@@ -113,11 +117,58 @@
    @RequestMapping(value = "/locAroundBind/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<LocAroundBind> wrapper = new EntityWrapper<LocAroundBind>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != locAroundBindService.selectOne(wrapper)){
        Wrapper<LocAroundBind> wrapper = new EntityWrapper<LocAroundBind>()
                .eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != locAroundBindService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(LocAroundBind.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

    /**
     * 台机绑定作业库位
     *
     * @param
     * @return
     */
    @ManagerAuth
    @PostMapping(value = "/locAroundBind/bind/init")
    public R bind(@RequestBody InitDeviceLocParams params) {
        if (Cools.isEmpty(params)) {
            return R.error("参数不能为空");
        }
        if (Cools.isEmpty(params.getDevNo())) {
            return R.error("台机号不能为空");
        }
        if (Cools.isEmpty(params.getStartRow())) {
            return R.error("起始排不能为空");
        }
        if (Cools.isEmpty(params.getEndRow())) {
            return R.error("终止排不能为空");
        }
        if (Cools.isEmpty(params.getStartBay())) {
            return R.error("起始列不能为空");
        }
        if (Cools.isEmpty(params.getEndBay())) {
            return R.error("终止列不能为空");
        }
        if (Cools.isEmpty(params.getStartLev())) {
            return R.error("起始层不能为空");
        }
        if (Cools.isEmpty(params.getEndLev())) {
            return R.error("终止层不能为空");
        }
        if (params.getStartRow() > params.getEndRow()) {
            return R.error("起始排不能大于终止排");
        }
        if (params.getStartBay() > params.getEndBay()) {
            return R.error("起始列不能大于终止列");
        }
        if (params.getStartLev() > params.getEndLev()) {
            return R.error("起始层不能大于终止层");
        }

        return locAroundBindService.bindLocs(params);
    }

}