返工订单添加原生产订单ID

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java

@@ -510,6 +510,9 @@ public class YieldOrder extends BaseEntity {
 	@Schema(description = "责任部门")
 	private String resDept;
 
+	@Schema(description = "原生产订单ID")
+	private Long oldYoId;
+
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double plateThickness1;
 

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java

@@ -377,5 +377,7 @@ public class YieldOrderEntity extends TenantEntity {
 	private String tjtNum;
 	@Schema(description = "责任部门")
 	private String resDept;
+	@Schema(description = "原生产订单ID")
+	private Long oldYoId;
 
 }

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

@@ -665,6 +665,14 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         if (newPartVersion == null) {
             throw new ServiceException("零件【" + rr.getPrtno() + "】的版本不存在!");
         }
+        // 查询原订单
+        WorkOrder wo = workOrderService.getWorkOrderUniqueRec(rr.getPrtno(), rr.getSplcode(), rr.getSono());
+        if (wo == null) {
+            wo = workOrderService.getWorkOrderUniqueRec(rr.getPrtno(), rr.getSplcode(), null);
+        }
+        if (wo != null) {
+            yieldOrder.setOldYoId(wo.getYoId());
+        }
         yieldOrder.setPartVersion(newPartVersion.getPartVersion());
         yieldOrder.setRank("2");
         yieldOrder.setBatchNo(batchNo);