根据零件号、批次号查询原订单工序信息

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

@@ -75,4 +75,9 @@ public interface IPdaSaveService extends BaseService<WorkPlan> {
     void saveEpDosingRec(BsDosingRecEntity epDosingRec);
 
     void saveSubOrder(SaveSubOrderVo subOrder);
+
+    /**
+     * 根据零件号、批次号查询原订单的工序
+     */
+    List<WorkPlan> getOriginalOrderProcess(String partCode, String batchNo);
 }

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

@@ -1130,6 +1130,9 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         wp.setFactEndTime(nowDate);
         wp.setStatus(WorkPlan.STATUS_COMPLETE);
         this.updateById(wp);
+        // 修改批次号
+        yo.setBatchNo(subOrder.getBatchNo());
+        yieldOrderService.updateById(yo);
         //更改车间订单状态
         workOrderService.updateStatus(Collections.singletonList(wo.getId()), WorkOrder.RUN_STATUS_COMPLETED, AuthUtil.getUserId(), null);
         //查询父级订单下的所有子件订单是否已全部完成
@@ -1179,4 +1182,14 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 //            stClassRequestService.addOrEdit(list, null, curUserInfo);
 //        }
     }
+
+    @Override
+    public List<WorkPlan> getOriginalOrderProcess(String partCode, String batchNo) {
+        // 根据零件号和批次号查询原车间订单
+        WorkOrder wo = workOrderService.getWorkOrderUniqueRec(partCode, batchNo, null);
+        if (wo == null) {
+            return null;
+        }
+        return this.list(Wrappers.<WorkPlan>lambdaQuery().eq(WorkPlan::getWoId, wo.getId()).orderByAsc(WorkPlan::getOrders));
+    }
 }