From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 十月 2025 13:35:42 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送
---
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
index 9945fcb..23355e5 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
@@ -72,6 +72,11 @@
List<ApiInfoData> apiInfoDataList;
WhjlApi1212 apiData;
for (Fz40WhjlInoutRecord sysData : list) {
+ if(sysData.getRecordStatus().equals("DEL")) {
+ //濡傛灉鏄垹闄ょ姸鎬侊紝鍒欎笉杩涜鍚屾
+ log.info("1212---鍑哄叆搴撹褰�-鍚屾鏁版嵁锛歿}锛岀姸鎬佷负鍒犻櫎锛屼笉杩涜鍚屾", sysData.getId());
+ continue;
+ }
List<ApiInfoData> dept = apiInfoDataRep.getDataByDataId(sysData.getCompanyId());
WhjlApi1101 whjlApi1101 = JSONObject.parseObject(dept.get(0).getData(), WhjlApi1101.class);
List<ApiInfoData> deptArea = apiInfoDataRep.getDataByDataId(sysData.getDeptId());
@@ -85,7 +90,7 @@
apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
if(sysData.getType().equals("IN")){
apiData.setCrklx("鍏ュ簱");
- apiData.setYwlx("鏃ュ父鍑哄叆搴�");//鍑哄叆搴撶被鍨�: 鏃ュ父鍑哄叆搴�/鏃ュ父鍑哄簱/搴旀�ュ叆搴�/搴旀�ュ嚭搴�/鐩樼偣鍏ュ簱/鐩樼偣鍑哄簱/杞粨鍏ュ簱/杞粨鍑哄簱
+ apiData.setYwlx("鏃ュ父鍏ュ簱");//鍑哄叆搴撶被鍨�: 鏃ュ父鍑哄叆搴�/鏃ュ父鍑哄簱/搴旀�ュ叆搴�/搴旀�ュ嚭搴�/鐩樼偣鍏ュ簱/鐩樼偣鍑哄簱/杞粨鍏ュ簱/杞粨鍑哄簱
}
if(sysData.getType().equals("OUT")){
apiData.setCrklx("鍑哄簱");
@@ -119,11 +124,10 @@
}
apiData.setHwbh(whjlApi1108.getHwbh());//璐т綅缂栧彿
apiData.setHwmc(whjlApi1108.getHwmc());//璐т綅鍚嶇О
- apiData.setAjbh(apiData.getHwbh().substring(0,28));//寤掗棿缂栧彿
- apiData.setAjmc(apiData.getHwmc());// TODO 寤掗棿鍚嶇О
+ apiData.setAjbh(whjlApi1108.getHwbh().substring(0,28));//寤掗棿缂栧彿
+ apiData.setAjmc(whjlApi1108.getHwmc());// TODO 寤掗棿鍚嶇О
- apiData.setKctzbh(sysData.getId().substring(2));//搴撳瓨鍙拌处ID
- apiData.setKctzcppcid(sysData.getId().substring(2));//搴撳瓨鍙拌处鎵规ID
+
// apiData.setPsmxid("");//閰嶉�佽溅杈嗘槑缁咺D
// apiData.setYjfamxid("");//搴旀�ユ柟妗堟槑缁咺D
@@ -132,29 +136,44 @@
if(lspz != null && lspz.size() > 0){
apiData.setLspzmc(lspz.get(0).getName());//鍝佺鍚嶇О
}
- if (sysData.getFoodVariety().equals("2")){
+ if (sysData.getFoodVariety().startsWith("2")){
+ apiData.setKctzbh("1234567891234567002");//搴撳瓨鍙拌处ID
+ apiData.setKctzcppcid("12312332132145002");//搴撳瓨鍙拌处鎵规ID
+ apiData.setJldwbm("12");//璁￠噺鍗曚綅缂栫爜
+ apiData.setJldwmc("鍗冨厠");//璁￠噺鍗曚綅鍚嶇О
+ apiData.setJsdwbm("21");//璁℃暟鍗曚綅缂栫爜
+ apiData.setJsdwmc("琚�");//璁℃暟鍗曚綅鍚嶇О
+
//灏忛害绮�
- apiData.setCpbh("FJL89570583ec0a2571");//浜у搧缂栧彿
- apiData.setCpmc("灏忛害绮�");//浜у搧缂栧彿
+ apiData.setCpbh("FJL4a971ea2d319e518");//浜у搧缂栧彿
+ apiData.setCpmc("绮捐嚧灏忛害绮�");//浜у搧缂栧彿
}
- if (sysData.getFoodVariety().equals("1")){
+ if (sysData.getFoodVariety().startsWith("1")){
+ apiData.setKctzbh("1234567891234567001");//搴撳瓨鍙拌处ID
+ apiData.setKctzcppcid("12312332132145001");//搴撳瓨鍙拌处鎵规ID
+ apiData.setJldwbm("12");//璁￠噺鍗曚綅缂栫爜
+ apiData.setJldwmc("鍗冨厠");//璁￠噺鍗曚綅鍚嶇О
+ apiData.setJsdwbm("21");//璁℃暟鍗曚綅缂栫爜
+ apiData.setJsdwmc("琚�");//璁℃暟鍗曚綅鍚嶇О
//澶х背
- apiData.setCpbh("FJLdf09130205a43278");//浜у搧缂栧彿
- apiData.setCpmc("澶х背");//浜у搧缂栧彿
+ apiData.setCpbh("FJL0b1fc3761a2c0a46");//浜у搧缂栧彿
+ apiData.setCpmc("闀挎睙缁垮湴绮崇背");//浜у搧缂栧彿
}
- if (sysData.getFoodVariety().equals("3")){
+ if (sysData.getFoodVariety().startsWith("3")){
+ apiData.setKctzbh("1234567891234567003");//搴撳瓨鍙拌处ID
+ apiData.setKctzcppcid("12312332132145003");//搴撳瓨鍙拌处鎵规ID
+ apiData.setJldwbm("13");//璁￠噺鍗曚綅缂栫爜
+ apiData.setJldwmc("鍗�");//璁￠噺鍗曚綅鍚嶇О
+ apiData.setJsdwbm("23");//璁℃暟鍗曚綅缂栫爜
+ apiData.setJsdwmc("鐡�");//璁℃暟鍗曚綅鍚嶇О
//椋熺敤娌�
- apiData.setCpbh("FJL3e7ba1605ebd5dec");//浜у搧缂栧彿
- apiData.setCpmc("椋熺敤娌�");//浜у搧缂栧彿
+ apiData.setCpbh("FJL60a5761059bf08df");//浜у搧缂栧彿
+ apiData.setCpmc("鑿滅苯娌�");//浜у搧鍚嶇О
}
- apiData.setJldwbm("12");//璁￠噺鍗曚綅缂栫爜
- apiData.setJldwmc("鍗冨厠");//璁￠噺鍗曚綅鍚嶇О
- apiData.setJsdwbm("21");//璁℃暟鍗曚綅缂栫爜
- apiData.setJsdwmc("琚�");//璁℃暟鍗曚綅鍚嶇О
// apiData.setCrklx("");//鍑哄叆搴撶被鍨�
@@ -179,7 +198,7 @@
// apiData.setSccj("");//鐢熶骇鍘傚
// apiData.setGg("");//瑙勬牸鍨嬪彿
// apiData.setCppc("");//浜у搧鎵规
-// apiData.setScrq(null);//鐢熶骇鏃ユ湡
+ apiData.setScrq(sysData.getRegisterTime());//鐢熶骇鏃ユ湡
// apiData.setBzq(null);//淇濊川鏈�
// apiData.setCkfs("");//鍑哄簱鏂瑰紡
apiData.setDjsj(sysData.getRegisterTime());//鐧昏鏃堕棿
@@ -224,8 +243,6 @@
infoData.setData(JSON.toJSONString(apiData));
apiInfoDataRep.save(infoData);
-
-
log.info("1212---鍑哄叆搴撹褰�-鍚屾鏁版嵁锛歿}", apiData.toString());
}
--
Gitblit v1.9.3