From 7d1a449b1b41159626e049fd5eced7014de4e459 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 08 七月 2025 17:47:52 +0800
Subject: [PATCH] 入库质检ID生成规则修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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 7c6fd3e..c2c44b7 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -17,6 +17,7 @@
import com.fzzy.async.fzzy40.repository.Fzzy40SyncInoutRecordItemRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -95,22 +96,22 @@
for (Fz40InoutRecord sysData : list) {
listIds = new ArrayList<>();
//鍒ゆ柇鏄惁涓鸿埞杩�
- if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
- if(null != listInoutRecordItem && listInoutRecordItem.size() > 0){
- int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
+ if (null != listInoutRecordItem && listInoutRecordItem.size() > 0) {
+ 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 ++;
+ listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4, 10) + String.valueOf(idNum).substring(1));
+ idNum++;
}
- }else {
+ } else {
listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
}
- }else {
+ } else {
listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
}
@@ -124,7 +125,7 @@
for (String listId : listIds) {
//鏌ヨ绮鍏ュ簱淇℃伅锛岃嫢涓虹┖鍒欎笉杩涜鍚屾涓婁紶
api1102List = api1202Rep.getDataById(listId);
- if(null == api1102List || api1102List.isEmpty()){
+ if (null == api1102List || api1102List.isEmpty()) {
continue;
}
@@ -134,19 +135,18 @@
//璐т綅浠ｇ爜
apiData.setHwdm(api1102List.get(0).getHwdm());
apiData.setRkywdh(api1102List.get(0).getRkywdh());
- if(null == sysData.getFullWeightTime()){
+ if (null == sysData.getFullWeightTime()) {
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
}
//鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
- Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
- int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
- if(numDay != 0){
- sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
+ String time = apiData.getRkjydh().substring(2, 8);
+ if (sysData.getCheckTime() != null) {
+ String isCheckTime = DateFormatUtils.format(sysData.getCheckTime(), "yyMMdd");
+ if (!isCheckTime.equals(time)) {
+ apiData.setRkjydh("14" + isCheckTime + "1" + api1102List.get(0).getRkywdh().substring(9));
+ }
}
-
-
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -170,19 +170,19 @@
zkj += ",0.0";
zkl += ",0.0";
}
- if(jyxm.length() > 0){
+ if (jyxm.length() > 0) {
jyxm = jyxm.substring(1);
}
- if(jyz.length() > 0){
+ 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.setZkj(StringUtils.isEmpty(zkj) ? "" : zkj.substring(1));
+ apiData.setZkl(StringUtils.isEmpty(zkl) ? "" : zkl.substring(1));
+ if ("UNPASS".equals(sysData.getCheckStatus())) {
apiData.setJyjg("0");
- }else {
+ } else {
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
@@ -203,7 +203,7 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
- if(StringUtils.isEmpty(mappingCode)) {
+ if (StringUtils.isEmpty(mappingCode)) {
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
}
apiData.setLspzdm(mappingCode);
@@ -225,9 +225,9 @@
apiData.setSyncTime(new Date());
api1203List = api1203Rep.getDataById(apiData.getRkjydh());
- if(null == api1203List || api1203List.isEmpty()){
+ if (null == api1203List || api1203List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1203List.get(0).getCzbz());
}
--
Gitblit v1.9.3