Merge branch 'liweidong'

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

@@ -37,4 +37,6 @@ public interface LocallyPlatedPartMapper extends BaseMapper<LocallyPlatedPart> {
 	 * @return List<LocallyPlatedPartExcel>
 	 */
 	List<LocallyPlatedPartExcel> exportLocallyPlatedPart(@Param("ew") Wrapper<LocallyPlatedPart> queryWrapper);
+
+	LocallyPlatedPart selectLocallyPlatedPartByPartCode(@Param("partCode") String partCode);
 }

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

@@ -18,4 +18,8 @@
     <select id="exportLocallyPlatedPart" resultType="org.springblade.desk.basic.excel.LocallyPlatedPartExcel">
         SELECT * FROM BA_LOCALLY_PLATED_PART ${ew.customSqlSegment}
     </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>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java

@@ -41,4 +41,11 @@ public interface ILocallyPlatedPartService extends BaseService<LocallyPlatedPart
      * @param vo
      */
 	void setVOValue(LocallyPlatedPartVO vo);
+
+	/**
+	 * 根据零件号查询
+	 * @param partCode
+	 * @return
+	 */
+	LocallyPlatedPart selectLocallyPlatedPartByPartCode(String partCode);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java

@@ -58,4 +58,9 @@ public class LocallyPlatedPartServiceImpl extends BaseServiceImpl<LocallyPlatedP
     public void setVOValue(LocallyPlatedPartVO vo) {
 
     }
+
+	@Override
+	public LocallyPlatedPart selectLocallyPlatedPartByPartCode(String partCode) {
+		return baseMapper.selectLocallyPlatedPartByPartCode(partCode);
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartBasicsMapper.xml

@@ -12,5 +12,8 @@
          <if test="dsPartBasicsVO.partCode != null and dsPartBasicsVO.partCode !=''">
              and part_code = #{dsPartBasicsVO.partCode}
          </if>
+         <if test="dsPartBasicsVO.id != null">
+             and id = #{dsPartBasicsVO.id}
+         </if>
     </select>
 </mapper>

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.log.exception.ServiceException;
@@ -29,7 +30,9 @@ import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
 import org.springblade.erpdata.feign.IErpDataPartClient;
 import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
+import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.Dict;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.beans.BeanUtils;
@@ -115,6 +118,8 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 	@Autowired
 	IDsProcessMoldToolService processMoldToolService;
 
+	@Autowired
+	IDictClient dictClient;
 
 	@Override
 	public IPage<DsPartVO> selectDsPartPage(IPage<DsPartVO> page, DsPartVO dsPart) {
@@ -697,8 +702,36 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 				// 获取零件工艺级别面积判定值
 				List<Long> caIdList = processEntities.stream().map(DsProcessEntity::getCaId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
 				List<CraftAbilityEntity> craftAbilityList = craftAbilityService.list(Wrappers.<CraftAbilityEntity>lambdaQuery().in(BaseEntity::getId,caIdList));
+				// 获取工艺能力字典
+				R<List<Dict>> processCapabilityType = dictClient.getList("ProcessCapabilityType");
+				// 将字典数据转成map
+				List<Dict> processCapabilityList = processCapabilityType.getData();
+				Map<String, String> wtIdNameMap = processCapabilityList.stream()
+						.filter(Objects::nonNull)
+						.collect(Collectors.toMap(
+								Dict::getDictKey,
+								Dict::getDictValue,
+								(k1, k2) -> k1
+						));
+
 				if(!CollectionUtils.isEmpty(craftAbilityList)){
-					Double levConfirmVal = craftAbilityList.stream().filter(Objects::nonNull).map(CraftAbilityEntity::getLocalArea).filter(Objects::nonNull).findFirst().orElse(BigDecimal.ZERO).doubleValue();
+					// 读取工艺能力数据 并获名称包含镀金的第一条数据
+					Double levConfirmVal = craftAbilityList.stream()
+							.filter(Objects::nonNull)
+							.filter(craft -> {
+								String wtId = craft.getWtId();
+								if (wtId == null) {
+									return false;
+								}
+								String wtName = wtIdNameMap.get(wtId);
+								return wtName != null && wtName.contains("镀金");
+							})
+							.map(CraftAbilityEntity::getLocalArea)
+							.filter(Objects::nonNull)
+							.findFirst()
+							.orElse(BigDecimal.ZERO)
+							.doubleValue();
+
 					if (levConfirmVal > 0) {
 						// 计算生产订单总面积
 						Double totalArea = yieldOrder.getYpArea() * yieldOrder.getYpQty();

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

@@ -20,7 +20,9 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
+import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
+import org.springblade.desk.basic.service.ILocallyPlatedPartService;
 import org.springblade.desk.basic.service.IQualityGradeService;
 import org.springblade.desk.basic.service.IWorkCenterService;
 import org.springblade.desk.dashboard.constant.DsCraftConstant;
@@ -120,6 +122,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	@Autowired
 	private IDsTaskingService dsTaskingService;
 
+	@Autowired
+	private ILocallyPlatedPartService locallyPlatedPartService;
+
 	@Value("${business.oldMes.url}")
 	private String oldMesUrl;
 	@Value("${business.oldMes.syncOrderList}")
@@ -406,7 +411,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 		DsCraftEntity craft = craftVO.getCraft();
 		DsPartEntity part = dsPartService.getById(craft.getPartId());
-		//石墨模不参与验证
+		//判断热表零件面积不能为空
 		if (YieldOrderEnum.YIELD_TYPE_2.getCode() != yieldOrder.getYieldType()
 			&& YieldOrderEnum.YIELD_TYPE_6.getCode() != yieldOrder.getYieldType() && ObjectUtil.isEmpty(part.getArea())) {
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
@@ -420,13 +425,17 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		yieldOrder.setPlate(part.getPlate());
 		yieldOrder.setCraftId(craft.getId());
 		yieldOrder.setRank(craft.getRank());
-		yieldOrder.setPartVersion(craft.getPartVersions());
+		DsPartVersionEntity partVersionEntity = partVersionService.selectByPartId(part.getId());
+		if(null != partVersionEntity){
+			yieldOrder.setPartVersion(partVersionEntity.getPartVersion());
+		}
 
 		List<DsProcessEntity> dsProcessEntityList = dsProcessService.selectDsProcessByCraftId(craft.getId());
 		//删除之前的
 		yieldOrderCraftService.deleteByYoId(yieldOrder.getId());
 		List<YieldOrderCraft> yieldOrderCraftList = new ArrayList<>();
 		if (dsProcessEntityList != null && dsProcessEntityList.size() > 0) {
+			//没有执行update
 			if (DsCraftConstant.PRIORITY_THIS_USE.equals(craft.getRank())) {
 				craft.setPrority(DsCraftConstant.PRIORITY_TEMPORARY);
 			}
@@ -1329,7 +1338,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 		// 判定是否为镀金零件
 		// 取局部镀零件表中数据
-		if (CommonConstant.BOOLEAN_TRUE.equals(part.getGoldMark())) {
+		LocallyPlatedPart locallyPlatedPart = locallyPlatedPartService.selectLocallyPlatedPartByPartCode(part.getPartCode());
+		if (null != locallyPlatedPart) {
+//		if (CommonConstant.BOOLEAN_TRUE.equals(part.getGoldMark())) {
 			// 获取零件工艺级别面积判定值
 //			Integer levConfirmVal = 20;
 //			if (levConfirmVal != null) {