From 4b4417595ec18fc16f2e6dfde37aef068a1e77da Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Tue, 21 Mar 2023 11:32:13 +0800 Subject: [PATCH] =?UTF-8?q?po=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ConfigureConstant.java | 1 + .../erp/controller/InterfaceController.java | 22 +++++++++- .../main/java/com/dxhy/erp/dao/AreaDao.java | 3 +- .../java/com/dxhy/erp/dao/OrgUserInfoDao.java | 2 + .../dxhy/erp/entity/BaseInvoiceEditVO.java | 40 +++++++++++++++++++ .../main/java/com/dxhy/erp/model/IsInput.java | 2 +- .../service/impl/InvoiceAuthServiceImpl.java | 5 ++- 7 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseInvoiceEditVO.java diff --git a/dxhy-common/src/main/java/com/dxhy/common/constant/ConfigureConstant.java b/dxhy-common/src/main/java/com/dxhy/common/constant/ConfigureConstant.java index b5463b0c..41a1a3bd 100644 --- a/dxhy-common/src/main/java/com/dxhy/common/constant/ConfigureConstant.java +++ b/dxhy-common/src/main/java/com/dxhy/common/constant/ConfigureConstant.java @@ -36,6 +36,7 @@ public class ConfigureConstant { public static final int INT_0 = 0; public static final int INT_2 = 2; + public static final String POTOKEN="6_ca323ed526e74edea7e023c0733a9bef"; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index ff914e34..1fa7001f 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -26,6 +26,7 @@ import com.dxhy.common.utils.GzipUtils; import com.dxhy.common.utils.R; import com.dxhy.common.utils.TripleDesUtil; import com.dxhy.erp.dao.SysDeptDao; +import com.dxhy.erp.entity.BaseInvoiceEditVO; import com.dxhy.erp.entity.SalesInvoicePushInfos; import com.dxhy.erp.entity.SysDeptEntity; import com.dxhy.erp.entity.TDxInvoiceReimburse; @@ -1128,6 +1129,21 @@ public class InterfaceController extends AbstractController { } return returnResult; } + @RequestMapping(path = "/po",method={RequestMethod.POST,RequestMethod.GET}) + public String po(@RequestBody String param,HttpServletRequest request){ + String token = request.getHeader("token"); + if(org.apache.commons.lang3.StringUtils.isBlank(token) && !ConfigureConstant.POTOKEN.equals(token)){ + return "非法请求,请停止访问!"; + } + String resultString = ""; + ErpInvoiceData requestParam = JsonUtils.getInstance().parseObject(param, ErpInvoiceData.class); + //同步 凭证号 判断自动认证接口开发 + if("FI005".equals(requestParam.getIS_INPUT().getIFYWID())){ + resultString = receiveErpInvoiceMessage(requestParam); + } + return resultString; + } + @PostMapping("receiveErpInvoiceMessage") public String receiveErpInvoiceMessage(@RequestBody ErpInvoiceData erpInvoiceData){ @@ -1143,10 +1159,14 @@ public class InterfaceController extends AbstractController { esOutPutResp.setZTYPE("E"); esOutPutResp.setZMESSAGE("程序内部错误"); return JsonUtils.getInstance().toJsonString(esOutPutResp); - } + } + @PostMapping("transferOut") + public String transferOut(@RequestBody IsInput isInput){ + BaseInvoiceEditVO baseInvoiceEditVO = new BaseInvoiceEditVO(); + return null; } } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/AreaDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/AreaDao.java index 6892d511..30e36ecb 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/AreaDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/AreaDao.java @@ -1,6 +1,7 @@ package com.dxhy.erp.dao; import com.dxhy.erp.entity.sdny.area.Area; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -13,7 +14,7 @@ import java.util.List; * @author 大象慧云（shanQing） * @since 2017-10-23 16:31:10 */ -@Repository +@Mapper public interface AreaDao { /** diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/OrgUserInfoDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/OrgUserInfoDao.java index 748e897e..f843e55b 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/OrgUserInfoDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/OrgUserInfoDao.java @@ -2,6 +2,7 @@ package com.dxhy.erp.dao; import com.dxhy.erp.entity.sdny.BxwxEnterpriseUserEntity; import com.dxhy.erp.entity.sdny.OrgUserInfo; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,6 +14,7 @@ import java.util.Optional; * @author guoker * @date 2020-12-29 */ +@Mapper public interface OrgUserInfoDao { /** diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseInvoiceEditVO.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseInvoiceEditVO.java new file mode 100644 index 00000000..84c08f29 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseInvoiceEditVO.java @@ -0,0 +1,40 @@ +package com.dxhy.erp.entity; + +import lombok.Data; + +/** + * @author peipei.li + * @date 2019-04-25 进项税转出确认，条件vo + */ +@Data +public class BaseInvoiceEditVO { + + /** + * 主键，多个以英文逗号分隔，结尾不加逗号 + */ + private String primaryKey; + /** + * 转出选项，1=全部转出， 2=部分转出 + */ + private String outStatus; + + /** + * 转出金额 + */ + private String outAmount; + + /** + * 转出税额 + */ + private String outTax; + /** + * 转出原因 + */ + private String outReason; + + /** + * 备注 + */ + private String outRemark; + +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/model/IsInput.java b/dxhy-erp/src/main/java/com/dxhy/erp/model/IsInput.java index 27a33d0d..f5a0fbf3 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/model/IsInput.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/model/IsInput.java @@ -32,7 +32,7 @@ public class IsInput { @JsonProperty(value = "ZFILED5") private String ZFILED5; @JsonProperty(value = "ZDATA") - private List ZDATA; + private String ZDATA; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index 0bdd2c1d..5bdf40f1 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dxhy.common.enums.FplxEnum; import com.dxhy.erp.model.*; +import com.dxhy.erp.utils.JsonUtils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -326,8 +327,8 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl zdata = isInput.getZDATA(); + String zdata2 = isInput.getZDATA(); + List zdata = JSON.parseArray(zdata2, ZDATA.class); AuthDateReq authDateReq=new AuthDateReq(); authDateReq.setBatchNo(isInput.getSAPKEY()); authDateReq.setApplyRzlx("1");