diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java
index 2d8fe33d..2d81a378 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java
@@ -18,7 +18,6 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.oa.erp.constant.ProjectCategoryConstant;
 import org.dromara.oa.erp.domain.ErpProjectContracts;
@@ -291,6 +290,10 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
         TenantHelper.dynamic(processEvent.getTenantId(), () -> {
             log.info("当前任务执行了{}", processEvent.toString());
             ErpProjectInfo projectInfo = baseMapper.selectById(Convert.toLong(processEvent.getBusinessId()));
+            if (projectInfo == null) {
+                log.warn("项目不存在，businessId: {}", processEvent.getBusinessId());
+                return;
+            }
             projectInfo.setFlowStatus(processEvent.getStatus());
             Map<String, Object> params = processEvent.getParams();
             if (MapUtil.isNotEmpty(params)) {
@@ -408,9 +411,10 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
         draft.setDetails(buildShippingDraftDetails(contractInfo.getContractMaterialList()));
 
         //显示填充租户、创建人、创建时间
-        draft.setTenantId(TenantHelper.getTenantId());
-        draft.setCreateBy(LoginHelper.getUserId());
+        draft.setTenantId(projectInfo.getTenantId());
+        draft.setCreateBy(projectInfo.getCreateBy());
         draft.setCreateTime(new Date());
+        draft.setCreateDept(projectInfo.getDeptId());
 
         return draft;
     }
diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java
index 8c2de131..9021e64c 100644
--- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java
+++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java
@@ -1,6 +1,8 @@
 package org.dromara.wms.domain.bo;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -286,4 +288,46 @@ public class WmsShippingBillBo extends BaseEntity {
     }
 
 
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    private String searchValue;
+
+    /**
+     * 创建部门
+     */
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params = new HashMap<>();
 }
diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java
index 14455960..5343d3cd 100644
--- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java
+++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java
@@ -293,6 +293,14 @@ public class WmsShippingBillServiceImpl implements IWmsShippingBillService {
         bo.setFlowStatus(BusinessStatusEnum.DRAFT.getStatus());
         bo.setShippingStatus(OAStatusEnum.DRAFT.getStatus());
         bo.setDetailsList(buildDraftDetails(draft.getDetails()));
+
+        //手动设置信息
+        bo.setTenantId(draft.getTenantId());
+        bo.setCreateBy(draft.getCreateBy());
+        bo.setCreateTime(draft.getCreateTime());
+        bo.setCreateDept(draft.getCreateDept());
+
+
         this.insertByBo(bo);
         return bo.getShippingBillId();
     }