From 7e8b9812a472a59fdfa740c31f97dbafb7f5e343 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 11:12:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/extend/entity/ExtOtherInvoice.java | 4 +++- .../extend/service/pool/ExtInvoicePoolServiceImpl.java | 4 ++-- dxhy-extend/src/main/resources/mapper/TicketMapper.xml | 8 ++++---- .../dxhy/sign/controller/SignElecInvoiceController.java | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java index f7af08eb..c9ad1d03 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java @@ -2,6 +2,7 @@ package com.dxhy.extend.entity; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; /** @@ -64,7 +65,8 @@ public class ExtOtherInvoice implements Serializable { private String taxAmount; private String voucherNo; private String postingTime; - private String imageId; + @TableField("image_id") + private String imageNumber; private String accountPeriod; private String inAccountStatus; private String bzdh; diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 900c50bc..b5f2d37c 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -218,8 +218,8 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl - t.bzdh = #{bzdh} + and t.bzdh = #{bzdh} - t.sn_voucher_number = #{snVoucherNumber} + and t.sn_voucher_number = #{snVoucherNumber} @@ -131,10 +131,10 @@ and t.inaccount_status = #{inAccountStatus} - t.bzdh = #{bzdh} + and t.bzdh = #{bzdh} - t.sn_voucher_number = #{snVoucherNumber} + and t.sn_voucher_number = #{snVoucherNumber} diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java index f4946192..44dd6b82 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java @@ -355,6 +355,7 @@ public class SignElecInvoiceController extends AbstractController { @RequestMapping("/deleteElec") @SysLog("删除签收失败发票") public ResponseEntity deleteElec(@RequestBody Map pramsMap) { + log.info("删除签收失败发票参数{}",pramsMap); try { // 删除 扫描表信息 boolean deleteElec = signElecInvoiceService.deleteElec(pramsMap.get("scanId"), getUserInfo().getDbName()); From b2b55d4c6c26785e13ff4a8b1d3288940a54aaff Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 14:00:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/extend/entity/ExtAddTaxInvoice.java | 2 ++ .../pool/ExtInvoicePoolServiceImpl.java | 31 ++++++++++++------- .../resources/mapper/ExtInvoicePoolMapper.xml | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java index d531fa62..3641de70 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java @@ -2,6 +2,7 @@ package com.dxhy.extend.entity; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; /** @@ -135,6 +136,7 @@ public class ExtAddTaxInvoice implements Serializable { private String snVoucherNumber; private String postingTime; + @TableField("image_id") private String imageNumber; private String accountPeriod; private String compCode; diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index b5f2d37c..4b5f73c4 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -49,12 +49,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType())); pageList.get(i).setQsrq(pageList.get(i).getQsrq() == null ? "" : pageList.get(i).getQsrq()); @@ -274,9 +275,17 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); - pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, - pageList.get(i).getInAccountStatus())); + if (pageList.get(i).getInAccountStatus()!= null){ + if ("1".equals(pageList.get(i).getInAccountStatus())){ + pageList.get(i).setInAccountStatus("已入账"); + } + if ("0".equals(pageList.get(i).getInAccountStatus())) { + pageList.get(i).setInAccountStatus("未入账"); + } + } +// log.info("inAccountStatus=====>{}",pageList.get(i).getInAccountStatus()); +// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, +// pageList.get(i).getInAccountStatus())); } diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 2faf90aa..d20ee4b2 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -163,7 +163,6 @@ t.qs_name qsr, DATE_FORMAT(t.payment_date,'%Y-%m') inAccountMonth, t.payment_status paymentStatus, - t.inaccount_status inAccountStatus, t.voucher_number voucherNo, t.sn_voucher_number snVoucherNumber, t.posting_time postingTime, @@ -180,6 +179,7 @@ t.account_period accountPeriod, t.inaccount_status inAccountStatus, t.bzdh bzdh, + t.posting_time postingTime DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom from t_dx_record_invoice t From cd747003e88c3e0e3eb36fa417693848e8ea3b8b Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 14:41:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/fpxxrz/BaseRzFpxxServiceImpl.java | 9 +++++++-- .../BaseInvoiceManualCheckServiceImpl.java | 16 ++++++++-------- .../impl/CustomsCustomsJkszhcxServiceImpl.java | 8 ++++++-- .../impl/CustomsRecordDkrzServiceImpl.java | 15 ++++++++++++--- .../service/bb/impl/ExtFpzhcxServiceImpl.java | 8 ++++++-- .../service/bb/impl/ExtYcfpcxServiceImpl.java | 6 +++++- .../service/companypool/TicketServiceImpl.java | 9 +++++++-- .../pool/ExtInvoicePoolServiceImpl.java | 18 +++++++++--------- 8 files changed, 60 insertions(+), 29 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index b7317f65..aa5bc318 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -182,8 +182,13 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); - pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus())); - log.info("入账状态====>{}",pageList.get(i).getInAccountStatus()); +// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus())); +// log.info("入账状态====>{}",pageList.get(i).getInAccountStatus()); } } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 4b5f73c4..ef4d937a 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -396,13 +396,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl Date: Thu, 27 Apr 2023 14:58:51 +0800 Subject: [PATCH 4/8] =?UTF-8?q?ariesy=20=E6=B7=BB=E5=8A=A0=E6=8C=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 95fd8e6d..ebc31dca 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -12,7 +12,10 @@ import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.enums.SNFplxEnum; import com.dxhy.common.util.InvoiceUtil; import com.dxhy.common.util.UserInfoUtil; +import com.dxhy.common.utils.Base64Encoding; import com.dxhy.common.utils.R; +import com.dxhy.common.vo.Tax; +import com.dxhy.common.vo.TaxOrgCode; import com.dxhy.erp.dao.CustomsRecordDao; import com.dxhy.erp.dao.GsClientMapper; import com.dxhy.erp.dao.RecordInvoiceDao; @@ -26,6 +29,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; +import org.springframework.util.Base64Utils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; @@ -53,6 +57,9 @@ public class SDNYMainProcessController extends AbstractController { @Value("${sdny.environment}") private String environment; + @Value("${sdny.isPresure}") + private String isPresure; + @Resource private GsClientMapper gsClientMapper; @@ -91,12 +98,25 @@ public class SDNYMainProcessController extends AbstractController { String userid = "101833"; String dbName = "business"; String company = "BIGB"; - // 入参统一在入口处理 // String userid = getLoginName(); // String dbName = getUserInfo().getDbName(); // String company = getUserInfo().getCompany(); JSONObject checkInvoiceResult = null; + + if("1".equals(isPresure)){ + String base64 = "{"success":true,"code":"0000","message":"default success","data":{"detailList":[{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"1","hwmc":"*塑料制品*保鲜膜","je":"100.00","spsl":"4","bhsdj":"25.00","ggxh":"中","jldw":"卷","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"2","hwmc":"*塑料制品*保鲜膜","je":"40.00","spsl":"2","bhsdj":"20.00","ggxh":"小","jldw":"卷","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"3","hwmc":"*油料*花生","je":"340.00","spsl":"1","bhsdj":"340.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"4","hwmc":"*谷物细粉*面","je":"1030.00","spsl":"10","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"5","hwmc":"*植物油*大豆油","je":"480.00","spsl":"2","bhsdj":"240.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"6","hwmc":"*油料*花生","je":"1280.00","spsl":"2","bhsdj":"640.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"7","hwmc":"*糖*加工糖","je":"12.00","spsl":"2","bhsdj":"6.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030106030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"8","hwmc":"*其他食品*当归","je":"21.00","spsl":"0.7","bhsdj":"30.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"9","hwmc":"*谷物细粉*玉米面","je":"125.00","spsl":"1","bhsdj":"125.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"10","hwmc":"*洗涤剂*合成洗涤剂","je":"180.00","spsl":"4","bhsdj":"45.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1070222020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"11","hwmc":"*蛋制品*再制蛋","je":"30.00","spsl":"20","bhsdj":"1.50","ggxh":"","jldw":"个","hsdj":"","hsje":"","ssflbm":"1030114030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"12","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"13","hwmc":"*焙烤食品*焙烤松脆食品","je":"36.00","spsl":"6","bhsdj":"6.00","ggxh":"","jldw":"盒","hsdj":"","hsje":"","ssflbm":"1030201050000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"14","hwmc":"*农副食品*辣段","je":"90.00","spsl":"2","bhsdj":"45.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"15","hwmc":"*发酵类制品*泡打粉","je":"17.50","spsl":"7","bhsdj":"2.50","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1030207010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"16","hwmc":"*淀粉制品*淀粉制品","je":"100.00","spsl":"20","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030112030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"17","hwmc":"*农副食品*玉米碜","je":"25.00","spsl":"10","bhsdj":"2.50","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"18","hwmc":"*油料*花生","je":"340.00","spsl":"1","bhsdj":"340.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"19","hwmc":"*植物油*花生油","je":"640.00","spsl":"1","bhsdj":"640.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105010400000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"20","hwmc":"*植物油*大豆油","je":"1225.00","spsl":"5","bhsdj":"245.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"21","hwmc":"*蔬菜*绿豆芽等芽苗菜","je":"180.00","spsl":"4","bhsdj":"45.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1010112140000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"22","hwmc":"*方便食品*腐竹","je":"450.00","spsl":"2","bhsdj":"225.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030203010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"23","hwmc":"*淀粉制品*淀粉制品","je":"100.00","spsl":"20","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030112030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"24","hwmc":"*调味品*复合调味品","je":"48.00","spsl":"1","bhsdj":"48.00","ggxh":"","jldw":"桶","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"25","hwmc":"*谷物细粉*面","je":"1030.00","spsl":"10","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"26","hwmc":"*木制品*木制一次性筷子","je":"120.00","spsl":"4","bhsdj":"30.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1050108020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"27","hwmc":"*其他食品*味达美","je":"178.00","spsl":"1","bhsdj":"178.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"28","hwmc":"*加工盐*食用盐","je":"50.00","spsl":"1","bhsdj":"50.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030210010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"29","hwmc":"*农副食品*木耳","je":"225.00","spsl":"5","bhsdj":"45.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"30","hwmc":"*调味品*耗油","je":"130.00","spsl":"1","bhsdj":"130.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"31","hwmc":"*植物油*花生油","je":"1280.00","spsl":"2","bhsdj":"640.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105010400000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"32","hwmc":"*植物油*大豆油","je":"980.00","spsl":"4","bhsdj":"245.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"33","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"34","hwmc":"*谷物*其他谷物","je":"50.00","spsl":"10","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1010101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"35","hwmc":"*农副食品*小米","je":"70.00","spsl":"10","bhsdj":"7.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"36","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"37","hwmc":"*调味品*安琪","je":"360.00","spsl":"20","bhsdj":"18.00","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"38","hwmc":"*发酵类制品*泡打粉","je":"25.00","spsl":"10","bhsdj":"2.50","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030207010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"39","hwmc":"*谷物细粉*玉米面","je":"125.00","spsl":"1","bhsdj":"125.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"40","hwmc":"*调味品*花椒面","je":"140.00","spsl":"2","bhsdj":"70.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"41","hwmc":"*其他食品*碱面","je":"40.00","spsl":"20","bhsdj":"2.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"42","hwmc":"*其他食品*味达美","je":"178.00","spsl":"1","bhsdj":"178.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"43","hwmc":"*调味品*醋及醋代用品","je":"75.00","spsl":"1","bhsdj":"75.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"44","hwmc":"*其他食品*面","je":"75.00","spsl":"1","bhsdj":"75.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"45","hwmc":"*蔬菜加工品*腌渍菜","je":"70.00","spsl":"4","bhsdj":"17.50","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030110040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"46","hwmc":"*其他食品*油条剂","je":"24.00","spsl":"2","bhsdj":"12.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"47","hwmc":"*其他食品*胡椒粉","je":"30.00","spsl":"2","bhsdj":"15.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"48","hwmc":"*木制品*木制一次性筷子","je":"30.00","spsl":"1","bhsdj":"30.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1050108020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"49","hwmc":"*农副食品*大料","je":"300.00","spsl":"5","bhsdj":"60.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"50","hwmc":"*淀粉制品*淀粉制品","je":"200.00","spsl":"40","bhsdj":"5.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030112030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"51","hwmc":"*其他食品*芥菜","je":"225.00","spsl":"5","bhsdj":"45.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"52","hwmc":"*谷物细粉*面","je":"2060.00","spsl":"20","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"53","hwmc":"*谷物细粉*玉米面","je":"250.00","spsl":"2","bhsdj":"125.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"54","hwmc":"*农副食品*小米","je":"70.00","spsl":"10","bhsdj":"7.00","ggxh":"","jldw":"斤","hsdj":"","hsje":"","ssflbm":"1030199000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"55","hwmc":"*其他化学制品*火碱","je":"190.00","spsl":"1","bhsdj":"190.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1070299990000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"56","hwmc":"*其他食品*海带丝","je":"240.00","spsl":"1","bhsdj":"240.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"57","hwmc":"*油料*花生","je":"420.00","spsl":"2","bhsdj":"210.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1010103010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"58","hwmc":"*调味品*醋及醋代用品","je":"75.00","spsl":"1","bhsdj":"75.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"59","hwmc":"*调味品*醋及醋代用品","je":"50.00","spsl":"1","bhsdj":"50.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206030000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"60","hwmc":"*加工盐*食用盐","je":"50.00","spsl":"1","bhsdj":"50.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030210010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"61","hwmc":"*调味品*酱油及酱类制品","je":"54.00","spsl":"1","bhsdj":"54.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"62","hwmc":"*植物油*香油","je":"48.00","spsl":"6","bhsdj":"8.00","ggxh":"","jldw":"瓶","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"63","hwmc":"*植物油*大豆油","je":"980.00","spsl":"4","bhsdj":"245.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"64","hwmc":"*塑料制品*一次性手套","je":"50.00","spsl":"10","bhsdj":"5.00","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"65","hwmc":"*谷物细粉*面","je":"1030.00","spsl":"10","bhsdj":"103.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030101010000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"66","hwmc":"*植物油*花生油","je":"1080.00","spsl":"2","bhsdj":"540.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030105010400000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"67","hwmc":"*塑料制品*食品袋","je":"875.00","spsl":"350","bhsdj":"2.50","ggxh":"小","jldw":"把","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"68","hwmc":"*塑料制品*食品袋","je":"960.00","spsl":"320","bhsdj":"3.00","ggxh":"中","jldw":"把","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"69","hwmc":"*调味品*红九九","je":"120.00","spsl":"10","bhsdj":"12.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"70","hwmc":"*调味品*酱油及酱类制品","je":"80.00","spsl":"1","bhsdj":"80.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1030206020000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"71","hwmc":"*塑料制品*餐盒","je":"240.00","spsl":"2","bhsdj":"120.00","ggxh":"","jldw":"件","hsdj":"","hsje":"","ssflbm":"1070601120000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"72","hwmc":"*调味品*红曲粉","je":"70.00","spsl":"10","bhsdj":"7.00","ggxh":"","jldw":"袋","hsdj":"","hsje":"","ssflbm":"1030206040000000000","sl":"0.000%"},{"lx":"","fyxm":"","txrqq":"","txrqz":"","cph":"","se":"0.00","mxbh":"73","hwmc":"*其他食品*豆沙","je":"80.00","spsl":"2","bhsdj":"40.00","ggxh":"","jldw":"包","hsdj":"","hsje":"","ssflbm":"1030299000000000000","sl":"0.000%"}],"kprq":"20221226","jym":"","cjhj":"","jshj":"28151.50","fpje":"28151.50","cycs":"9","xhfmc":"鄂托克旗王旭峰粮油批发店一分店","xhfsbh":"92150693MA0Q8GDT8H","xhfdzdh":"内蒙古自治区鄂尔多斯市鄂托克旗棋盘井镇利民街北康庄市场门口处18248336988","xhfyhzh":"7900801220000000010164","gmfyhzh":"047725012000030015","gmfdzdh":"内蒙古鄂托克前旗上海庙镇鄂尔多斯街新矿内蒙能源宾馆044-7869999","gmfmc":"山东能源集团国际酒店有限公司内蒙古分公司","gmfsbh":"91150623MA0NL53F8C","fpse":"0.00","bz":"裕兴矿食堂","skph":"","jqbh":"","kpr":"","skr":"","fhr":"","bswjurl":"","zfbz":"H","fpzt":"8","sfzh":"","cllx":"","cpxh":"","cd":"","hgzs":"","sjdh":"","fdjhm":"","clsbh":"","cyjg":"0001","cyjgxx":"查验成功发票一致","fpdm":"","fphm":"22152000000000858587","escscdh":"","escscsbh":"","qdbz":"N","fpzl":"22","jkzmsh":"","zgswjgdm":"","wspzhm":"","xcrs":"","zgswjgmc":"","dw":"","sl":"","khyh":"","khzh":"","cyrmc":"","cyrsbh":"","spfmc":"","spfshb":"","shrmc":"","shrsbh":"","fhrmc":"","fhrsbh":"","yshwxx":"","qydjyddd":"","czch":"","ccdw":"","txfbz":"","lslbs":"","cpzh":"","djzh":"","zrdcgsmc":"","mfdwgr":"","mfdwdmsfzh":"","mfdwgrdz":"","mfdh":"","smfdwgr":"","smfdwdmsfzh":"","smfdwgrzz":"","smfdh":"","jypmdw":"","jypmdwdz":"","khyhjzh":"","jypmdwdh":"","jypmdwdzsbh":"","escsc":"","escscdz":"","escsckhyhzh":"","dzzfbs":"","xhfdz":""}}"; + String result = Base64Encoding.decodeToString(base64); + + checkInvoiceResult = JSONObject.parseObject(result); + + R data = new R(1000, "default success"); + data.put("message", "success"); + data.put("data", checkInvoiceResult); + + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } + InvoiceUtil iu = new InvoiceUtil(pramsMap.get("invoiceCode")); String fplxdm = iu.getFplxdm(); if (fplxdm != null || "10107".equals(pramsMap.get("invoiceType")) || "10108".equals(pramsMap.get("invoiceType")) || pramsMap.get("invoiceCode").startsWith("50000")) { @@ -178,9 +198,9 @@ public class SDNYMainProcessController extends AbstractController { } } - try { checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap); + log.info("查验结果为:{}",checkInvoiceResult); } catch (Exception e) { e.printStackTrace(); } @@ -385,6 +405,8 @@ public class SDNYMainProcessController extends AbstractController { // String userid = getLoginName(); // String dbName = getUserInfo().getDbName(); // String company = getUserInfo().getCompany(); +// List orgCodes = getUserInfo().getOrgCodes(); +// String orgCode = orgCodes.get(0).getOrgCode(); // List gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); // String gfsh = ""; // if (gfshAll.size() > 0) { From 0b7070db8f5f2147460d8132c2fb8430fc11cb8f Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 15:06:40 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomsRecordDkrzServiceImpl.java | 3 +-- .../main/resources/mapper/ExtInvoicePoolMapper.xml | 11 ++++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java index f85de567..5eb3e5fe 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java @@ -134,8 +134,7 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl #{item} - + and t.invoice_type = #{invoiceType} - + and t.invoice_status = #{invoiceStatus} @@ -126,8 +124,7 @@ and t.sn_voucher_number = #{snVoucherNumber} - + and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth} @@ -179,7 +176,7 @@ t.account_period accountPeriod, t.inaccount_status inAccountStatus, t.bzdh bzdh, - t.posting_time postingTime + t.posting_time postingTime, DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom from t_dx_record_invoice t From d2008739c38fad2d9042f45ac7add92e1689b874 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Apr 2023 15:29:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/model/mailGather/MailGatherLogVo.java | 4 ++-- .../service/mailGather/impl/MailGatherLogServiceImpl.java | 2 ++ .../java/com/dxhy/sign/controller/SignFpqsController.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java index 37711d01..e3b22e59 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java @@ -27,9 +27,9 @@ public class MailGatherLogVo extends CommonDTO { private String ocrType; private String errorMsg; private String fileName; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String cjsj; public String deptId; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java index 046f7d0c..579f077d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java @@ -7,6 +7,7 @@ import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.util.UUIDUtils; import com.dxhy.common.utils.Base64Encoding; +import com.dxhy.common.utils.DateUtils; import com.dxhy.core.dao.mailGather.MailGatherLogDao; import com.dxhy.core.model.mailGather.EmailMaintainVo; import com.dxhy.core.model.mailGather.MailGatherLogVo; @@ -58,6 +59,7 @@ public class MailGatherLogServiceImpl implements MailGatherLogService { if(emailMaintainVos !=null && emailMaintainVos.size() > 0) { for (int i = 0; i < emailMaintainVos.size(); i++) { MailGatherLogVo mailGatherLogVo = emailMaintainVos.get(i); + mailGatherLogVo.setCjsj(DateUtils.dateToStr(mailGatherLogVo.getCreateTime())); mailGatherLogVo.setXh(i + 1 + ""); } } diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java index 2256e482..e42e9eb3 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java @@ -657,7 +657,7 @@ public class SignFpqsController extends AbstractController { int size = (int)pramsMap.get("size"); try { log.info("签收列表查询参数 {}",data); - log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size)); +// log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size)); return ResponseEntity.ok(R.ok().put("data", signFpqsService.selectQsfpList(data, curr, size))); } catch (Exception e) { e.printStackTrace(); From 7e290e2be5e341685aaa7f58e6294c3b86c0c549 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 15:35:25 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/ExtInvoicePoolMapper.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 24827b64..03031871 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -298,22 +298,22 @@ AND qs_type = #{qsfs} - and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} + and posting_time between #{postingTimeStart} and #{postingTimeEnd} - and t.image_id = #{imageNumber} + and image_id = #{imageNumber} - and t.account_period = #{accountPeriod} + and account_period = #{accountPeriod} - and t.inaccount_status = #{inAccountStatus} + and inaccount_status = #{inAccountStatus} - and t.bzdh = #{bzdh} + and bzdh = #{bzdh} - and t.sn_voucher_number = #{snVoucherNumber} + and sn_voucher_number = #{snVoucherNumber} GROUP BY uuid having min(create_date) ) t @@ -336,9 +336,8 @@ scan_id scanId, business_document_number businessDocumentNumber, account_period accountPeriod, - image_id imageId, + image_id imageNumber, posting_time postingTime, - sn_voucher_number voucherNo, inaccount_status inAccountStatus, bzdh bzdh, sn_voucher_number snVoucherNumber From 8dbfe9877e0b597ec35ac6809e4941aa5596e375 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 27 Apr 2023 15:55:25 +0800 Subject: [PATCH 8/8] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=96=B0=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev.yaml | 20 ++++++++++--------- .../controller/SDNYMainProcessController.java | 17 ++++++++++++---- .../src/main/resources/bootstrap-dev.yaml | 20 ++++++++++--------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-dev.yaml b/dxhy-core/src/main/resources/bootstrap-dev.yaml index 1ccc7858..8b249614 100644 --- a/dxhy-core/src/main/resources/bootstrap-dev.yaml +++ b/dxhy-core/src/main/resources/bootstrap-dev.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: nacos # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 - prefix: dxhy-core + prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: nacos + # Nacos config 登录密码 + password: Invoice.nacos.!1 + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index ebc31dca..799d86aa 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -16,10 +16,7 @@ import com.dxhy.common.utils.Base64Encoding; import com.dxhy.common.utils.R; import com.dxhy.common.vo.Tax; import com.dxhy.common.vo.TaxOrgCode; -import com.dxhy.erp.dao.CustomsRecordDao; -import com.dxhy.erp.dao.GsClientMapper; -import com.dxhy.erp.dao.RecordInvoiceDao; -import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao; +import com.dxhy.erp.dao.*; import com.dxhy.erp.entity.*; import com.dxhy.erp.entity.sdny.*; import com.dxhy.erp.service.*; @@ -84,6 +81,9 @@ public class SDNYMainProcessController extends AbstractController { @Resource private CustomsRecordDao customsRecordDao; + @Resource + private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao; + @Resource private RecordInvoiceDao recordInvoiceDao; @@ -480,6 +480,15 @@ public class SDNYMainProcessController extends AbstractController { return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY))); } } else { + DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); + //删除对应的影像号 + QueryWrapper recordWrapper = new QueryWrapper<>(); + recordWrapper.eq("image_id", imageId); + BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); + recordInvoice.setImageId(""); + recordInvoice.setCompCode(""); + baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); + R data = new R(1000, "default success"); data.put("data", result); return ResponseEntity.ok(JSONObject.toJSONString(data)); diff --git a/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml index 780b661c..88b7634e 100644 --- a/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml +++ b/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-flow-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: nacos # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 - prefix: dxhy-flow + prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: nacos + # Nacos config 登录密码 + password: Invoice.nacos.!1 + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file