From be175fe739e687cd1d45da58f2cb7dd0c36d001f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 11 八月 2023 11:48:10 +0800
Subject: [PATCH] 调整Pressure的接口包位置到COre中，然后增加modBus-TCP协议通讯报道
---
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