From b6faf70a938ca9e014d34b235dec449f2a21abb4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 30 六月 2025 17:03:13 +0800
Subject: [PATCH] 数据同步时，品种处理
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index 227d1b6..7c6fd3e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -101,6 +101,9 @@
int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+ if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
+ continue;
+ }
listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
idNum ++;
}
@@ -143,7 +146,7 @@
sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
}
- apiData.setQysj(sysData.getRegisterTime());
+
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -162,31 +165,52 @@
if (StringUtils.isEmpty(fz40CheckItem.getValue())) {
continue;
}
- jyxm += gbCheckList.get(0).getCode() + ",";
- jyz += fz40CheckItem.getValue() + ",";
+ jyxm += "," + gbCheckList.get(0).getCode();
+ jyz += "," + fz40CheckItem.getValue();
zkj += ",0.0";
zkl += ",0.0";
}
-
+ if(jyxm.length() > 0){
+ jyxm = jyxm.substring(1);
+ }
+ if(jyz.length() > 0){
+ jyz = jyz.substring(1);
+ }
apiData.setJyxm(jyxm);
apiData.setJyz(jyz);
apiData.setZkj(StringUtils.isEmpty(zkj)?"":zkj.substring(1));
apiData.setZkl(StringUtils.isEmpty(zkl)?"":zkl.substring(1));
if("UNPASS".equals(sysData.getCheckStatus())){
apiData.setJyjg("0");
- }
- if("PASS".equals(sysData.getCheckStatus())){
+ }else {
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));
+ if (null == sysData.getCheckTime()) {
+ sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+ }
+ if (sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
+ sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+ }
+ apiData.setJysj(sysData.getCheckTime());
+ if (null == sysData.getSampleTime()) {
+ sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+ }
+ if (sysData.getSampleTime().after(sysData.getCheckTime())) {
+ sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+ }
+ apiData.setQysj(sysData.getSampleTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ }
apiData.setLspzdm(mappingCode);
//淇濈鍛樺鏍�
apiData.setBgyfh(apiData.getJyjg());
+ apiData.setSpaqzbsfhg("1");
//绮绛夌骇
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
--
Gitblit v1.9.3