From f169fcb00f7bf8c15bb1d461cd3710ebaf8106e8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 11 十月 2023 14:07:56 +0800
Subject: [PATCH] 优化液位计算
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
index 72a26a2..01af882 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
@@ -98,7 +98,7 @@
dto.setMzjlsj(DateFormatUtils.format(inoutRecord.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setPz(inoutRecord.getEmptyWeight() + "");
dto.setPzjlsj(DateFormatUtils.format(inoutRecord.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss"));
- dto.setZjkl(inoutRecord.getDeSum() + "");
+ // dto.setZjkl(inoutRecord.getDeSum() + ""); TODO
dto.setJz(inoutRecord.getSettleWeight() + "");
dto.setCmsj(DateFormatUtils.format(inoutRecord.getCompleteTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setCmqrmgryxm(StringUtils.isEmpty(inoutRecord.getCompleteUser())?"0":inoutRecord.getCompleteUser());
@@ -117,8 +117,7 @@
dto.setRkdnm(StringUtils.isEmpty(inoutRecord.getNoticeId())?"0":inoutRecord.getNoticeId());
dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
dto.setSxh(inoutRecord.getId().substring(10));
- if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ||
- InoutConstant.RECORD_STATUS_ERROR.equals(inoutRecord.getRecordStatus())){
+ if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus())){
dto.setDjzt("4"); //宸蹭綔搴�
}else {
dto.setDjzt("2"); //鍏ュ簱瀹屾垚
@@ -128,7 +127,7 @@
dto.setJssj(DateFormatUtils.format((inoutSettle.getPayTime() == null?new Date():inoutSettle.getPayTime()),"yyyy-MM-dd HH:mm:ss"));
dto.setJsjz(inoutSettle.getSettleWeight() + "");
dto.setJsdj(inoutSettle.getPayPrice() + "");
- dto.setJsje(inoutSettle.getPaySum() + "");
+ dto.setJsje(inoutSettle.getPayMoney() + "");
}else {
dto.setJssj(DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
dto.setJsjz("0.0");
--
Gitblit v1.9.3