From 256f9c48f2c52985a094a220b644d60d24cb6ed4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 14 十月 2025 09:49:32 +0800
Subject: [PATCH] 省质检报告提交
---
igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java | 78 ++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java
index 9546182..85235bd 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java
@@ -142,12 +142,12 @@
sql = new StringBuffer();
args = new HashMap<>();
sql.append("SELECT ");
- sql.append("DEPOT_ID_, ");
- sql.append("SETTLE_WEIGHT_, ");
- sql.append("TYPE_, ");
- sql.append("CUR_STORAGE_, ");
- sql.append("FOOD_VARIETY_, ");
- sql.append("COMPLETE_TIME_ ");
+ sql.append("a.DEPOT_ID_, ");
+ sql.append("a.SETTLE_WEIGHT_, ");
+ sql.append("a.TYPE_, ");
+ sql.append("a.CUR_STORAGE_, ");
+ sql.append("a.FOOD_VARIETY_, ");
+ sql.append("a.COMPLETE_TIME_ ");
sql.append("FROM ");
sql.append("( ");
sql.append("SELECT ");
@@ -192,12 +192,12 @@
sql = new StringBuffer();
args = new HashMap<>();
sql.append("SELECT ");
- sql.append("DEPOT_ID_, ");
- sql.append("SETTLE_WEIGHT_, ");
- sql.append("TYPE_, ");
- sql.append("CUR_STORAGE_, ");
- sql.append("FOOD_VARIETY_, ");
- sql.append("COMPLETE_TIME_ ");
+ sql.append("a.DEPOT_ID_, ");
+ sql.append("a.SETTLE_WEIGHT_, ");
+ sql.append("a.TYPE_, ");
+ sql.append("a.CUR_STORAGE_, ");
+ sql.append("a.FOOD_VARIETY_, ");
+ sql.append("a.COMPLETE_TIME_ ");
sql.append("FROM ");
sql.append("( ");
sql.append("SELECT ");
@@ -252,9 +252,9 @@
// 璁剧疆搴忓彿
d.setRemarks(String.valueOf(index));
// 褰撳墠鏁版嵁娣诲姞鍒濇湡搴撳瓨
- d = this.updateDepotReportCqkc(d, list1);
-// d = this.updateDepotReportQmkc(d, list2);
-
+// d = this.updateDepotReportCqkc(d, list1);
+// d = this.updateDepotReportQmkc(d, list1, list2);
+ d.setQmkc(d.getInNum() - d.getOutNum());
// 鍚堣淇℃伅
sum.setCqkc(sum.getCqkc() + d.getCqkc());
sum.setInNum(sum.getInNum() + d.getInNum());
@@ -271,40 +271,34 @@
}
// 娉ㄦ剰锛氬鏋滄湡鏈簱瀛樻病鏈変复杩戞暟鎹紝鍒欒〃绀鸿幏鍙栨渶鏂扮殑搴撳瓨
- public ReportInoutDepotData updateDepotReportQmkc(ReportInoutDepotData d,
+ public ReportInoutDepotData updateDepotReportQmkc(ReportInoutDepotData d,List<ReportInoutStorageData> list1,
List<ReportInoutStorageData> list2) {
- ReportInoutStorageData inoutStorageData = null;
- for (ReportInoutStorageData storageData : list2) {
- if (storageData.getDepotId().equals(d.getDepotId())) {
- inoutStorageData = storageData;
- break;
+ ReportInoutStorageData inoutStorageData1 = null;
+ ReportInoutStorageData inoutStorageData2 = null;
+ if(null!= list1 && list1.size() > 0){
+ for (ReportInoutStorageData storageData : list1) {
+ if (storageData.getDepotId().equals(d.getDepotId())) {
+ inoutStorageData1 = storageData;
+ break;
+ }
}
}
- if (null == inoutStorageData) {
- Depot depot = depotService.getDepotById(ContextUtil.getCompanyId(),
- d.getDepotId());
- d.setQmkc(null == depot.getStorageReal() ? 0.0 : depot
- .getStorageReal());
- return d;
+ if(null!= list2 && list2.size() > 0){
+ for (ReportInoutStorageData storageData : list2) {
+ if (storageData.getDepotId().equals(d.getDepotId())) {
+ inoutStorageData2 = storageData;
+ break;
+ }
+ }
}
- double cmkc = inoutStorageData.getCurStorage();
- if (InoutConstant.TYPE_IN.equals(inoutStorageData.getType())) {
- cmkc = inoutStorageData.getCurStorage()
- + inoutStorageData.getSettleWeight();
+ if (null == inoutStorageData1) {
+ inoutStorageData1 = new ReportInoutStorageData();
}
- if (InoutConstant.TYPE_OUT.equals(inoutStorageData.getType())) {
- cmkc = inoutStorageData.getCurStorage()
- - inoutStorageData.getSettleWeight();
+ if (null == inoutStorageData2) {
+ inoutStorageData2 = new ReportInoutStorageData();
}
- if (Constant.LOSS_OVER_OVER.equals(inoutStorageData.getType())) {
- cmkc = inoutStorageData.getCurStorage()
- + inoutStorageData.getSettleWeight();
- }
- if (Constant.LOSS_OVER_LOSS.equals(inoutStorageData.getType())) {
- cmkc = inoutStorageData.getCurStorage()
- - inoutStorageData.getSettleWeight();
- }
+ double cmkc = inoutStorageData1.getSettleWeight() - inoutStorageData2.getSettleWeight();
d.setQmkc(cmkc);
return d;
--
Gitblit v1.9.3