修改批量禁用，库位状态还显示空库问题

skyouc

18 小时以前 056ff1b69c7048d061059ebe300ced5b110ec1df

修改批量禁用，库位状态还显示空库问题

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java

@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.enums.CommonStatus;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -130,6 +131,10 @@
            loc.setTypeIds(Arrays.asList(Long.valueOf(loc.getType())));
        }

        if (loc.getStatus().equals(CommonStatus.COMMONSTATUS_NO.val)) {
            loc.setUseStatus(LocStsType.LOC_STS_TYPE_X.type);
        } 

        if (!locService.updateById(loc)) {
            return R.error("Update Fail");
        }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java

@@ -12,6 +12,8 @@
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CommonStatus;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.mapper.LocMapper;
import com.vincent.rsf.server.manager.mapper.LocTypeRelaMapper;
import com.vincent.rsf.server.manager.service.*;
@@ -32,16 +34,12 @@

    @Autowired
    private WarehouseAreasService warehouseAreasService;

    @Autowired
    private LocTypeRelaService locTypeRelaService;

    @Autowired
    private LocAreaRelaService locAreaRelaService;

    @Autowired
    private LocAreaService locAreaService;

    @Autowired
    private LocTypeRelaMapper locTypeRelaMapper;
    @Autowired
@@ -74,6 +72,7 @@
                .set(!Objects.isNull(loc.getHeight()), Loc::getHeight, loc.getHeight())
                .set(!Objects.isNull(loc.getChannel()), Loc::getChannel, loc.getChannel())
                .set(!Objects.isNull(loc.getFlagLabelMange()), Loc::getFlagLabelMange, loc.getFlagLabelMange())
                .set(loc.getStatus().equals(CommonStatus.COMMONSTATUS_NO.val), Loc::getUseStatus, LocStsType.LOC_STS_TYPE_X.type)
                .set(!Objects.isNull(loc.getStatus()), Loc::getStatus, loc.getStatus()));
        if (!update) {
            throw new CoolException("库位信息修改失败！！");