diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java index ac98dfaa..a35f729d 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; import com.klp.common.exception.ServiceException; +import com.klp.common.helper.LoginHelper; import com.klp.common.utils.StringUtils; import com.klp.domain.*; import com.klp.domain.bo.WmsFurnacePlanBo; @@ -346,6 +347,15 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService { updateBo.setCoilId(coil.getCoilId()); updateBo.setWarehouseId(targetLocation); updateBo.setActualWarehouseId(-1L); + updateBo.setCreateTime(new Date()); + updateBo.setUpdateTime(new Date()); + updateBo.setExclusiveStatus(0); + updateBo.setCreateBy(LoginHelper.getUsername()); + updateBo.setUpdateBy(LoginHelper.getUsername()); + updateBo.setNextWarehouseId(null); + updateBo.setStatus(0); + updateBo.setExportBy(null); + updateBo.setExportTime(null); materialCoilService.updateByBo(updateBo, "annealing"); @@ -389,34 +399,6 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService { .set(WmsMaterialCoil::getExclusiveStatus, 2)); } - private void occupyWarehouse(Long planId, Long coilId, Long warehouseId) { - if (warehouseId == null) { - throw new ServiceException("逻辑库位不能为空"); - } - WmsWarehouse warehouse = warehouseMapper.selectById(warehouseId); - if (warehouse == null || warehouse.getDelFlag() != null && warehouse.getDelFlag() == 1) { - throw new ServiceException("逻辑库位不存在"); - } - - // wmsfurnace_plan_coil也要插入这个去向的逻辑库区 - WmsFurnacePlanCoil wmsFurnacePlanCoil = planCoilMapper.selectOne(Wrappers.lambdaQuery() - .eq(WmsFurnacePlanCoil::getPlanId, planId) - .eq(WmsFurnacePlanCoil::getCoilId, coilId) - //逻辑删除 - .eq(WmsFurnacePlanCoil::getDelFlag, 0)); - - if (wmsFurnacePlanCoil != null && wmsFurnacePlanCoil.getPlanCoilId() != null) { - planCoilMapper.update(null, Wrappers.lambdaUpdate() - .eq(WmsFurnacePlanCoil::getPlanCoilId, wmsFurnacePlanCoil.getPlanCoilId()) - .set(WmsFurnacePlanCoil::getLogicWarehouseId, warehouseId)); - } - - WmsMaterialCoil updateCoil = new WmsMaterialCoil(); - updateCoil.setCoilId(coilId); - updateCoil.setWarehouseId(warehouseId); - updateCoil.setExclusiveStatus(0); - materialCoilMapper.updateById(updateCoil); - } private List parseCoilIds(WmsFurnacePlanCoilBo bo) { List coilIds = new ArrayList<>(); diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index e663d4ef..55c2b28a 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -1354,7 +1354,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 1. 将原钢卷标记为历史数据(dataType = 0) LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(WmsMaterialCoil::getCoilId, oldCoil.getCoilId()) - .set(WmsMaterialCoil::getDataType, 0); // 设置为历史数据 + .set(WmsMaterialCoil::getDataType, 0) // 设置为历史数据 + .set(WmsMaterialCoil::getExclusiveStatus, 0); baseMapper.update(null, updateWrapper); // 2. 创建新记录