1.商品档案新增最大限制和最小限制 2.mes空桶/余料回库修复

zwl

2 天以前 605be0c8702fc7bfe4f7fcdd397c9f0d40722b69

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

@@ -251,6 +251,26 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R releaseAllLocks() {
        EntityWrapper<LocAroundBind> frozenWrapper = new EntityWrapper<>();
        frozenWrapper.eq("freeze", 1);
        int frozenCount = locAroundBindService.selectCount(frozenWrapper);
        if (frozenCount <= 0) {
            return R.ok("全部机台工位均未冻结");
        }

        LocAroundBind updateEntity = new LocAroundBind();
        updateEntity.setFreeze(0);
        EntityWrapper<LocAroundBind> updateWrapper = new EntityWrapper<>();
        updateWrapper.eq("freeze", 1);
        if (!locAroundBindService.update(updateEntity, updateWrapper)) {
            throw new CoolException("全部机台工位解冻失败，请检查后再操作！！");
        }
        return R.ok("全部机台工位解冻成功，共处理" + frozenCount + "个工位");
    }

    @Override
    public R getDeviceFreezeStatus(String devNo) {
        EntityWrapper<BasDevice> deviceWrapper = new EntityWrapper<>();
        deviceWrapper.eq("status", 1);
@@ -321,7 +341,7 @@
        }

        workService.updateWrkIsSuplus(String.valueOf(mast.getWrkNo()), HMES_USER_ID, backType);
        return workService.backLocOperation(String.valueOf(mast.getWrkNo()), HMES_USER_ID);
        return R.ok();
    }

    private HmesStationFreezeStatusDto buildStationFreezeStatus(LocAroundBind bind) {