From 086312cf22ce7e0dd4c402e669cf6f81eb5c0fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Fri, 5 Jun 2026 17:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E6=B4=BE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/YieldOrderDailyAssignMapper.java | 2 +- .../mapper/YieldOrderDailyAssignMapper.xml | 28 +++++++++---------- .../impl/YieldOrderCraftServiceImpl.java | 8 ++++-- .../impl/YieldOrderDailyAssignImpl.java | 20 ++----------- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.java index d1d3c4af4..ab122f8eb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.java @@ -25,5 +25,5 @@ public interface YieldOrderDailyAssignMapper extends BaseMapper findSuitableByParams(Long hostCaId, List wcList, Double quantity, int batch, double area, String time); - List findMinNum(Long abilityId, List wcList); + List findMinNum(Long hostCaId, List wcList, String time); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.xml index 8d2668263..d54dec213 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderDailyAssignMapper.xml @@ -24,10 +24,9 @@ INNER JOIN BS_OEM_CRAFT b ON a.WORK_CENTER_ID = b.OTHER_ID AND a.CRAFT_ABILITY_ID = b.CRAFT_ABILITY_ID INNER JOIN BS_CENTER_TEAM c ON b.OTHER_ID = c.wc_id INNER JOIN BS_TEAM_TIME d ON c.TS_ID = d.TS_ID - WHERE - a.CA_ID = #{hostCaId} + WHERE a.CRAFT_ABILITY_ID = #{hostCaId} AND a.CREATE_TIME >= TRUNC(SYSDATE) AND a.CREATE_TIME < TRUNC(SYSDATE) + 1 - AND a.wc_id IN + AND a.WORK_CENTER_ID IN #{id} @@ -35,21 +34,21 @@ AND ( d.END_TIME >= #{time} OR d.END_TIME <= d.START_TIME) AND ( - b.QUANTITY IS NULL - OR b.QUANTITY = 0 - OR ( b.QUANTITY * ( b.saturation / 100 ) ) > to_char( a.DAA_QTY + #{quantity}) + b.QUALITY IS NULL + OR b.QUALITY = 0 + OR ( b.QUALITY * ( b.SATURATION / 100 ) ) > to_char( a.QUANTITY + #{quantity}) ) AND ( - b.BATCH_NO IS NULL - OR b.BATCH_NO = 0 - OR ( b.BATCH_NO * ( b.saturation / 100 ) ) > to_char( a.DAA_BACTH + #{batch}) + b.BATCH IS NULL + OR b.BATCH = 0 + OR ( b.BATCH * ( b.SATURATION / 100 ) ) > to_char( a.BATCH + #{batch}) ) AND ( b.AREA IS NULL OR b.AREA = 0 - OR ( b.AREA * ( b.saturation / 100 ) ) > to_char( a.DAA_AREA + #{area}) + OR ( b.AREA * ( b.SATURATION / 100 ) ) > to_char( a.AREA + #{area}) ) - ORDER BY a.DAA_NUM ASC + ORDER BY a.NUM ASC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java index 8556a6c85..e87bc0752 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java @@ -599,7 +599,10 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl workCenterIdList) { -// LocalDate today = LocalDate.now(); -// LocalDateTime startOfDay = today.atStartOfDay(); -// LocalDateTime endOfDay = today.atTime(LocalTime.MAX); -// LambdaQueryWrapper wrapper = Wrappers.query().lambda() -// .eq(YieldOrderAssignDaily::getIsDeleted, CommonConstant.BOOLEAN_FALSE) -// .eq(YieldOrderAssignDaily::getCraftAbilityId, abilityId) -// .between(YieldOrderAssignDaily::getCreateTime, -// DateUtil.toDate(startOfDay), -// DateUtil.toDate(endOfDay)); -// if (Func.isNotEmpty(workCenterIdList)) { -// wrapper.in(YieldOrderAssignDaily::getWorkCenterId, workCenterIdList); -// } -// List list = baseMapper.selectList(wrapper); -// if(CollectionUtils.isEmpty(list)){ -// return null; -// } -// return list.get(0); - List list = baseMapper.findMinNum(abilityId, workCenterIdList); + String format = LocalTime.now().format(DateTimeFormatter.ofPattern("HH:mm")); + List list = baseMapper.findMinNum(abilityId, workCenterIdList, format); return CollectionUtils.isNotEmpty(list) ? list.get(0) : null; }