From d52b2bdc62a5722a96d3999a9ed96640f3945f91 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 八月 2023 18:14:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 ba89d09..0cdce35 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1338,6 +1338,13 @@
order.setStatus(Constants.WORKORDER_STATUS.material);
}else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
order.setStatus(Constants.WORKORDER_STATUS.done);
+ }else if(status ==Constants.WORKORDER_HISTORY_STATUS.produce){
+ //鎶曟枡鎿嶄綔
+ if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
+ ||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
+ //濡傛灉鏄凡鍒涘缓鎴栬�呭凡澶囨枡鐘舵�佺殑宸ュ崟锛屼慨鏀瑰叾鐘舵�佷负銆愮敓浜т腑銆�
+ order.setStatus(Constants.WORKORDER_STATUS.producing);
+ }
}
workorderExtMapper.updateById(order);
workorderHistoryExtMapper.insertBatch(whList);
--
Gitblit v1.9.3