13

zhang

6 天以前 82de5a307466894bbb0258f8a63a26a7bb96d80d

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

@@ -13,12 +13,10 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.PakinParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.NodeService;
import com.zy.common.entity.NodeExcel;
import com.zy.common.entity.NodeExcelListener;
@@ -37,8 +35,6 @@
import java.net.URLEncoder;
import java.util.*;

import static jdk.nashorn.api.scripting.ScriptUtils.convert;

@RestController
public class NodeController extends BaseController {

@@ -46,8 +42,6 @@
    private NodeService nodeService;
    @Autowired
    private TreeUtils treeUtils;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;

    @RequestMapping(value = "/node/{id}/auth")
    @ManagerAuth
@@ -66,7 +60,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -81,7 +77,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.parse("0-操作成功").add(nodeService.selectList(wrapper));
    }

@@ -96,7 +94,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.parse("0-操作成功").add(nodeService.selectList(wrapper));
    }

@@ -146,7 +146,6 @@
    }



    @RequestMapping(value = "/node/update/auth")
    @ManagerAuth
    public R update(Node node){
@@ -172,7 +171,6 @@
        node.setNamePath(nodeUtils.pathName.toString());
        node.setUuid(node.getName());

        manLocDetlMapper.updateLocNo0(node.getId(),node.getName());
        node.setUpdateBy(getUserId());
        node.setUpdateTime(new Date());
        nodeService.updateById(node);
@@ -301,17 +299,6 @@

    /*************************************** 入库出相关 ***********************************************/

    @RequestMapping("/work/stock/pakin")
    @ManagerAuth(memo = "入库")
    public R stockPakin(@RequestBody PakinParam number) {
        return nodeService.stockPakin(number, getUserId(), getHostId());
    }

    @RequestMapping("/work/stock/pakout")
    @ManagerAuth(memo = "出库")
    public R initPakout(@RequestBody List<InitPakoutParam> params) {
        return nodeService.initPakout(params, getUserId(), getHostId());
    }

    @PostMapping(value = "/work/empty/stock")
    public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
@@ -319,13 +306,9 @@
                .eq("type","3"));
        return R.ok().add(allEmptys);
    }
    @RequestMapping("/work/move/start")
    @ManagerAuth(memo = "库位移转")
    public R locMoveStart(@RequestParam String sourceLocNo,
                          @RequestParam String targetLocNo) {
        nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
        return R.ok("移库启动成功");
    }



    @RequestMapping(value = "/node/select/{id}/auth")
    @ManagerAuth
    public R getById(@PathVariable("id") String id) {