#拣货单完成、上架规则

zjj

2023-09-06 914a092bc4c21d69641f94b68fecf61b25ddaca1

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

@@ -13,9 +13,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.entity.param.NodeInitPatam;
@@ -67,9 +65,9 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Node> wrapper = new EntityWrapper<>();
        wrapper.eq("type",3);
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -98,7 +96,6 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Node> wrapper = new EntityWrapper<>();
        wrapper.ne("type",3);
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
@@ -317,13 +314,13 @@
        if (node.getType() != 3) {
          return R.error("仅可选择货位");
        }
        return nodeService.stockPakin(number, getUserId(), getHostId());
        return nodeService.stockPakin(number, getUserId(), getHostId(),getUser());
    }

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

    @PostMapping(value = "/work/empty/stock")
@@ -336,7 +333,7 @@
    @ManagerAuth(memo = "库位移转")
    public R locMoveStart(@RequestParam String sourceLocNo,
                          @RequestParam String targetLocNo) {
        nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
        nodeService.locMove(sourceLocNo, targetLocNo, getUserId(),getUser());
        return R.ok("移库启动成功");
    }
    @RequestMapping(value = "/node/select/{id}/auth")
@@ -348,19 +345,59 @@
    }

    @RequestMapping(value = "/node/init/auth")
    @ManagerAuth(memo = "初始化库位")
//    @Transactional
    @ManagerAuth(memo = "平库库位初始化")
    @Transactional
    public R init(NodeInitPatam param) {
        List<Node> list = new ArrayList<>();
        EntityWrapper<Node> nodeEntityWrapper = new EntityWrapper<>();
        nodeEntityWrapper.eq("id",param.getValue());
        nodeEntityWrapper.eq("name",param.getName());
        nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
        Node node = nodeService.selectOne(nodeEntityWrapper);
        for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
            for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
        String[] string = node.getNamePath().split(",");
        int tno=1; int no=1;
        for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
            for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
                for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
                    // 获取库位号
                    String locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
                    String locNo;

                    if (param.getName().equals("DT-B")){
                        if (b == 2 || b ==4 || b == 7){
                            if (l == 1){
                                locNo = param.getName()+"T-" +String.format("%02d", tno) + String.format("%02d", r) + String.format("%02d", l);
                            }else {
                                locNo = null;
                            }


                        }else {
                            locNo = param.getName()+"-" +String.format("%02d", no) + String.format("%02d", r) + String.format("%02d", l);

                        }
                    }else if (param.getName().equals("DT-C") || param.getName().equals("DT-D")){
                        if (b == 3 || b ==6 || b == 9 || b == 12 || b == 15 || b == 17 || b == 20 || b == 23){
                            if (l == 1){
                                locNo = param.getName()+"T-" +String.format("%02d", tno) + String.format("%02d", r) + String.format("%02d", l);
                            }else {
                                locNo = null;
                            }

                        }else {
                            locNo = param.getName()+"-" +String.format("%02d", no) + String.format("%02d", r) + String.format("%02d", l);

                        }

                    }else {
                        locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
                    }




                    if (locNo == null){
                        continue;
                    }

                    Date now =  new Date();
                    Node node1 = new Node();
@@ -386,6 +423,22 @@

                }
            }
            if (param.getName().equals("DT-B")){
                if (b == 2 || b ==4 || b == 7){
                    tno++;
                }else {
                    no++;
                }
            }else if (param.getName().equals("DT-C") || param.getName().equals("DT-D")){
                if (b == 3 || b ==6 || b == 9 || b == 12 || b == 15 || b == 17 || b == 20 || b == 23){
                    tno++;
                }else {
                    no++;
                }

            }


        }
//
//        nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
@@ -419,5 +472,13 @@
        return R.ok(keyValueVoList);

    }
    @RequestMapping(value = "/node/recommendLoc")
    public R recommendLoc(@RequestParam String matnr){
        List<String> remmendLoc = nodeService.getRemmendLoc(matnr);

        return R.ok(remmendLoc);
    }



}