From 694f541f9f4bc51818395be84e5ddf322c8048d8 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 10 六月 2025 14:35:57 +0800
Subject: [PATCH] 调整出入库报表
---
/dev/null | 0
igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDepot.view.xml | 23 -----------
igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java | 54 ++++++++++++---------------
igds-inout/src/main/java/com/ld/igds/inout/dto/ReportInoutStorageData.java | 2
4 files changed, 26 insertions(+), 53 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/ReportInoutStorageData.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/ReportInoutStorageData.java
index 3fd3cbf..dc566a3 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/ReportInoutStorageData.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/ReportInoutStorageData.java
@@ -28,7 +28,7 @@
private String type;
@PropertyDef(label = "缁撶畻閲嶉噺")
- private double settleWeight;
+ private double settleWeight = 0.0;
private String foodVariety;
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..71102a3 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
@@ -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;
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDepot.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDepot.view.xml
index ce46e9f..3df2c2e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDepot.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDepot.view.xml
@@ -75,7 +75,7 @@
</PropertyDef>
<PropertyDef name="qmkc">
<Property name="dataType">double</Property>
- <Property name="label">鏈熸湯搴撳瓨</Property>
+ <Property name="label">搴撳瓨</Property>
</PropertyDef>
<PropertyDef name="foodType">
<Property></Property>
@@ -256,34 +256,13 @@
<DataColumn name="foodVariety">
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
- <Property name="visible">false</Property>
- </DataColumn>
- <DataColumn name="cqkc">
- <Property name="property">cqkc</Property>
- <Property name="align">center</Property>
</DataColumn>
<DataColumn name="inNum">
<Property name="property">inNum</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="overNum">
- <Property name="property">overNum</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="inSum">
- <Property name="property">inSum</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="outNum">
<Property name="property">outNum</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="lossNum">
- <Property name="property">lossNum</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="outSum">
- <Property name="property">outSum</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="qmkc">
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/DrugApplyRowMapper.class b/igds-recir/target/classes/com/ld/igds/drug/service/DrugApplyRowMapper.class
deleted file mode 100644
index 6258704..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/service/DrugApplyRowMapper.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/DrugInoutRowMapper.class b/igds-recir/target/classes/com/ld/igds/drug/service/DrugInoutRowMapper.class
deleted file mode 100644
index 2d33a6d..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/service/DrugInoutRowMapper.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/DrugLogRowMapper.class b/igds-recir/target/classes/com/ld/igds/drug/service/DrugLogRowMapper.class
deleted file mode 100644
index 91ffe44..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/service/DrugLogRowMapper.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/DrugRowMapper.class b/igds-recir/target/classes/com/ld/igds/drug/service/DrugRowMapper.class
deleted file mode 100644
index eb473b7..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/service/DrugRowMapper.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class
deleted file mode 100644
index e4ffdc2..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class
deleted file mode 100644
index 355c740..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class
deleted file mode 100644
index dbee6c2..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugApplyPR.class b/igds-recir/target/classes/com/ld/igds/drug/view/DrugApplyPR.class
deleted file mode 100644
index ed689ad..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugApplyPR.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugInoutPR.class b/igds-recir/target/classes/com/ld/igds/drug/view/DrugInoutPR.class
deleted file mode 100644
index 247ad3c..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugInoutPR.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApplyPR.class b/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApplyPR.class
deleted file mode 100644
index 9f71647..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApplyPR.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogPR.class b/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogPR.class
deleted file mode 100644
index 1c63dce..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogPR.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class b/igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class
deleted file mode 100644
index f93188b..0000000
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/Drug.class b/igds-recir/target/classes/com/ld/igds/models/Drug.class
deleted file mode 100644
index 847d556..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/Drug.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugApply.class b/igds-recir/target/classes/com/ld/igds/models/DrugApply.class
deleted file mode 100644
index 66994d0..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/DrugApply.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugInout.class b/igds-recir/target/classes/com/ld/igds/models/DrugInout.class
deleted file mode 100644
index ee7b67e..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/DrugInout.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLog.class b/igds-recir/target/classes/com/ld/igds/models/DrugLog.class
deleted file mode 100644
index c6317fc..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLog.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class
deleted file mode 100644
index 567b751..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class
deleted file mode 100644
index b9c8b8a..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class
deleted file mode 100644
index 59cded5..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class
deleted file mode 100644
index 6fc713a..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/TempIntelConf.class b/igds-recir/target/classes/com/ld/igds/models/TempIntelConf.class
deleted file mode 100644
index 5bbe7ef..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/TempIntelConf.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/TempIntelTask.class b/igds-recir/target/classes/com/ld/igds/models/TempIntelTask.class
deleted file mode 100644
index 1b30e2c..0000000
--- a/igds-recir/target/classes/com/ld/igds/models/TempIntelTask.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/temp/controller/TempControlController.class b/igds-recir/target/classes/com/ld/igds/temp/controller/TempControlController.class
deleted file mode 100644
index 468cbd6..0000000
--- a/igds-recir/target/classes/com/ld/igds/temp/controller/TempControlController.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/temp/manager/TempControlManager.class b/igds-recir/target/classes/com/ld/igds/temp/manager/TempControlManager.class
deleted file mode 100644
index f9ae43c..0000000
--- a/igds-recir/target/classes/com/ld/igds/temp/manager/TempControlManager.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/temp/service/HTempIntelService.class b/igds-recir/target/classes/com/ld/igds/temp/service/HTempIntelService.class
deleted file mode 100644
index f0aad16..0000000
--- a/igds-recir/target/classes/com/ld/igds/temp/service/HTempIntelService.class
+++ /dev/null
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/temp/view/TempIntelPR.class b/igds-recir/target/classes/com/ld/igds/temp/view/TempIntelPR.class
deleted file mode 100644
index 86ed628..0000000
--- a/igds-recir/target/classes/com/ld/igds/temp/view/TempIntelPR.class
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3