From 56bcea62b0f4c9a2fc737502c35bd44b847c20a4 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 28 九月 2023 11:58:55 +0800
Subject: [PATCH] 贝博粮情解析3

---
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
index 1e94b25..092e910 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
@@ -116,8 +116,7 @@
             dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
             dto.setDjbh(inoutRecord.getId());
             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"); //鍑哄簱瀹屾垚
@@ -131,7 +130,7 @@
                 dto.setShjzsj(DateFormatUtils.format(inoutSettle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
                 dto.setJzqj(DateFormatUtils.format(inoutSettle.getPayTime(),"yyyy-MM-dd"));
                 dto.setDj(inoutSettle.getPayPrice() + "");
-                dto.setJe(inoutSettle.getPaySum() + "");
+                dto.setJe(inoutSettle.getPayMoney() + "");
             }
             dto.setDjlx("0");
             dto.setLrfs("0");

--
Gitblit v1.9.3