From 30afea66fef9564465e78f1d61f4c353acd5b69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Sat, 6 Jun 2026 14:15:45 +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

---
 .../desk/order/mapper/YieldOrderDailyAssignMapper.xml        | 2 ++
 .../desk/order/service/impl/YieldOrderCraftServiceImpl.java  | 5 +++--
 .../desk/order/service/impl/YieldOrderDailyAssignImpl.java   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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 d54dec213..4be8bb3a4 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
@@ -25,6 +25,7 @@
 		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.CRAFT_ABILITY_ID = #{hostCaId}
+		AND b.IS_DELETED = 0
 		AND a.CREATE_TIME >= TRUNC(SYSDATE) AND a.CREATE_TIME &lt; TRUNC(SYSDATE) + 1
 		AND a.WORK_CENTER_ID IN
 		<foreach collection="wcList" item="id" open="(" close=")" separator=",">
@@ -59,6 +60,7 @@
 		INNER JOIN BS_CENTER_TEAM c ON b.ID = c.wc_id
 		INNER JOIN BS_TEAM_TIME d ON c.TS_ID = d.TS_ID
 		WHERE a.CRAFT_ABILITY_ID = #{hostCaId}
+		AND b.IS_DELETED = 0
 		AND a.CREATE_TIME >= TRUNC(SYSDATE) AND a.CREATE_TIME &lt; TRUNC(SYSDATE) + 1
 		AND a.WORK_CENTER_ID IN
 		<foreach collection="wcList" item="id" open="(" close=")" separator=",">
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 3e250f766..07c99278f 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
@@ -755,6 +755,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 
         Double totalArea = yieldOrder.getYpArea() * yieldOrder.getYpQty();
         BigDecimal areaVal = new BigDecimal(totalArea);
+        BigDecimal ypArea = new BigDecimal(yieldOrder.getYpArea());
 
         //单批面积规则和单位面积规则取其一，如果单批面积存在则按照单批面积规则
         if ((rules.getSingleUpArea() != null && rules.getSingleUpArea().compareTo(BigDecimal.ZERO) > 0) || (rules.getSingleDownArea() != null && rules.getSingleDownArea().compareTo(BigDecimal.ZERO) > 0)) {
@@ -777,7 +778,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
         } else {
             //单位面积下限
             if (rules.getLowArea() != null && rules.getLowArea().compareTo(BigDecimal.ZERO) > 0) {
-                if (areaVal.compareTo(rules.getLowArea()) >= 0) {
+                if (ypArea.compareTo(rules.getLowArea()) >= 0) {
                     sum = sum + 7;
                 } else {
                     return 0;
@@ -785,7 +786,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
             }
             //单位面积上限
             if (rules.getUpArea() != null && rules.getUpArea().compareTo(BigDecimal.ZERO) > 0) {
-                if (areaVal.compareTo(rules.getUpArea()) <= 0) {
+                if (ypArea.compareTo(rules.getUpArea()) <= 0) {
                     sum = sum + 4;
                 } else {
                     return 0;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
index 11ef334e6..e14d89942 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
@@ -73,8 +73,8 @@ public class YieldOrderDailyAssignImpl extends BaseServiceImpl<YieldOrderDailyAs
 			assignDaily.setOemId(oemId);
 			assignDaily.setArea(area);
 			assignDaily.setQuantity(quantity);
-			assignDaily.setBatch(1L);
-			assignDaily.setNum(1L);
+			assignDaily.setBatch(0L);
+			assignDaily.setNum(0L);
 			assignDaily.setCreateTime(DateUtil.toDate(LocalDate.now()));
 
 			this.save(assignDaily);