计划修改

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml

@@ -20,6 +20,6 @@
     </select>
     <select id="selectLocallyPlatedPartByPartCode"
             resultType="org.springblade.desk.basic.pojo.entity.LocallyPlatedPart">
-        SELECT * FROM BA_LOCALLY_PLATED_PART WHERE is_deleted = 0 AND PART_CODE = #{partCode}
+        SELECT * FROM BS_LOCALLY_PLATED_PART WHERE is_deleted = 0 AND PART_CODE = #{partCode}
     </select>
 </mapper>

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

@@ -1864,7 +1864,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 				oldMesSubPart.setMaterial(subPartInfo.getMaterial());
 				oldMesSubPart.setPlateCode(subPartInfo.getPlateCode());
 				oldMesSubPart.setSinTerType(subPartInfo.getSinTerType());
-
+				if (subPartInfo.getSinTerType() == DsPartSub.SIN_TER_TYPE_BLB.intValue()
+						|| subPartInfo.getSinTerType() == DsPartSub.SIN_TER_TYPE_SMM.intValue()) {
+					oldMesSubPart.setIsSintering(TaskingConstant.IS_SINTERING);
+				}
 				// 2. 递归处理当前子件自身（生成版本号、创建零件、同步工艺等核心逻辑）
 				DsPartEntity newSubPart = processPartRecursively(oldMesSubPart);
 				if (newSubPart == null) {

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -388,6 +388,21 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 //			roamNo = "B000000";
 //		}
 
+		// 同步零件前置 防止烧结订单没有零件信息
+		DsPartEntity partEntity = dsPartService.selectDsPartByPatCodeAndVersion(yieldOrder.getPartCode(), yieldOrder.getPartVersion());
+		//如果零件信息为null，调用
+		if(partEntity == null){
+			log.info("零件信息为null，从老mes同步零件信息");
+			boolean result = dsTaskingService.syncPart(null,null,yieldOrder.getPartCode());
+			if(!result){
+				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
+				yieldOrder.setValidationTime(DateUtil.now());
+				yieldOrder.setValidationMomo("未查询到零件信息！");
+				this.updateById(yieldOrder);
+				return null;
+			}
+		}
+
 		Integer rank;
 		// 先判断是否是热表订单 不是返回二级工艺
 		if (YieldOrderEnum.YIELD_TYPE_1.getCode() != yieldOrder.getYieldType()) {
@@ -425,6 +440,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		yieldOrder.setPlate(part.getPlate());
 		yieldOrder.setCraftId(craft.getId());
 		yieldOrder.setRank(craft.getRank());
+		yieldOrder.setYpArea(part.getArea());
+		yieldOrder.setProductType(part.getProductType());
+		yieldOrder.setPartName(part.getPartName());
+		yieldOrder.setPrimaryCraft(part.getCraftWay());
 		DsPartVersionEntity partVersionEntity = partVersionService.selectByPartId(part.getId());
 		if(null != partVersionEntity){
 			yieldOrder.setPartVersion(partVersionEntity.getPartVersion());
@@ -1317,19 +1336,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	 */
 	private Integer judgeRank(YieldOrder yieldOrder) {
 		DsPartEntity part = dsPartService.selectDsPartByPatCodeAndVersion(yieldOrder.getPartCode(), yieldOrder.getPartVersion());
-		//如果零件信息为null，调用
-		if(part == null){
-			log.info("零件信息为null，从老mes同步零件信息");
-			boolean result = dsTaskingService.syncPart(null,null,yieldOrder.getPartCode());
-			if(!result){
-				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
-				yieldOrder.setValidationTime(DateUtil.now());
-				yieldOrder.setValidationMomo("未查询到零件信息！");
-				this.updateById(yieldOrder);
-				return null;
-			}
-			part = dsPartService.selectDsPartByPatCodeAndVersion(yieldOrder.getPartCode(), yieldOrder.getPartVersion());
-		}
+
 		// 工作订单备注中包含大小写的HTBY时，执行二级工艺
 		// 取memo字段(但是从erp取数据时没有对memo赋值,所以判断不会执行)
 		if (yieldOrder.getMemo() != null && yieldOrder.getMemo().toLowerCase(Locale.ROOT).contains("htby")) {