diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java
index c4b230b7..05617f1a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java
@@ -180,8 +180,8 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
                 // 入库单
                 prefix = "RB";
             }
-
-            String codePattern = prefix + now + AuthUtil.getUserAccount();
+            User user = UserCache.getUser(AuthUtil.getUserId());
+            String codePattern = prefix + now + user != null ? user.getCode() : "";
 
             hr.setHrCode(this.nextCode(codePattern));
             hr.setWoCode(woCode);
@@ -216,7 +216,7 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
         // 编码模式
 
         // 当前模式下最大编码
-        List<HandoverRecord> list = this.list(Wrappers.lambdaQuery(HandoverRecord.class).eq(HandoverRecord::getHrCode, codePattern + "%").orderByDesc(HandoverRecord::getHrCode));
+        List<HandoverRecord> list = this.list(Wrappers.lambdaQuery(HandoverRecord.class).like(HandoverRecord::getHrCode, codePattern + "%").orderByDesc(HandoverRecord::getHrCode));
         if (CollectionUtils.isNotEmpty(list)) {
             num = Integer.parseInt(list.get(0).getHrCode().substring(codePattern.length()));
         }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 54674f87..c00d8b67 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -2105,6 +2105,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         WorkPlan nextWorkPlan = workPlanService.getById(wp.getNextWpId());
         if (wp.getStatus() < WorkPlan.STATUS_COMPLETE) {
             wp.setStatus(WorkPlan.STATUS_WORK_OK);
+            wp.setFactEndTime(new Date());
             if (wo.getMakeQty() != null && wo.getMakeQty() == 0) {
                 wo.setRunStatus(WorkOrder.RUN_STATUS_SCRAP);
             } else {