From 6815206f357f19ba27593e5bfae01f5eccf9b2d8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 18:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 feedfbe..370d482 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -304,9 +304,9 @@
         wrModel.setFactoryId(mp.getFactoryId());
         wrModel.setProcedureId(wStock.getProcedureId());
         wrModel.setBatch(wStock.getBatch());
-        wrModel.setUnitId(mp.getUnitId());
+        wrModel.setUnitId(wStock.getUnitId());
         wrModel.setPlanId(mp.getPlanId());
-        //TODO 鐩墠浣跨敤宸ヨ涓婚敭瀛樺偍璐т綅涓婚敭
+        //鐩墠浣跨敤宸ヨ涓婚敭瀛樺偍璐т綅涓婚敭
         wrModel.setAppliancesId(wStock.getId());
         wrModel.setMaterialDonetype(wStock.getQualityType());
         wrModel.setMaterialProcedureId(wStock.getProcedureId());

--
Gitblit v1.9.3