From 1459bdb1184f2aec10dbf987ddf900fea343a54b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 25 六月 2023 15:29:31 +0800
Subject: [PATCH] App出入库问题修改
---
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 123 +++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 60 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 f5611ec..7554af0 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;
@@ -19,72 +18,76 @@
@Component(CheckStandardManager.BEAN_ID)
public class CheckStandardManager {
- public static final String BEAN_ID = "check.checkStandardManager";
+ public static final String BEAN_ID = "check.checkStandardManager";
- @Autowired
- private CoreCheckStandardService checkStandardService;
+ @Autowired
+ private CoreCheckStandardService checkStandardService;
+ /**
+ * 鏍规嵁鍙傛暟鑾峰彇鍖栭獙椤瑰垪琛�
+ *
+ * @param checkId
+ * @param companyId
+ * @param foodVariety
+ * @return
+ */
+ public List<CheckItemData> listCheckItem(String companyId, String checkId,
+ String foodVariety) {
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
- /**
- * 鏍规嵁鍙傛暟鑾峰彇鍖栭獙椤瑰垪琛�
- *
- * @param checkId
- * @param companyId
- * @param deptId
- * @param foodVariety
- * @return
- */
- public List<CheckItemData> listCheckItem(String checkId, String companyId,
- String deptId, String foodVariety) {
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
- }
- if (StringUtils.isEmpty(deptId)) {
- deptId = ContextUtil.subDeptId(ContextUtil.getLoginUser());
- }
+ List<CheckItemData> list = null;
+ if (null != checkId)
+ list = checkStandardService.getCheckItemById(checkId, companyId);
- List<CheckItemData> list = checkStandardService.getCheckItemById(checkId, companyId);
+ if (list == null || list.isEmpty()) {
+ list = checkStandardService.getCheckItemByStandard(companyId,checkId, foodVariety);
+ }
+
+ return list;
+ }
- if (list == null || list.isEmpty()) {
- list = checkStandardService.getCheckItemByStandard(checkId, companyId, deptId, foodVariety);
- }
- return list;
- }
+ public CheckUpdateResult updateCheckItems(String checkId, String companyId,
+ List<CheckItemData> checkItems) {
- public CheckUpdateResult updateCheckItems(String checkId, String companyId, List<CheckItemData> checkItems) {
+ CheckUpdateResult result = new CheckUpdateResult();
+ if (null == checkItems || checkItems.isEmpty()) {
+ return result;
+ }
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
- CheckUpdateResult result = new CheckUpdateResult();
- if (null == checkItems || checkItems.isEmpty()) {
- return result;
- }
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
- }
+ for (CheckItemData item : checkItems) {
+ if (null == item.getCheckId()) {
+ item.setCheckId(checkId);
+ }
+ item.setCompanyId(companyId);
+ if (item.getUpperLimit() == null) {
+ item.setUpperLimit(0.0);
+ }
- for (CheckItemData item : checkItems) {
- if (null == item.getCheckId()) {
- item.setCheckId(checkId);
- }
- item.setCompanyId(companyId);
- if (item.getUpperLimit() == null) {
- item.setUpperLimit(0.0);
- }
+ if (null != item.getDeNum() && item.getDeNum() > 0) {
+ result.setDeSum(result.getDeSum() + item.getDeNum());
+ }
+ 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());
+ }
- //姘村垎淇℃伅鍥炲～
- 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 (InoutConstant.CHECK_ITEM_C02.equals(item.getStandardId()) || InoutConstant.CHECK_ITEM_C01010301.equals(item.getStandardId())) {
- if(null != item.getValue()) result.setImpurity(Double.valueOf(item.getValue()));
- }
- //鍏堟洿鏂帮紝鏇存柊澶辫触鍒欐柊澧�
- int i = checkStandardService.updateCheckItem(item);
- if (i < 1) {
- checkStandardService.insertCheckItem(item);
- }
- }
-
- 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