From 44c381b12687bbe966721cb53fafa5e5a113d484 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 20:32:13 +0800
Subject: [PATCH] 111

---
 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
index f408243..d8abd47 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -298,11 +298,11 @@
         wrModel.setMaterialId(wStock.getMaterialId());
         wrModel.setDepartId(mp.getDepartId());
         wrModel.setCreateTime(DateUtil.getCurrentDate());
-        wrModel.setCreateUser(user.getId());
+        wrModel.setCreateUser(mp.getCreateUser());
         wrModel.setMaterialBatch(mp.getBatch());
         wrModel.setType(Constants.WORKORDER_RECORD_TYPE.materail);
         wrModel.setFactoryId(mp.getFactoryId());
-        wrModel.setProcedureId(mp.getProcedureId());
+        wrModel.setProcedureId(wStock.getProcedureId());
         wrModel.setBatch(wStock.getBatch());
         wrModel.setUnitId(mp.getUnitId());
         wrModel.setPlanId(mp.getPlanId());
@@ -1532,8 +1532,8 @@
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌鐢熶骇浜哄憳瀵瑰簲浼佷笟鐢ㄦ埛淇℃伅锛�");
             }
             workorderRecord.setCreateUser(companyUser.getUserId());
-            workorderRecord.setRootDepartId(companyUser.getRootDepartId());
-            workorderRecord.setDepartId(companyUser.getComDepartId());
+            workorderRecord.setRootDepartId(loginUserInfo.getRootDepartment().getId());
+            workorderRecord.setDepartId(loginUserInfo.getCurComDepartment().getId());
         }else{
             workorderRecord.setCreateUser(loginUserInfo.getId());
             workorderRecord.setRootDepartId(loginUserInfo.getRootDepartment().getId());

--
Gitblit v1.9.3