Revert "#"

LSH

2022-08-18 2b0fb92e407df0c3abd0ed2f06ae7103c1569281

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

@@ -10,6 +10,7 @@
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.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
@@ -38,6 +39,12 @@
        return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
    }

    @PostMapping(value = "/group/empty/stock")
    @ManagerAuth(memo = "获取同组货架的空库位")
    public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
        return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo));
    }

    @RequestMapping(value = "/locMast/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
@@ -58,14 +65,15 @@
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            String val = String.valueOf(entry.getValue());
            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]));
            } else {
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.like(entry.getKey(), val);
            }
        }
    }
@@ -86,6 +94,16 @@
    public R update(LocMast locMast){
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }
        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
            return R.error("当前操作已被阻止，请联系管理员");
        }
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
@@ -162,27 +180,74 @@
                            break;
                        }
                    }
                    Date now =  new Date();
                    LocMast locMast = new LocMast();
                    locMast.setLocNo(locNo);
                    locMast.setLocType("O");
                    locMast.setLocSts("O");
                    locMast.setRow1(r); // 排
                    locMast.setBay1(b); // 列
                    locMast.setLev1(l); // 层
                    locMast.setCrnNo(crnNo); // 堆垛机
                    if (null != param.getWhsType()) {
                        locMast.setWhsType(Long.valueOf(param.getWhsType()));
                    }
                    locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
                    locMast.setLocType2(param.getLocType2());
                    locMast.setLocType3(param.getLocType3());
                    locMast.setAppeUser(getUserId());
                    locMast.setAppeTime(new Date());
                    locMast.setAppeTime(now);
                    locMast.setModiUser(getUserId());
                    locMast.setModiTime(new Date());
                    locMast.setModiTime(now);
                    list.add(locMast);
                }
            }
        }
        locMastService.delete(new EntityWrapper<>());
//        locMastService.delete(new EntityWrapper<>());
        locDetlService.delete(new EntityWrapper<>());
        locMastService.insertBatch(list);
        return R.ok("初始化成功");
    }
    @RequestMapping(value = "/locMast/disableALL/auth")
    @ManagerAuth(memo = "禁用指定设备号库位")
    public R disableALL(@RequestParam String param){
        return updateAll(param,"O");
    }
    @RequestMapping(value = "/locMast/openAll/auth")
    @ManagerAuth(memo = "打开指定设备号库位")
    public R openAll(@RequestParam String param){
        return updateAll(param,"X");
    }

    private R updateAll(String param,String locSts){
        List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
        if (Cools.isEmpty(list)){
            return R.error();
        }
        int locType2=99;
        for (LocMast locMast : list){
            if (!locMast.getLocSts().equals(locSts)){
                if (locSts.equals("O")){
                    return R.error("此设备下有库位非空,库位号："+locMast.getLocNo()+"\t请查看库位");
                }else if (locSts.equals("X")){
                    return R.error("此设备下有库位非禁用状态,库位号："+locMast.getLocNo()+"\t请查看库位");
                }
            }else if (locType2==99){
                locType2 = locMast.getLocType2();
            }else if(locType2 != locMast.getLocType2()){
                return R.error("请选择同一设备号下的库位");
            }
        }
        if (locSts.equals("O")){
            locSts="X";
        }else if (locSts.equals("X")){
            locSts="O";
        }
        for (LocMast locMast : list){
            if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
                return R.error("库位号为空："+locMast);
            }
            locMast.setModiUser(getUserId());
            locMast.setModiTime(new Date());
            locMast.setLocSts(locSts);
            locMastService.updateById(locMast);
        }
        return R.ok();
    }
}