From 40609a1bd11ce79445562ac23f16af23a48c3933 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index b5e1a8a..bda445e 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -755,7 +755,7 @@
* @param param
*/
@Override
- @Async
+// @Async
public void statisticNum(Workorder param){
if(param.getPlanId()== null){
if(param.getId()== null){
@@ -828,14 +828,10 @@
&& item.getOmodel()!=null
&& (Constants.equalsInteger(item.getOmodel().getStatus() ,Constants.WORKORDER_STATUS.baogong)
||Constants.equalsInteger(item.getOmodel().getStatus() ,Constants.WORKORDER_STATUS.instock))){
- //濡傛灉鏄骇鍑�
- if(Constants.equalsInteger(item.getDoneType(),Constants.ZERO)){
- //濡傛灉鏄悎鏍间骇鍑猴紝绱鏁伴噺
- qulifiedNum += Constants.formatBigdecimal(item.getNum()).intValue();
- }else{
- //濡傛灉鏄笉鑹骇鍑猴紝绱鏁伴噺
- unqulifiedNum += Constants.formatBigdecimal(item.getNum()).intValue();
- }
+ //濡傛灉鏄悎鏍间骇鍑猴紝绱鏁伴噺
+ qulifiedNum += Constants.formatBigdecimal(BigDecimal.valueOf(item.getQualifiedNum())).intValue();
+ //濡傛灉鏄笉鑹骇鍑猴紝绱鏁伴噺
+ unqulifiedNum += Constants.formatBigdecimal(BigDecimal.valueOf(item.getUnqualifiedNum())).intValue();
}
}
}
@@ -858,7 +854,7 @@
if(!Objects.isNull(plan.getWorkPlansId())){
//鏇存柊涓昏鍗曟暟鎹俊鎭�
if(plansMapper.selectCount(new QueryWrapper<Plans>()
- .in("STATUS",0,1,4)
+ .in("STATUS",0,1,4,5)
.eq("DELETED",Constants.ZERO)
.ne("id",p.getId())
.eq("WORK_PLANS_ID",plan.getWorkPlansId()))<=Constants.ZERO){
--
Gitblit v1.9.3