diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java index 22ba4ed74..ff6e3ee91 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java @@ -18,7 +18,6 @@ import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.math.BigDecimal; import java.util.Collection; import java.util.List; @@ -126,17 +125,6 @@ public interface GoodsMapper extends BaseMapperX { List selectOrderGoodsPlateList(@Param("planIds") List planIds, @Param("organId") Long organId); - - default List selectPlanGoodsList(List ids, Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(GoodsDO::getOrganId, organId) - .eq(GoodsDO::getDeleted, false) - .inIfPresent(GoodsDO::getId,ids)); - - } - - - default List selectPlanGoods(Long planId, Long organId) { return selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrganId, organId) @@ -192,22 +180,6 @@ public interface GoodsMapper extends BaseMapperX { List selectPlateGoodIds(@Param("orderIds") List orderIds, @Param("organId") Long organId); - default List selectOrderGoodsList(List orderIds, - List goodsIds, - String material, - BigDecimal thickness, - Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(GoodsDO::getOrganId, organId) - .eq(GoodsDO::getDeleted, false) - .inIfPresent(GoodsDO::getOrderId,orderIds) - .inIfPresent(GoodsDO::getGoodsId,goodsIds) - .eqIfPresent(GoodsDO::getMaterial,material) - .eqIfPresent(GoodsDO::getThickness,thickness)); - - } - - List selectNoOrderPlanGoods(@Param("ids") List ids, @Param("organId") Long organId); List selectInsertGoodsIds(@Param("orderIds") List orderIds,@Param("goodsIds") List goodsIds,@Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 37bc1e372..8fb82dedc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -258,12 +258,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { plateMapper.updateBatch(plateDOS); - if(planDO.getStatus().equals(PlanStatusEnum.PUTINTOPRODUCTION.getStatus())){ - planDO.setStatus(PlanStatusEnum.OPENING.getStatus()); - planMapper.updateById(planDO); - } - - return Boolean.TRUE; } @@ -1149,7 +1143,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLAN_ID, planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class); if(CollUtil.isNotEmpty(optimizeBoardModelDOS)){ - List modelDOS = optimizeBoardModelDOS.stream().filter(f -> f.getIsNewInsertPlate().equals(Boolean.TRUE)).toList(); + List modelDOS = optimizeBoardModelDOS.stream().filter(f ->Boolean.TRUE.equals(f.getIsNewInsertPlate())).toList(); return modelDOS.isEmpty() ? Boolean.FALSE : Boolean.TRUE; }