From 6252abae2d37cbf7ae4e2eb6411170f440657e12 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 13 九月 2023 14:58:26 +0800
Subject: [PATCH] 111

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

diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index a323db6..ed3ee89 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1766,7 +1766,7 @@
                     wreev.setDuration("-");
                 }
                 wreev.setSalaryType(re.getSalaryType());
-                wreev.setSalaryPrice(re.getSalary());
+                wreev.setSalaryPrice(re.getSalaryYuan());
                 list.add(wreev);
 
         }
@@ -1813,7 +1813,7 @@
             wreev.setProcedureName(re.getProcedureName());
             wreev.setUnintname(unintname);
             if(re.getOmodel().getPlanNum() != null){
-                wreev.setPlanNum(re.getOmodel().getPlanNum()+unintname );
+                wreev.setPlanNum(re.getOmodel().getPlanNum().toString() );
             }
             wreev.setMaterialDonetype(re.getMaterialDonetype());
             wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());

--
Gitblit v1.9.3