工作档取消报错修复 工作台管理问题修复 出库状态修改修复

skyouc

17 小时以前 fe315fb30fabf24940eaa3001774f9d43120748d

工作档取消报错修复
工作台管理问题修复
出库状态修改修复

 src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java

@@ -60,7 +60,7 @@
        if (Objects.isNull(binds) || binds.isEmpty()) {
            throw new CoolException("机台未绑定工作站台！！");
        }
        Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
        Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());

        LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
                .in("loc_no", locs)
@@ -110,7 +110,7 @@
        if (Objects.isNull(binds) || binds.isEmpty()) {
            throw new CoolException("机台未绑定工作站台！！");
        }
        Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
        Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());

        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().in("loc_no", locs)
                .eq("frozen", 0).eq("deleted", 0)

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -58,7 +58,7 @@
        if (Objects.isNull(binds) || binds.isEmpty()) {
            throw new CoolException("机台未绑定工作站台！！");
        }
        Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
        Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());

        reportLockLocs(locs, "lock");


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

@@ -72,12 +72,12 @@
        if (Objects.isNull(locAroundBind)) {
            return R.error("参数不能为空！！");
        }
        LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBLocNo()));
        LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBlocNo()));
        if (!Objects.isNull(aroundBind)) {
            return R.error("工位已绑定，不能重复绑定！");
        }

        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBLocNo()));
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBlocNo()));
        locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
        locMast.setDeleted(1);
        locMast.setFrozen(1);

 src/main/java/com/zy/asrs/entity/LocAroundBind.java

@@ -47,7 +47,7 @@
     */
    @ApiModelProperty(value= "库位码")
    @TableField("b_loc_no")
    private String bLocNo;
    private String blocNo;

    @ApiModelProperty("是否默认")
    @TableField("is_default")
@@ -63,11 +63,11 @@

    public LocAroundBind() {}

    public LocAroundBind(Long devId,String devNo,Long bLocId,String bLocNo) {
    public LocAroundBind(Long devId,String devNo,Long bLocId,String blocNo) {
        this.devId = devId;
        this.devNo = devNo;
        this.bLocId = bLocId;
        this.bLocNo = bLocNo;
        this.blocNo = blocNo;
    }

    public String getDef$() {

 src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java

@@ -71,13 +71,13 @@
            }
            LocAroundBind bind = new LocAroundBind();
            bind.setDevNo(params.getDevNo());
            bind.setBLocNo(mast.getLocNo());
            bind.setBlocNo(mast.getLocNo());
            bind.setDevId(basDevice.getId());
            if (!this.insert(bind)) {
                throw new CoolException("绑定库位失败");
            }

            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", bind.getBLocNo()));
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", bind.getBlocNo()));
            locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
            locMast.setDeleted(1);
            locMast.setFrozen(1);

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -461,7 +461,7 @@
            throw new CoolException("机台未设置默认工作位！！");
        }

        Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
        Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());

        LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
                .in("loc_no", locs)
@@ -473,7 +473,7 @@
            binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
                    .eq("dev_no", basDevice.getDevNo()));

            Set<String> nlocs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
            Set<String> nlocs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());

            locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
                    .in("loc_no", nlocs)
@@ -485,7 +485,7 @@
            }

            LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locMasts.getLocNo()));
            bLocNo.setLocType(LocStsType.LOC_STS_TYPE_R.type);
            bLocNo.setLocType(LocStsType.LOC_STS_TYPE_S.type);

            if (!locAroundBindService.updateById(bLocNo)) {
                throw new CoolException("工位预约失败！！");
@@ -1714,7 +1714,7 @@
        if (Objects.isNull(binds) || binds.isEmpty()) {
            throw new CoolException("机台未绑定工作站台！！");
        }
        Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
        Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());

        LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
                .in("loc_no", locs)

 src/main/webapp/views/locAroundBind/locAroundBind.html

@@ -78,9 +78,9 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">库位码: </label>
                    <label class="layui-form-label layui-form-required">工位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="bLocNo" placeholder="请输入库位码" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="blocNo" placeholder="请输入库位码" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">