From e4b8ad94cc1f48b2e47c022f19e70cc68b1e925b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 19 七月 2023 18:10:23 +0800
Subject: [PATCH] 机械通风作业信息记录卡
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..b8f8227 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"); //鍏ュ簱瀹屾垚
--
Gitblit v1.9.3