Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 05:12:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

查询排单是否有新加小板接口错误修改

Browse Source
This commit is contained in:
liuzhaotian
2025-04-22 14:31:41 +08:00
parent e38d214438
commit 8d544d10d0
2 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java
-28
View File
@@ -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<GoodsDO> {
List<PlateInfoVO> selectOrderGoodsPlateList(@Param("planIds") List<Long> planIds, @Param("organId") Long organId);
default List<GoodsDO> selectPlanGoodsList(List<Long> ids, Long organId) {
return selectList(new LambdaQueryWrapperX<GoodsDO>()
.eq(GoodsDO::getOrganId, organId)
.eq(GoodsDO::getDeleted, false)
.inIfPresent(GoodsDO::getId,ids));
}
default List<GoodsDO> selectPlanGoods(Long planId, Long organId) {
return selectList(new LambdaQueryWrapperX<GoodsDO>()
.eq(GoodsDO::getOrganId, organId)
@@ -192,22 +180,6 @@ public interface GoodsMapper extends BaseMapperX<GoodsDO> {
List<OrderGoodsPlateIds> selectPlateGoodIds(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
default List<GoodsDO> selectOrderGoodsList(List<Long> orderIds,
List<String> goodsIds,
String material,
BigDecimal thickness,
Long organId) {
return selectList(new LambdaQueryWrapperX<GoodsDO>()
.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<GoodsRespVO> selectNoOrderPlanGoods(@Param("ids") List<Long> ids, @Param("organId") Long organId);
List<Long> selectInsertGoodsIds(@Param("orderIds") List<Long> orderIds,@Param("goodsIds") List<Long> goodsIds,@Param("organId") Long organId);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+1 -7
View File
@@ -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<OptimizeBoardModelDO> optimizeBoardModelDOS = esUtils.getEsDocument(FIELD_PLAN_ID, planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class);
if(CollUtil.isNotEmpty(optimizeBoardModelDOS)){
List<OptimizeBoardModelDO> modelDOS = optimizeBoardModelDOS.stream().filter(f -> f.getIsNewInsertPlate().equals(Boolean.TRUE)).toList();
List<OptimizeBoardModelDO> modelDOS = optimizeBoardModelDOS.stream().filter(f ->Boolean.TRUE.equals(f.getIsNewInsertPlate())).toList();
return modelDOS.isEmpty() ? Boolean.FALSE : Boolean.TRUE;
}