修改计划bug

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

@@ -140,4 +140,8 @@ public interface DsTaskingMapper extends BaseMapper<DsTaskingEntity> {
 	 * @return
 	 */
 	DsTaskingEntity getMaxReworkSyncTime();
+
+    List<DsTaskingEntity> selectTaskingByPartCode(@Param("partCode") String partCode,
+												  @Param("taskStatus") Integer taskStatus,
+												  @Param("taskType")String taskType);
 }

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

@@ -156,5 +156,13 @@
             ORDER BY SYNC_TIME DESC
         ) WHERE ROWNUM = 1;
     </select>
+    <select id="selectTaskingByPartCode"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsTaskingEntity">
+         SELECT * FROM DS_TASKING
+            WHERE IS_DELETED = 0
+            AND PART_CODE = #{partCode}
+            AND TASK_STATUS = #{taskStatus}
+            AND TASK_TYPE = #{taskType}
+    </select>
 
 </mapper>

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

@@ -235,4 +235,13 @@ public interface IDsTaskingService extends BaseService<DsTaskingEntity> {
 	 * @return
 	 */
 	boolean syncPart( String startTime, String endTime,String partCode);
+
+	/**
+	 * 根据零件号 查询任务
+	 * @param partCode
+	 * @param taskStatus
+	 * @param taskType
+	 * @return
+	 */
+	List<DsTaskingEntity> selectTaskingByPartCode(String partCode, Integer taskStatus, String taskType);
 }

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

@@ -971,6 +971,11 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 	 * 创建维护任务
 	 */
 	private void createMaintainTask(DsPartEntity partEntity, DsPartVersionEntity partVersionEntity) {
+		//查询是否有无工艺任务
+		List<DsTaskingEntity> taskingEntityList = taskingService.selectTaskingByPartCode(partEntity.getPartCode(),TaskingConstant.TASK_STATUS_WAIT,TaskingConstant.INSPECTION_TIMEOUT);
+		if(!CollectionUtils.isEmpty(taskingEntityList)){
+			return;
+		}
 		DsTaskingEntity dsTaskingEntity = new DsTaskingEntity();
 		dsTaskingEntity.setPartCode(partEntity.getPartCode());
 		dsTaskingEntity.setPartName(partEntity.getPartName());

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

@@ -1738,6 +1738,11 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		return true;
 	}
 
+	@Override
+	public List<DsTaskingEntity> selectTaskingByPartCode(String partCode, Integer taskStatus, String taskType) {
+		return taskingMapper.selectTaskingByPartCode(partCode,taskStatus,taskType);
+	}
+
 	/**
 	 * 单个任务独立事务处理
 	 */

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

@@ -82,6 +82,21 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 				item.setProcessCode(processSet.getCode());
 				item.setProcessName(processSet.getName());
 			}
+			if(item.getIsOutsource()){
+				if(null != item.getOcId()){
+					Oem oem = oemService.getById(item.getOcId());
+					if(null != oem){
+						item.setWorkCenterName(oem.getOcName());
+					}
+				}
+			}else {
+				if(null != item.getWorkCenterId()){
+					WorkCenter workCenter = workCenterService.getById(item.getWorkCenterId());
+					if(null != workCenter){
+						item.setWorkCenterName(workCenter.getWcName());
+					}
+				}
+			}
 		});
 		return craftList;
 	}