From 2884bf1f32b51129a83125ecfc2cf8526f71154f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 24 八月 2023 15:34:43 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4
---
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 2b2c5cd..f0422a7 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
@@ -23,7 +23,6 @@
@Autowired
private CoreCheckStandardService checkStandardService;
-
/**
* 鏍规嵁鍙傛暟鑾峰彇鍖栭獙椤瑰垪琛�
*
@@ -32,16 +31,20 @@
* @param foodVariety
* @return
*/
- public List<CheckItemData> listCheckItem(String checkId, String companyId, String foodVariety) {
+ public List<CheckItemData> listCheckItem(String companyId, String checkId,
+ String foodVariety) {
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
- List<CheckItemData> list = checkStandardService.getCheckItemById(checkId, companyId);
+ List<CheckItemData> list = null;
+ if (null != checkId)
+ list = checkStandardService.getCheckItemById(checkId, companyId);
if (list == null || list.isEmpty()) {
- list = checkStandardService.getCheckItemByStandard(checkId, companyId, foodVariety);
+ list = checkStandardService.getCheckItemByStandard(companyId, checkId, foodVariety);
}
+
return list;
}
@@ -64,29 +67,29 @@
item.setUpperLimit(0.0);
}
-
- if (item.getDeNum() > 0) {
+ if (null != item.getDeNum() && item.getDeNum() > 0) {
result.setDeSum(result.getDeSum() + item.getDeNum());
}
- if (item.getAddNum() > 0) {
+ if (null != item.getAddNum() && item.getAddNum() > 0) {
result.setAddSum(result.getAddSum() + item.getAddNum());
}
-
- if (item.getAddPrice() > 0) {
- result.setAddPriceSum(result.getAddPriceSum() + item.getAddPrice());
+ if (null != item.getAddPrice() && item.getAddPrice() > 0) {
+ result.setAddPriceSum(result.getAddPriceSum()
+ + item.getAddPrice());
}
-
- if (item.getDePrice() > 0) {
+ if (null != item.getDePrice() && item.getDePrice() > 0) {
result.setDePriceSum(result.getDePriceSum() + item.getDePrice());
}
- //鍏堟洿鏂帮紝鏇存柊澶辫触鍒欐柊澧�
+ //濡傛灉娌℃湁澶栭敭涓嶆墽琛屾寔涔呭寲鎿嶄綔
+ if (null == checkId) return result;
+
+ // 鍏堟洿鏂帮紝鏇存柊澶辫触鍒欐柊澧�
int i = checkStandardService.updateCheckItem(item);
if (i < 1) {
checkStandardService.insertCheckItem(item);
}
}
-
return result;
}
}
\ No newline at end of file
--
Gitblit v1.9.3