From ebaaa34038ebda73630c9ab82465c5f76692b5c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 05 十二月 2023 00:01:48 +0800
Subject: [PATCH] 提交粮情协议2，完成
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index ffb073f..3de8ae7 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -132,7 +132,7 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
apiData.setLspzdm(mappingCode);
//绮绛夌骇
@@ -151,7 +151,7 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
+ if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -160,7 +160,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
+ if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -169,7 +169,7 @@
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
- if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
+ if(!sysData.getCompleteTime().after(sysData.getFullWeightTime())){
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
--
Gitblit v1.9.3