修改同步生产计划

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

@@ -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 地址

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

@@ -22,10 +22,7 @@ import org.springblade.system.cache.DictCache;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -173,10 +170,19 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldPlan.setPrimaryCraft(mesRbWo.getProcessline());
 			yieldPlan.setProductLine(mesRbWo.getProdline());
 			yieldPlan.setPlanType(Long.valueOf(YieldPlanEnum.PLAN_TYPE_1.getCode()));//赋值默认值12001
-			if(mesRbWo.getProcesslinedesc().contains("封接")
-					||"LX08-05-028,LX08-05-030,LX08-05-031".contains(mesRbWo.getProcessline())){
-				yieldPlan.setPlanType(12002L);
-				yieldPlan.setPlate("烧结电镀");
+
+//			if(mesRbWo.getProcesslinedesc().contains("封接")
+//					||"LX08-05-028,LX08-05-030,LX08-05-031".contains(mesRbWo.getProcessline())){
+//				yieldPlan.setPlanType(12002L);
+//				yieldPlan.setPlate("烧结电镀");
+//			}
+			if (StringUtils.isNotEmpty(mesRbWo.getProcesslinedesc())) {
+				List<String> targetProcessLines = Arrays.asList("LX08-05-028", "LX08-05-030", "LX08-05-031");
+				if (mesRbWo.getProcesslinedesc().contains("封接")
+						|| targetProcessLines.contains(mesRbWo.getProcessline())) {
+					yieldPlan.setPlanType(12002L);
+					yieldPlan.setPlate("烧结电镀");
+				}
 			}
 			yieldPlan.setProductType(mesRbWo.getMtltmrk());
 			//b3. 状态字段赋值，新mes中对应字段（status）