From 1b60f1df51e1824154018a5b6a7159b09b44c8b1 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 12 六月 2023 14:23:26 +0800
Subject: [PATCH] 化验页面--数据提交更新
---
igds-web/src/main/resources/static/admin/inout/in-check.js | 18 +-
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 177 +++++++++++++++++++----------------
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 11 +
igds-core/src/main/resources/mapper/CheckStandardMapper.xml | 23 ++-
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 2
igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java | 5
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 34 +++---
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 11 -
8 files changed, 154 insertions(+), 127 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..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
@@ -64,19 +64,16 @@
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) {
+ 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());
}
diff --git a/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java b/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java
index bafa3a7..df34e09 100644
--- a/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java
+++ b/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java
@@ -1,6 +1,5 @@
package com.ld.igds.check.dto;
-
import com.ld.igds.models.CheckItem;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,4 +21,8 @@
*/
private static final long serialVersionUID = -570067528303737321L;
+
+ //杩愮畻绗﹀彿鍊硷紝鍙仛椤甸潰鏄剧ず鐢�
+ private String operaSymbolValue;
+
}
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
index 9bf2c66..aa5a242 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
@@ -9,7 +9,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +38,13 @@
@Override
public List<CheckItemData> getCheckItemById(String checkId, String companyId) {
- return checkStandardMapper.getCheckItemById(checkId, companyId);
+ List<CheckItemData> result = checkStandardMapper.getCheckItemById(checkId, companyId);
+ for (CheckItemData data : result) {
+ if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ data.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
+ }
+ }
+ return result;
}
@Override
@@ -65,7 +70,7 @@
item.setCheckId(checkId);
if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
- item.setOperaSymbol(data.getOperaSymbol() + " " + data.getUpperLimit());
+ item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
}
result.add(item);
}
diff --git a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
index 9916454..1caaed1 100644
--- a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
+++ b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
@@ -15,17 +15,20 @@
STANDARD_NAME_,
UNIT_,
UPPER_LIMIT_,
+ OPERA_SYMBOL_,
RULE_NUM_,
RULE_ADD_,
RULE_ADD_END_,
RULE_REDUCE_,
- STANDARD_VALUE_,
VALUE_,
- STANDARD_PRICE_,
RULE_PRICE_,
RULE_REDUCE_PRICE_,
- REMARKS_,
- OPERA_SYMBOL_
+ ADD_NUM_,
+ DE_NUM_,
+ ADD_PRICE_,
+ DE_PRICE_,
+ RESULT_,
+ REMARKS_
)values (
#{data.companyId},
#{data.checkId},
@@ -33,17 +36,20 @@
#{data.standardName},
#{data.unit},
#{data.upperLimit},
+ #{data.operaSymbol},
#{data.ruleNum},
#{data.ruleAdd},
#{data.ruleAddEnd},
#{data.ruleReduce},
- #{data.standardValue},
#{data.value},
- #{data.standardPrice},
#{data.rulePrice},
#{data.ruleReducePrice},
- #{data.remarks},
- #{data.operaSymbol}
+ #{data.addNum},
+ #{data.deNum},
+ #{data.addPrice},
+ #{data.dePrice},
+ #{data.result},
+ #{data.remarks}
)
</insert>
@@ -53,7 +59,6 @@
<set>
<if test="data.standardName != null and data.standardName != '' ">STANDARD_NAME_ = #{data.standardName},</if>
<if test="data.upperLimit != null and data.upperLimit != '' ">UPPER_LIMIT_ = #{data.upperLimit},</if>
-<!-- <if test="data.lowerLimit != null and data.lowerLimit != '' ">LOWER_LIMIT_ = #{data.lowerLimit},</if>-->
<if test="data.unit != null and data.unit != '' ">UNIT_ = #{data.unit},</if>
<if test="data.value != null and data.value != '' ">VALUE_ = #{data.value},</if>
<if test="data.remarks != null and data.remarks != '' ">REMARKS_ = #{data.remarks},</if>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index e71e477..558085c 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -649,22 +649,22 @@
return inoutManager.inoutBack(data);
}
- /**
- * 鍖栭獙椤甸潰鏁版嵁鎻愪氦
- *
- * @param data
- * @return
- */
- @RequestMapping("/update-check")
- public PageResponse<InoutData> updateCheck(@RequestBody InoutData data) {
- try {
- return inoutManager.updateCheck(data);
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴寮傚父锛�" + e.getMessage(), null);
- }
- }
+// /**
+// * 鍖栭獙椤甸潰鏁版嵁鎻愪氦
+// *
+// * @param data
+// * @return
+// */
+// @RequestMapping("/update-check")
+// public PageResponse<InoutData> updateCheck(@RequestBody InoutData data) {
+// try {
+// return inoutManager.updateCheck(data);
+// } catch (Exception e) {
+// log.error("鍚庡彴寮傚父:{}", e);
+// return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+// "鍚庡彴寮傚父锛�" + e.getMessage(), null);
+// }
+// }
/**
* 鏍规嵁鍗″彿鍜岀被鍨嬶紝鐩存帴瀹屾垚褰撳墠娴佺▼
@@ -861,7 +861,7 @@
* @param data
* @return
*/
- @RequestMapping("/update-check1")
+ @RequestMapping("/update-check")
public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) {
return inoutManager.updateCheckData(data);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 621ad16..dd68d6f 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -283,84 +283,84 @@
return inoutService.inoutProgressQuery(param);
}
- @Transactional(rollbackFor = Exception.class)
- public PageResponse<InoutData> updateCheck(InoutData data) throws Exception {
-
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼", data);
- }
-
- CheckUpdateResult checkResult = this.updateCheckItems(data);
- String tag = checkResult.getMsg();
-
- if (null != tag) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴鎵ц寮傚父锛�" + tag, data);
- }
-
- // 鑾峰彇涓氬姟鏁版嵁淇℃伅
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- InoutData progressData = inoutService.inoutProgressQuery(param);
- if (null == progressData) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "娌℃湁鑾峰彇鍒板嚭鍏ュ簱涓氬姟鏁版嵁淇℃伅锛屾洿鏂板け璐�", data);
- }
- if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
- }
- progressData.setCheckStatus(data.getCheckStatus());
-
- // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
- if (InoutConstant.PROGRESS_CHECK.equals(progressData.getProgress())) {
- progressData = updateBasicInfo(progressData, null);
- // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
- if (InoutConstant.STATUS_UNPASS.equals(progressData
- .getCheckStatus())) {
- progressData = checkNoPass(progressData);
- }
- }
- progressData.setCheckUser(ContextUtil.getLoginUserCName());
-
- if (StringUtils.isNotEmpty(data.getDepotId())) {
- progressData.setDepotId(data.getDepotId());
- }
- if (StringUtils.isNotEmpty(data.getFoodVariety())) {
- progressData.setFoodVariety(data.getFoodVariety());
- }
- if (StringUtils.isNotEmpty(data.getFoodLevel())) {
- progressData.setFoodLevel(data.getFoodLevel());
- }
- if (StringUtils.isNotEmpty(data.getFoodLocation())) {
- progressData.setFoodLocation(data.getFoodLocation());
- }
- if (StringUtils.isNotEmpty(data.getFoodYear())) {
- progressData.setFoodYear(data.getFoodYear());
- }
- if (null != data.getPrice()) {
- progressData.setPrice(data.getPrice());
- }
- if (StringUtils.isNotEmpty(data.getRemarks())) {
- progressData.setRemarks(data.getRemarks());
- }
- if (StringUtils.isNotEmpty(data.getNoticeId())) {
- progressData.setNoticeId(data.getNoticeId());
- }
-
- String msg = inoutService.updateData(progressData);
-
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
- }
- if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
-
- inoutComplete(progressData);
- }
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
- }
+// @Transactional(rollbackFor = Exception.class)
+// public PageResponse<InoutData> updateCheck(InoutData data) throws Exception {
+//
+// if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+// return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+// "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼", data);
+// }
+//
+// CheckUpdateResult checkResult = this.updateCheckItems(data);
+// String tag = checkResult.getMsg();
+//
+// if (null != tag) {
+// return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+// "鍚庡彴鎵ц寮傚父锛�" + tag, data);
+// }
+//
+// // 鑾峰彇涓氬姟鏁版嵁淇℃伅
+// InoutParam param = new InoutParam();
+// param.setCompanyId(data.getCompanyId());
+// param.setId(data.getId());
+// InoutData progressData = inoutService.inoutProgressQuery(param);
+// if (null == progressData) {
+// return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+// "娌℃湁鑾峰彇鍒板嚭鍏ュ簱涓氬姟鏁版嵁淇℃伅锛屾洿鏂板け璐�", data);
+// }
+// if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
+// return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+// "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
+// }
+// progressData.setCheckStatus(data.getCheckStatus());
+//
+// // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
+// if (InoutConstant.PROGRESS_CHECK.equals(progressData.getProgress())) {
+// progressData = updateBasicInfo(progressData, null);
+// // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
+// if (InoutConstant.STATUS_UNPASS.equals(progressData
+// .getCheckStatus())) {
+// progressData = checkNoPass(progressData);
+// }
+// }
+// progressData.setCheckUser(ContextUtil.getLoginUserCName());
+//
+// if (StringUtils.isNotEmpty(data.getDepotId())) {
+// progressData.setDepotId(data.getDepotId());
+// }
+// if (StringUtils.isNotEmpty(data.getFoodVariety())) {
+// progressData.setFoodVariety(data.getFoodVariety());
+// }
+// if (StringUtils.isNotEmpty(data.getFoodLevel())) {
+// progressData.setFoodLevel(data.getFoodLevel());
+// }
+// if (StringUtils.isNotEmpty(data.getFoodLocation())) {
+// progressData.setFoodLocation(data.getFoodLocation());
+// }
+// if (StringUtils.isNotEmpty(data.getFoodYear())) {
+// progressData.setFoodYear(data.getFoodYear());
+// }
+// if (null != data.getPrice()) {
+// progressData.setPrice(data.getPrice());
+// }
+// if (StringUtils.isNotEmpty(data.getRemarks())) {
+// progressData.setRemarks(data.getRemarks());
+// }
+// if (StringUtils.isNotEmpty(data.getNoticeId())) {
+// progressData.setNoticeId(data.getNoticeId());
+// }
+//
+// String msg = inoutService.updateData(progressData);
+//
+// if (null != msg) {
+// return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+// }
+// if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
+//
+// inoutComplete(progressData);
+// }
+// return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
+// }
/**
* 鍖栭獙缁撴灉涓嶉�氳繃鏃舵牎楠岄厤缃俊鎭�
@@ -1214,8 +1214,25 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
}
- curData.setCheckStatus(data.getCheckStatus());
+ //鏇存柊鍖栭獙椤逛俊鎭�
+ CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
+ if (null == checkResult || null != checkResult.getMsg()) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庡彴鎵ц寮傚父锛�" + checkResult.getMsg(), data);
+ }
+
+ //璁剧疆鍖栭獙淇℃伅
+ if (checkResult.getDeSum() > 0) {
+ data.setDeCheck(checkResult.getDeSum());
+ }
+ if (checkResult.getAddSum() > 0) {
+ data.setAddCheck(checkResult.getAddSum());
+ }
+ if (null == data.getCheckTime()) {
+ data.setCheckTime(new Date());
+ }
+ curData.setCheckStatus(data.getCheckStatus());
//鏇存柊涓嬩竴娴佺▼鐘舵��
if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) {
curData = updateBasicInfo(curData, null);
@@ -1235,11 +1252,9 @@
}
String msg = inoutService.updateCheckData(data);
-
if (null != msg) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
}
- //TODO 鏇存柊鍖栭獙椤逛俊鎭�
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
} catch (Exception e) {
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index c30a291..31f28b3 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -69,6 +69,8 @@
REGISTER_USER_ as registerUser,
DEPOT_ID_ as depotId,
FOOD_VARIETY_ as foodVariety,
+ FOOD_LEVEL_ as foodLevel,
+ PRICE_ as price,
PLATE_NUM_ as plateNum,
SAMPLE_USER_ as sampleUser,
SAMPLE_TIME_ as sampleTime,
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index f8a46e1..e2ba053 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -110,23 +110,23 @@
if (symbol && limit) {
if (">=" == symbol) {
if (newValue < limit) {
- data.remarks = "涓嶅悎鏍�";
+ data.result = "涓嶅悎鏍�";
} else {
- data.remarks = "鍚堟牸";
+ data.result = "鍚堟牸";
}
}
if ("<=" == symbol) {
if (newValue > limit) {
- data.remarks = "涓嶅悎鏍�";
+ data.result = "涓嶅悎鏍�";
} else {
- data.remarks = "鍚堟牸";
+ data.result = "鍚堟牸";
}
}
if ("==" == symbol) {
if (newValue != limit) {
- data.remarks = "涓嶅悎鏍�";
+ data.result = "涓嶅悎鏍�";
} else {
- data.remarks = "鍚堟牸";
+ data.result = "鍚堟牸";
}
}
}
@@ -335,7 +335,7 @@
});
// 鑾峰彇鍖栭獙椤逛俊鎭�
- flushCheckItem(null);
+ flushCheckItem(curCheckData.foodVariety);
}
/**
@@ -425,7 +425,7 @@
width: '10%',
edit: 'text'
}, {
- field: 'operaSymbol',
+ field: 'operaSymbolValue',
title: '鏍囧噯鍊�',
align: 'center',
width: '10%'
@@ -502,7 +502,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/update-check1",
+ url: "../../basic/inout/update-check",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(curCheckData),
--
Gitblit v1.9.3