From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
index c39d885..b47276d 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
@@ -3,7 +3,6 @@
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.check.dto.CheckUpdateResult;
import com.ld.igds.check.service.CoreCheckStandardService;
-import com.ld.igds.inout.InoutConstant;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,14 +64,19 @@
item.setUpperLimit(0.0);
}
- //姘村垎淇℃伅鍥炲～
- if (InoutConstant.CHECK_ITEM_C01.equals(item.getStandardId()) || InoutConstant.CHECK_ITEM_C020101.equals(item.getStandardId())) {
- if(null != item.getValue()) result.setWet(Double.valueOf(item.getValue()));
+ if (null != item.getDeNum() && item.getDeNum() > 0) {
+ result.setDeSum(result.getDeSum() + item.getDeNum());
}
- //鏉傝川淇℃伅鍥炲～
- if (InoutConstant.CHECK_ITEM_C02.equals(item.getStandardId()) || InoutConstant.CHECK_ITEM_C01010301.equals(item.getStandardId())) {
- if(null != item.getValue()) result.setImpurity(Double.valueOf(item.getValue()));
+ if (null != item.getAddNum() && item.getAddNum() > 0) {
+ result.setAddSum(result.getAddSum() + item.getAddNum());
}
+ if (null != item.getAddPrice() && item.getAddPrice() > 0) {
+ result.setAddPriceSum(result.getAddPriceSum() + item.getAddPrice());
+ }
+ if (null != item.getDePrice() && item.getDePrice() > 0) {
+ result.setDePriceSum(result.getDePriceSum() + item.getDePrice());
+ }
+
//鍏堟洿鏂帮紝鏇存柊澶辫触鍒欐柊澧�
int i = checkStandardService.updateCheckItem(item);
if (i < 1) {
--
Gitblit v1.9.3