From 36ceaaf9e4a67df3e29d12139acf3c002fa225ad Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期二, 26 三月 2024 19:17:49 +0800 Subject: [PATCH] 增加登录校验 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java index 77c0db5..52d668d 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java @@ -211,8 +211,13 @@ apiData.setRkjsdh(kqdm + sysData.getSettleId()); } if(StringUtils.isNotEmpty(apiData.getHth())){ - api1204List = api1204Rep.getDataByHth(apiData.getHth()); - if(null != api1204List && api1204List.size() > 0){ + api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm()); + if(null == api1204List || api1204List.isEmpty()){ + api1204List = api1204Rep.getDataByHth(apiData.getHth()); + if(null != api1204List && api1204List.size() > 0){ + apiData.setRkjsdh(api1204List.get(0).getRkjsdh()); + } + }else { apiData.setRkjsdh(api1204List.get(0).getRkjsdh()); } } @@ -237,8 +242,8 @@ apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks()); apiData.setKlyy("鎵i噺鍘熷洜"); - apiData.setCmqrmgryxm(sysData.getRegisterUser()); - apiData.setDjmgryxm(sysData.getRegisterUser()); + apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser()); + apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser()); //01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱 //04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤 apiData.setCchlx("01"); @@ -279,6 +284,7 @@ apiData.setJz(fz40InoutRecordItem.getSettleWeight()); apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime()); apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime()); + apiData.setQtkl(0 - fz40InoutRecordItem.getDe()); api1202List = api1202Rep.getDataById(apiData.getRkywdh()); if (null == api1202List || api1202List.isEmpty()) { apiData.setCzbz(Constant.CZBZ_I); -- Gitblit v1.9.3