From 4c6b38c84b14e90bd0844046645c61796746696c Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期六, 09 三月 2024 14:18:03 +0800 Subject: [PATCH] 出库结算信息加入货位字段,上传不使用 --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java index 930c6cd..ebfc1b8 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java @@ -54,10 +54,10 @@ apiLog.setStatus(99); apiLog.setId(ContextUtil.getUUID()); try { - List<Fz40InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId); + List<Fz40InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId, start, end); if (null == list || list.isEmpty()) { - log.debug("-------------娌℃湁鑾峰彇鍒板悎鍚屼俊鎭�------------------"); + log.debug("-------------娌℃湁鑾峰彇鍒板鎴蜂俊鎭�------------------"); return; } @@ -71,7 +71,7 @@ apiData = new Api1212(); //鍗曚綅浠g爜 - apiData.setId(sysData.getId()); + apiData.setId(sysData.getKhbh()); apiData.setDwdm(api1101.getDwdm()); apiData.setDwmc(api1101.getDwmc()); apiData.setKqdm(api1102.getKqdm()); @@ -79,7 +79,7 @@ apiData.setKhlx(sysData.getKhlx()); apiData.setKhtyshxydmhsfzh(sysData.getKhbh()); apiData.setKhmc(sysData.getName()); - apiData.setFddbr(sysData.getFddbr()); + apiData.setFddbr(StringUtils.isEmpty(sysData.getFddbr()) ? "娉曚汉" :sysData.getFddbr()); apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" :sysData.getAddress()); apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() :sysData.getContactUser()); @@ -87,17 +87,15 @@ if(StringUtils.isNotEmpty(sysData.getCardId())){ apiData.setLxrsfzh(sysData.getCardId()); } - if(StringUtils.isNotEmpty(sysData.getYzbm())){ - apiData.setYzbm(sysData.getYzbm()); - } + apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "000000" :sysData.getYzbm()); apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" :sysData.getDzyx()); -// apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "" :sysData.getBank()); + apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "999" :sysData.getBank()); apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum()); apiData.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime()); apiData.setBizId(sysData.getId()); - api1212List = api1212Rep.getDataById(sysData.getId()); + api1212List = api1212Rep.getDataById(apiData.getId()); if(null == api1212List || api1212List.isEmpty()){ apiData.setCzbz(Constant.CZBZ_I); }else { -- Gitblit v1.9.3