空板回库称重再校验

skyouc

18 小时以前 029ffbf20db7196d4f460bc741fd5f36a80689ae

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -97,11 +97,6 @@
                            return FAIL.setMsg("空板入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                    }





                    break;
                // 全板入库
                case 1:
@@ -133,9 +128,9 @@
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            if (!Objects.isNull(wrkMast.getWrkCode())) {
                                locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            } else {
                                locDetl.setAnfme(wrkDetl.getRealQty());
                            } else {
                                locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            }
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
@@ -148,8 +143,9 @@
                        }

                        //判断匹配编码不为空，且任务编码包含-2，确认为有上组任务
                        if (!Objects.isNull(wrkMast.getWrkCode()) && wrkMast.getWrkCode().contains("-2")) {
                        if (!Objects.isNull(wrkMast.getWrkCode())) {
                            //不需要更新单据信息（子任务无单据

                        } else {
                            //正常单据才存存入库单，作入库单据信息更新
                            // 更新订单完成数量
@@ -452,15 +448,23 @@
        }

        /***/
        if (Objects.isNull(wrkMast.getWrkCode())) {
        if (!Objects.isNull(wrkMast.getWrkCode())) {
            LocMast lcmst = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
            lcmst.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
            if (!locMastService.updateById(lcmst)) {
                throw new CoolException("库位状态修改失败！！");
            }
            

            LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", wrkMast.getSourceLocNo()));
            if (Objects.isNull(bLocNo)) {
                throw new CoolException("工位不存在 ！！");
            }
            bLocNo.setLocType(LocStsType.LOC_STS_TYPE_O.type);
            if (!locAroundBindService.updateById(bLocNo)) {
                throw new CoolException("工位状态修改失败！！");
            }

            locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
        }

        return SUCCESS;