Merge remote-tracking branch 'origin/master'

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/energy/service/IBsEpciuPatrolInspectionService.java

@@ -62,7 +62,7 @@ public interface IBsEpciuPatrolInspectionService extends BaseService<BsEpciuPatr
 
     void epInspectionTasks(boolean b);
 
-    List<BsEpciuPatrolInspectionEntity> ListPi(String code,Short eipType);
+    BsEpciuPatrolInspectionEntity ListPi(String code,Short eipType);
 
 	void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.energy.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
@@ -119,11 +120,18 @@ public class BsDosingRecServiceImpl extends BaseServiceImpl<BsDosingRecMapper, B
 		 * */
 		List<BsTowerEntity> bsTowers = iBsTowerService.list(code);
 		List<Long> towerIds = bsTowers.stream().map(BsTowerEntity::getId).toList();
-
-		return list(Wrappers.lambdaQuery(BsDosingRecEntity.class)
-				.in(BsDosingRecEntity::getBtId,towerIds)
-				.orderByDesc(BsDosingRecEntity::getDosingTime)
-				.last("limit 1"));
+		if (CollUtil.isEmpty(towerIds)){
+			throw new RuntimeException("未查询到有酸雾塔报警点配置");
+		}
+		List<BsDosingRecEntity> bsDosingRecEntities = list(Wrappers.lambdaQuery(BsDosingRecEntity.class)
+				.in(BsDosingRecEntity::getBtId, towerIds)
+				.eq(BsDosingRecEntity::getHandleResult, HANDLE_RESULT_WAIT)
+				.orderByDesc(BsDosingRecEntity::getDosingTime));
+		if (bsDosingRecEntities.size() > 0) {
+			return bsDosingRecEntities.get(0);
+		} else {
+			throw new RuntimeException("未查询到有效数据");
+		}
 	}
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java

@@ -155,7 +155,7 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl<BsEpciuP
 	}
 
     @Override
-	public List<BsEpciuPatrolInspectionEntity> ListPi(String code, Short eipType) {
+	public BsEpciuPatrolInspectionEntity ListPi(String code, Short eipType) {
 		//String sql = "select*from(SELECT a.*  FROM EP_PATROL_INSPECTION a INNER join " +
 		//		"EP_INSPECTION_POINT b ON a.ip_id = b.eip_id WHERE b.patrol_register =:code AND a.task_status =:taskStatus AND b.eip_type =:eipType " +
 		//		"ORDER BY a.launch_time DESC )where rownum<2 ";
@@ -167,13 +167,21 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl<BsEpciuP
 
 		List<BsEpciuInspectionPointEntity> safeInspectionPointList = bsEpciuInspectionPointService.listByCode(code);
 		List<Long> safeInspectionPointIdList = safeInspectionPointList.stream().map(BsEpciuInspectionPointEntity::getId).toList();
-		return list(Wrappers.lambdaQuery(BsEpciuPatrolInspectionEntity.class)
+		if (safeInspectionPointIdList.isEmpty()) {
+			throw new RuntimeException("未查询到有效的巡检点数据");
+		}
+		List<BsEpciuPatrolInspectionEntity> list = list(Wrappers.lambdaQuery(BsEpciuPatrolInspectionEntity.class)
 				.in(BsEpciuPatrolInspectionEntity::getEpcId, safeInspectionPointIdList)
 				.eq(BsEpciuPatrolInspectionEntity::getInsType, eipType)
 				//旧mes中查询待检状态任务
 				.eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString())
-				.orderByDesc(BsEpciuPatrolInspectionEntity::getLaunchTime)
-				.last("rownum<2"));
+				.orderByDesc(BsEpciuPatrolInspectionEntity::getLaunchTime));
+		if (list.size() > 0) {
+			return list.get(0);
+		} else {
+			throw new RuntimeException("未查询到有效数据");
+		}
+
 	}
 
 	@Override

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")) {

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java

@@ -137,8 +137,7 @@ public class PdaSaveController {
 
     @Operation(summary = "安全巡检处理，修改安全巡检任务", description = "")
     @PostMapping(value = "/saveByInspection")
-    public ResultInfo saveSafetyInspection(HttpServletRequest request) throws Exception {
-        JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS);
+    public ResultInfo saveSafetyInspection(@RequestBody JSONObject params) throws Exception {
         if (params == null || params.size() == 0) {
             throw new BusinessException("参数传递异常!");
         }
@@ -157,7 +156,7 @@ public class PdaSaveController {
 
     @Operation(summary = "环保巡检检验", description = "")
     @RequestMapping(value = "/savePatrolIns", method = RequestMethod.POST)
-    public ResultInfo savePatrolIns(@RequestBody BsEpciuPatrolInspectionEntity epPatrolInspection, HttpServletRequest request) {
+    public ResultInfo savePatrolIns(@RequestBody BsEpciuPatrolInspectionEntity epPatrolInspection) {
 
         pdaSaveService.savePatrolIns(epPatrolInspection);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java

@@ -455,7 +455,7 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                 new TreeSet<>(Comparator.comparing(BsSafePatrolInspectionEntity::getIpId))), ArrayList::new));
         if (piList == null || piList.size() == 0) {
             if (flag) {
-                throw new RuntimeException("product.noPatrolCheckTask", null);
+                throw new RuntimeException("未查询到安全巡检任务，product.noPatrolCheckTask");
             }
         }
         return piList;