From b103d6d522b58846a6983a18890f060eddfde7c5 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Thu, 26 Mar 2026 20:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/LauncherConstant.java          |  6 +++---
 .../pojo/entity/BsCraftAbilityEntity.java          | 14 +++++++-------
 .../order/service/impl/YieldOrderServiceImpl.java  |  9 +++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
index a831b190..844bce86 100644
--- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
+++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
@@ -12,7 +12,7 @@ public interface LauncherConstant {
     /**
      * nacos 命名空间
      */
-	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
+//	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 	// 生产环境
 //	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
@@ -31,8 +31,8 @@ public interface LauncherConstant {
     /**
      * nacos dev 地址
      */
-//    String NACOS_DEV_ADDR = "192.168.249.27:8848";
-    String NACOS_DEV_ADDR = "127.0.0.1:8848";
+    String NACOS_DEV_ADDR = "192.168.249.27:8848";
+//    String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**R
      * nacos prod 地址
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java
index d16a0b35..12eba44b 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java
@@ -52,17 +52,17 @@ public class BsCraftAbilityEntity extends BaseEntity {
 	 * 编码
 	 */
 	@Schema(description = "编码")
-	private String code;
+	private String caCode;
 	/**
 	 * 名称
 	 */
 	@Schema(description = "名称")
-	private String name;
-	/**
-	 * 备注
-	 */
-	@Schema(description = "备注")
-	private String remarks;
+	private String caName;
+//	/**
+//	 * 备注
+//	 */
+//	@Schema(description = "备注")
+//	private String remarks;
 
 	/**
 	 * 厂内应分比例
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index 4052d1c3..f0c62596 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -310,7 +310,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	@Override
 	public Boolean verifyYieldOrderCraft(YieldOrder yieldOrder) {
 		// 返工订单不进行校验
-		if (StringUtils.isBlank(yieldOrder.getReworkCode())) {
+		if (!StringUtils.isBlank(yieldOrder.getReworkCode())) {
 			return Boolean.TRUE;
 		}
 
@@ -318,9 +318,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 		String roamNo = yieldOrder.getRoamNo();
 		// 石墨模零件不考虑B号匹配因素, 使用默认的B号
-		if (YieldOrderEnum.YIELD_TYPE_6.getCode() == yieldOrder.getYieldType()) {
-			roamNo = "B000000";
-		}
+		// todo 石墨模按生产订单上的b号传 不做处理20260326
+//		if (YieldOrderEnum.YIELD_TYPE_6.getCode() == yieldOrder.getYieldType()) {
+//			roamNo = "B000000";
+//		}
 
 		Integer rank;
 		// 先判断是否是烧结订单