Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -12,9 +12,9 @@ public interface LauncherConstant {
     /**
      * nacos 命名空间
      */
-	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
-	// 生产环境
-//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+//	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
+//	 生产环境
+	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
 //	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -1078,11 +1078,27 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		if (yieldOrder == null) {
 			//查询该零件最新版本号
 			DsPartVersionEntity newPartVersion = partService.getNewPartVersion(partCode);
-			partVersion = newPartVersion.getPartVersion();
-
+			if(null != newPartVersion){
+				partVersion = newPartVersion.getPartVersion();
+			}else {
+				log.info("暂无零件,需同步零件：{}",partCode);
+				boolean syncPart = this.syncPart(null, null, partCode);
+				if(!syncPart){
+					log.error("零件同步失败:{}",partCode);
+					return false;
+				}
+				newPartVersion = partService.getNewPartVersion(partCode);
+				partVersion = newPartVersion.getPartVersion();
+			}
 		}else {
 			 partVersion = yieldOrder.getPartVersion();
 		}
+
+		if (StringUtils.isEmpty(partVersion)) {
+			log.error("无法获取零件版本信息, partCode:{}", partCode);
+			return false;
+		}
+
 		dsTasking.setVersion(partVersion);
 		// 查审理单 获取返修原因
 		String reworkMemo = getReworkMemo(reworkOrder);