src/main/java/com/fzzy/api/timer/PushDataScheduled.java
@@ -123,7 +123,7 @@ if (String.valueOf(minute).equals(conf.getPushMinute99())) { isExecute = true; if (!isUpdateStart) { start = DateUtils.addHours(start, -2); start = DateUtils.addHours(start, -3); } } else { isExecute = false; src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
@@ -123,10 +123,11 @@ if (String.valueOf(minute).equals(conf.getSyncMinute99())) { isExecute = true; if (!isUpdateStart) { start = DateUtils.addHours(start, -2); start = DateUtils.addHours(start, -3); } } else { isExecute = false; isExecute = true; start = DateUtils.addHours(start, -3); } if (!isExecute) { src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
@@ -3,11 +3,9 @@ import com.bstek.dorado.annotation.PropertyDef; import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.*; import java.util.Date; import java.util.List; /** * 出入库结算,2023年5月26日,根据新国粮规优化调整 @@ -50,6 +48,10 @@ @PropertyDef(label = "合同名称", description = "针对轮换粮食必填") private String contractName; @Column(name = "CUSTOMER_NAME_", length = 50) @PropertyDef(label = "客户名称", description = "针对轮换粮食必填") private String customerName; // 结算信息 @Column(name = "PAY_PRICE_") @PropertyDef(label = "单价") @@ -76,7 +78,7 @@ private String payee; @Column(name = "PAYEE_ID_") @PropertyDef(label = "收款人省份证号") @PropertyDef(label = "收款人身份证号") private String payeeId; @Column(name = "BANK_CATEGORY_", length = 10) @@ -102,12 +104,37 @@ @Column(name = "PAY_USER_", length = 40) @PropertyDef(label = "付款操作人") private String payUser; @Column(name = "fphm", length = 10) @PropertyDef(label = "发票号码") private String fphm; @Column(name = "fpzt", length = 10) @PropertyDef(label = "发票状态",description = "1:正常,0:作废") private String fpzt; @Column(name = "REMARKS_", length = 200) @PropertyDef(label = "备注信息") private String remarks; @Column(name = "INOUT_RECORD_ID_", length = 40) @PropertyDef(label = "流水号", description = "根据一定的规则生成") private String inoutRecordId; @Column(name = "UPDATE_TIME_") @PropertyDef(label = "数据更新时间") private Date updateTime; /** * 系统内业务使用,只有单车结算赋值 */ @Column(name = "PLATE_NUM_", length = 20) @PropertyDef(label = "车船号", description = "车牌号+标识符") private String plateNum; @Column(name = "FOOD_VARIETY_", length = 20) @PropertyDef(label = "粮食品种") private String foodVariety; } src/main/java/com/fzzy/push/gd2020/GDApiRemoteService.java
@@ -332,7 +332,9 @@ } apiLogRep.save(apiLog); if (responseDto.getSuccess() > 0) { apiLogRep.save(apiLog); } return responseDto; } src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -126,7 +126,9 @@ responseDto.setBizId(bizId); apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getMsg()); apiLogRep.save(apiLog); if (responseDto.getCode() != 200) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); resd.setMsg(responseDto.getMsg()); src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -129,7 +129,9 @@ responseDto.setBizId(bizId); apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getMsg()); apiLogRep.save(apiLog); if (responseDto.getCode() != 200) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); resd.setMsg(responseDto.getMsg()); @@ -882,8 +884,8 @@ } } api1403.setRotationInQty(Double.valueOf(String.format("%.3f",lrsl))); api1403.setRotationOutQty(Double.valueOf(String.format("%.3f",lcsl))); api1403.setRotationInQty(Double.valueOf(String.format("%.3f", lrsl))); api1403.setRotationOutQty(Double.valueOf(String.format("%.3f", lcsl))); api1403.setDtls(dtls); //先上传文件,获取文件id GD2023ResponseDto responseDto = GD2023HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz()); src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -133,7 +133,9 @@ apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getResult()); apiLogRep.save(apiLog); if (responseDto.getCode() != 200) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); resd.setMsg(responseDto.getResult()); src/main/java/com/fzzy/push/nx2024/NX2024ApiRemoteService.java
@@ -131,7 +131,9 @@ apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getResult()); apiLogRep.save(apiLog); if (responseDto.getCode() != 200) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); resd.setMsg(responseDto.getResult()); src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -165,7 +165,9 @@ apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getResult()); apiLogRep.save(apiLog); if (responseDto.getCode() != 200) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); resd.setMsg(responseDto.getResult()); src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -133,7 +133,9 @@ responseDto.setBizId(bizId); apiLog.setStatus(responseDto.getCode() == 1 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getDescription()); apiLogRep.save(apiLog); if (responseDto.getCode() != 1) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(responseDto.getCode() == 1 ? 0 : responseDto.getCode()); resd.setMsg(responseDto.getDescription()); src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
@@ -147,7 +147,9 @@ SX2023Dto result = JSONObject.parseObject(JSONObject.toJSONString(sx2023RespDto.getMsgBody()), SX2023Dto.class); apiLog.setStatus(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode())); apiLog.setResult(result.getVER()); apiLogRep.save(apiLog); if (!result.getCode().equals("200")) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode())); resd.setMsg(result.getVER()); src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -151,7 +151,9 @@ SX2024Dto result = JSONObject.parseObject(JSONObject.toJSONString(sx2024RespDto.getMsgBody()), SX2024Dto.class); apiLog.setStatus(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode())); apiLog.setResult(result.getVER()); apiLogRep.save(apiLog); if (!result.getCode().equals("200")) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode())); resd.setMsg(result.getVER()); src/main/java/com/fzzy/push/sx2025/SX2025ApiRemoteService.java
@@ -148,7 +148,9 @@ SX2025Dto result = sx2025RespDto.getMsgBody(); apiLog.setStatus(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode())); apiLog.setResult(result.getVER()); apiLogRep.save(apiLog); if (!result.getCode().equals("200")) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(result.getCode().equals("200") ? 0 : Integer.valueOf(result.getCode())); resd.setMsg(result.getVER()); @@ -389,7 +391,7 @@ } //账套信息 if (Constant.API_CODE_1504.equals(inteId)) { Api1504 api1504 = (Api1504)data; Api1504 api1504 = (Api1504) data; SX2025Api1504 apiData = new SX2025Api1504(); BeanUtils.copyProperties(api1504, apiData); //设置統一库区编码 @@ -406,7 +408,7 @@ } //科目信息 if (Constant.API_CODE_1505.equals(inteId)) { Api1505 api1505 = (Api1505)data; Api1505 api1505 = (Api1505) data; SX2025Api1505 apiData = new SX2025Api1505(); BeanUtils.copyProperties(api1505, apiData); apiData.setCqunit(api1505.getCqunit() + ""); @@ -956,7 +958,7 @@ cntxwjlj += apiData.getTykqbm() + "/"; cntxwjlj += apiData.getYzwbh() + "/"; cntxwjlj += apiData.getSpjksbid() + "/"; cntxwjlj += apiData.getTyhwbm() + "_" + DateFormatUtils.format(apiData.getZpsj(),"yyyyMMdd HHmmss") + "." + apiData.getTxwjhzm(); cntxwjlj += apiData.getTyhwbm() + "_" + DateFormatUtils.format(apiData.getZpsj(), "yyyyMMdd HHmmss") + "." + apiData.getTxwjhzm(); apiData.setCntxwjlj(cntxwjlj); return apiData; } @@ -975,7 +977,7 @@ spwjlj += apiData.getTykqbm() + "/"; spwjlj += apiData.getSpjksbid() + "/"; spwjlj += apiData.getSpjksbid() + "/"; spwjlj += apiData.getTykqbm() + "_" + DateFormatUtils.format(apiData.getGjsj(),"yyyyMMdd HHmmss") + "." + apiData.getSpwjhzm(); spwjlj += apiData.getTykqbm() + "_" + DateFormatUtils.format(apiData.getGjsj(), "yyyyMMdd HHmmss") + "." + apiData.getSpwjhzm(); apiData.setSpwjlj(spwjlj); return apiData; } src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -135,7 +135,9 @@ WhjlRespDto responseDto = whjl2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData); apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); apiLog.setResult(responseDto.getResult()); apiLogRep.save(apiLog); if (responseDto.getCode() != 200) { apiLogRep.save(apiLog); } ResponseDto resd = new ResponseDto(); resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); resd.setMsg(responseDto.getResult());