From 0efbf246a22f7331cf2e16bd659caea22a494102 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 29 五月 2023 12:05:48 +0800
Subject: [PATCH] 调整模块货位和库存2
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
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 1fd9aa9..30f41d0 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
@@ -139,12 +139,12 @@
continue;
}
- if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
- result.setWet(Double.valueOf(checkItem.getValue()));
- }
- if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
- result.setImpurity(Double.valueOf(checkItem.getValue()));
- }
+// if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
+// result.setWet(Double.valueOf(checkItem.getValue()));
+// }
+// if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
+// result.setImpurity(Double.valueOf(checkItem.getValue()));
+// }
}
}
}
@@ -363,10 +363,10 @@
}
}
progressData.setCheckUser(ContextUtil.getLoginUserCName());
- if (StringUtils.isNotEmpty(data.getCustomerName())) {
- progressData.setCustomerId(data.getCustomerId());
- progressData.setCustomerName(data.getCustomerName());
- }
+// if (StringUtils.isNotEmpty(data.getCustomerName())) {
+// progressData.setCustomerId(data.getCustomerId());
+// progressData.setCustomerName(data.getCustomerName());
+// }
if (StringUtils.isNotEmpty(data.getDepotId())) {
progressData.setDepotId(data.getDepotId());
}
@@ -392,14 +392,14 @@
progressData.setNoticeId(data.getNoticeId());
}
- // 鍥炲～姘村垎鍜屾潅璐�
- if (checkResult.getWet() > 0) {
- progressData.setWet(checkResult.getWet());
- }
-
- if (checkResult.getImpurity() > 0) {
- progressData.setImpurity(checkResult.getImpurity());
- }
+// // 鍥炲～姘村垎鍜屾潅璐�
+// if (checkResult.getWet() > 0) {
+// progressData.setWet(checkResult.getWet());
+// }
+//
+// if (checkResult.getImpurity() > 0) {
+// progressData.setImpurity(checkResult.getImpurity());
+// }
String msg = inoutService.updateData(progressData);
@@ -817,8 +817,8 @@
// 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(),data.getCheckItems());
if (null != checkResult) {
- if (null == data.getWet())data.setWet(checkResult.getWet());
- if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
+// if (null == data.getWet())data.setWet(checkResult.getWet());
+// if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
}
} else {
if (null == data.getEmptyWeightTime()) {
@@ -888,10 +888,10 @@
.updateCheckItems(data.getCheckId(), data.getCompanyId(),
data.getCheckItems());
if (null != checkResult) {
- if (null == data.getWet())
- data.setWet(checkResult.getWet());
- if (null == data.getImpurity())
- data.setImpurity(checkResult.getImpurity());
+// if (null == data.getWet())
+// data.setWet(checkResult.getWet());
+// if (null == data.getImpurity())
+// data.setImpurity(checkResult.getImpurity());
}
}
@@ -1012,9 +1012,9 @@
if (StringUtils.isEmpty(data.getDepotId())) {
return "璇峰～鍐欎粨搴撲俊鎭紒";
}
- if (StringUtils.isEmpty(data.getCustomerId())) {
- return "璇峰～鍐欏線鏉ュ崟浣嶄俊鎭紒";
- }
+// if (StringUtils.isEmpty(data.getCustomerId())) {
+// return "璇峰～鍐欏線鏉ュ崟浣嶄俊鎭紒";
+// }
if (StringUtils.isEmpty(data.getFoodYear())) {
return "璇峰～鍐欑伯椋熷勾浠戒俊鎭紒";
}
--
Gitblit v1.9.3