From 9b434ea1ebcb7f28a1154bde0f8a9d20e5103646 Mon Sep 17 00:00:00 2001 From: xuefeilong <15138742644@163.com> Date: Tue, 23 Apr 2024 10:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=80=E6=96=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF,=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/htjs/pt4/constant/BasicConstant.java | 2 +- .../xxgl/xmkpgl/kpsq/KpsqController.java | 2 + .../net/htjs/pt4/zzsxt/entity/XxKpsqDO.java | 82 ++++++++ .../xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java | 74 ++++--- .../mapper/mysql/htgl/QywhMapper.xml | 7 +- .../mapper/mysql/xxgl/KpsqMapper.xml | 24 ++- .../static/zzsxt/xxgl/xmkpgl/kpsq/index.js | 6 +- .../zzsxt/xxgl/xmkpgl/kpsq/index_add.js | 77 ++++++- .../zzsxt/xxgl/xmkpgl/kpsq/index_open.js | 1 + .../zzsxt/xtgl/qyxxgl/index_add.html | 4 +- .../zzsxt/xxgl/xmkpgl/kpsq/index_add.html | 199 ++++++++++++++++++ .../zzsxt/xxgl/xmkpgl/kpsq/index_open.html | 1 + 12 files changed, 434 insertions(+), 45 deletions(-) diff --git a/src/main/java/net/htjs/pt4/constant/BasicConstant.java b/src/main/java/net/htjs/pt4/constant/BasicConstant.java index 0c2db42..904f6c0 100644 --- a/src/main/java/net/htjs/pt4/constant/BasicConstant.java +++ b/src/main/java/net/htjs/pt4/constant/BasicConstant.java @@ -3,6 +3,6 @@ package net.htjs.pt4.constant; public class BasicConstant { public static final String TOKEN_URL = "https://f7-demo.jchl.com/taxshare/api/comApi/getToken"; public static final String TOKEN_APP_KEY = "ede5cdc0ae7b70c0814906b2d82f0955"; - public static final String TOKEN_APP_SECRET = "2b993487212d372c6281f4c50508add996a5265b"; + public static final String TOKEN_APP_SECRET = "2b993487212d372c6281f4c50508add996a5265b"; public static final String DJTS_URL = "https://f7-demo.jchl.com/taxshare/api/xxApi/djts"; } diff --git a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java index 4aaedc4..f45e79e 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java +++ b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java @@ -164,6 +164,8 @@ public class KpsqController extends BaseController{ if(userMap.get("limit")!=null){ userMap.put("pageSize",userMap.get("limit")); } + userMap.put("DJLX", ""); + String msg = "操作成功！"; Map mapModel = new HashMap(); try { diff --git a/src/main/java/net/htjs/pt4/zzsxt/entity/XxKpsqDO.java b/src/main/java/net/htjs/pt4/zzsxt/entity/XxKpsqDO.java index cf12f65..e9795a6 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/entity/XxKpsqDO.java +++ b/src/main/java/net/htjs/pt4/zzsxt/entity/XxKpsqDO.java @@ -18,6 +18,7 @@ public class XxKpsqDO implements Serializable { //申请id private String sqid; + private String djlx; //组织机构代码 private String zzjgdm; //项目id @@ -108,6 +109,87 @@ public class XxKpsqDO implements Serializable { private String khhzh; //是否更换抬头 private Integer isChangeTitle; + + private String kz1; + private String kz2; + private String kz3; + private String kz4; + private String kz5; + private String sjly; + private String sjlx; + private String ssyt; + + public String getDjlx() { + return djlx; + } + + public void setDjlx(String djlx) { + this.djlx = djlx; + } + + public String getKz1() { + return kz1; + } + + public void setKz1(String kz1) { + this.kz1 = kz1; + } + + public String getKz2() { + return kz2; + } + + public void setKz2(String kz2) { + this.kz2 = kz2; + } + + public String getKz3() { + return kz3; + } + + public void setKz3(String kz3) { + this.kz3 = kz3; + } + + public String getKz4() { + return kz4; + } + + public void setKz4(String kz4) { + this.kz4 = kz4; + } + + public String getKz5() { + return kz5; + } + + public void setKz5(String kz5) { + this.kz5 = kz5; + } + + public String getSjly() { + return sjly; + } + + public void setSjly(String sjly) { + this.sjly = sjly; + } + + public String getSjlx() { + return sjlx; + } + + public void setSjlx(String sjlx) { + this.sjlx = sjlx; + } + + public String getSsyt() { + return ssyt; + } + + public void setSsyt(String ssyt) { + this.ssyt = ssyt; + } /** * 设置：申请id diff --git a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java index 65ffd7a..9790fe1 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java +++ b/src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java @@ -20,6 +20,7 @@ import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.cgfp.CgfpMapper; import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.fbfpgl.FbfpglMapper; import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.kpsq.KpsqMapper; import net.htjs.pt4.zzsxt.entity.XxKpsqDO; +import net.htjs.pt4.zzsxt.service.xtgl.qyxxgl.IBoQyxxglService; import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.kpsq.IBoKpsqService; import net.htjs.pt4.zzsxt.tools.CommonUtil; import net.htjs.pt4.zzsxt.tools.HttpClientUtil; @@ -142,7 +143,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { if(userMap.get("SQID")==null||userMap.get("SQID").toString().isEmpty()) { throw new RuntimeException("单据编号不能为空"); } - + userMap.put("ZZJG_DM", MapUtil.getStr(userMap, "QYID")); final String sqid = StrUtil.toString(userMap.get("SQID")); Map sqidMap = new HashMap<>(1); sqidMap.put("djbh",sqid); @@ -220,7 +221,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { fpkjObject.put("ywdjbh",MapUtil.getStr(userMap,"SQID"));//否 string 业务单据编号 fpkjObject.put("bz","hnlg演示系统传入"); //否 string 备注 fpkjObject.put("hzxxbbh",IdUtil.simpleUUID()); //否 string 红字信息表/红字申请单编号 - fpkjObject.put("djlx","xsdd");//是 string 单据类型.沟通后确认 + fpkjObject.put("djlx",MapUtil.getStr(userMap,"DJLX"));//是 string 单据类型.沟通后确认 fpkjObject.put("sjlx","QT");//是 string 数据类型。沟通后确认 fpkjObject.put("sjly","OA");//是 string 数据类型。沟通后确认 fpkjObject.put("hsbz","0");//是 string 含税标志. 0不含税 1含税 @@ -344,7 +345,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { jsonObject.put("async",MapUtil.getStr(userMap,"async")); jsonObject.put("callBackUrl",MapUtil.getStr(userMap,"callBackUrl")); cn.hutool.json.JSONObject fpkjObject = new cn.hutool.json.JSONObject(); - fpkjObject.put("kpzddm","20231129001");//是 开票终端代码 沟通后确认 + fpkjObject.put("kpzddm",StrUtil.isNotBlank(MapUtil.getStr(userMap,"KPZDDM"))?MapUtil.getStr(userMap,"KPZDDM"):"20231129001");//是 开票终端代码 沟通后确认 fpkjObject.put("kplx","0");//是 开票类型 0正数发票 1负数发票 fpkjObject.put("fpsqlsh", MapUtil.getStr(userMap,"SQID")); //是 string 开票申请流水号 不可重复 fpkjObject.put("cfclfs","1");//重复处理方式。重复处理方式 0：fpsqlsh重复时返回已开发票信息 1：返回报错。默认1 @@ -377,14 +378,14 @@ public class BoKpsqServiceImpl implements IBoKpsqService { fpkjObject.put("tdyslxdm",MapUtil.getStr(userMap,"TDYW_DM")); //否 string 特定要素类型代码 03建筑服务04货物运输05不动产销售06不动产租赁09旅客运输 fpkjObject.put("tspz",MapUtil.getStr(userMap,"TDYW_DM").equals("16")?"02":"00");//是 string 特殊票种 00正常发票01农产品销售02农产品收购06抵扣通行费07其他通行费08成品油销售12机动车 Map mapqq = new HashMap<>(); - mapqq.put("QYID","914401017299112479"); - Map map = qywhMapper.selectOneZZSGL_GY_QYXX(mapqq); - fpkjObject.put("xfdh",MapUtil.getStr(map,"LXDH")); //是 string 销方电话 - fpkjObject.put("xfdz",MapUtil.getStr(map,"DZDH"));//是 string 销方地址 - fpkjObject.put("xfmc",MapUtil.getStr(map,"QYMC"));//是 string 销方名称 - fpkjObject.put("xfsh",MapUtil.getStr(map,"QYSH"));//是 string 销方税号 - fpkjObject.put("xfyh",MapUtil.getStr(map,"KHHMC"));//是 string 销方开户银行 - fpkjObject.put("xfzh",MapUtil.getStr(map,"YHZH"));//是 string 销方银行账号 + mapqq.put("QYID",MapUtil.getStr(userMap,"QYID")); +// Map map = qywhMapper.selectOneZZSGL_GY_QYXX(mapqq); + fpkjObject.put("xfdh",MapUtil.getStr(userMap,"LXDH")); //是 string 销方电话 + fpkjObject.put("xfdz",MapUtil.getStr(userMap,"DZDH"));//是 string 销方地址 + fpkjObject.put("xfmc",MapUtil.getStr(userMap,"QYMC"));//是 string 销方名称 + fpkjObject.put("xfsh",MapUtil.getStr(userMap,"QYSH"));//是 string 销方税号 + fpkjObject.put("xfyh",MapUtil.getStr(userMap,"KHHMC"));//是 string 销方开户银行 + fpkjObject.put("xfzh",MapUtil.getStr(userMap,"YHZH"));//是 string 销方银行账号 fpkjObject.put("yfpdm",MapUtil.getStr(userMap,"YFPDM"));// 是 string 原发票代码 fpkjObject.put("yfphm",MapUtil.getStr(userMap,"YFPHM"));// 是 string 原发票号码 BigDecimal total = mxArray.stream() @@ -687,7 +688,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { mapObj.put("bz", map.get("BZ")); mapObj.put("hsbz", "1"); mapObj.put("je", map.get("SQKPHSJE")); - mapObj.put("djlx", "0"); + mapObj.put("djlx", MapUtil.getStr(map, "DJLX")); mapObj.put("clfs", "1"); List list=kpsqMapper.getZZSGL_XX_KPSQMX(userMap); List listObj=new ArrayList(); @@ -1390,6 +1391,8 @@ public class BoKpsqServiceImpl implements IBoKpsqService { StaticLog.info("新增异步开票申请和明细信息成功:{}",res); return res; } + @Resource + private IBoQyxxglService iBoQyxxglService; private cn.hutool.json.JSONArray buildDepotParams(XxKpsqDO xxKpsqDO,cn.hutool.json.JSONArray array) { //转换成金财参数 @@ -1406,9 +1409,10 @@ public class BoKpsqServiceImpl implements IBoKpsqService { fpkjObject.put("ywdjbh",xxKpsqDO.getSqid());//否 string 业务单据编号 fpkjObject.put("bz","hnlg演示系统传入"); //否 string 备注 fpkjObject.put("hzxxbbh",IdUtil.simpleUUID()); //否 string 红字信息表/红字申请单编号 - fpkjObject.put("djlx","xsdd");//是 string 单据类型.沟通后确认 - fpkjObject.put("sjlx","QT");//是 string 数据类型。沟通后确认 - fpkjObject.put("sjly","OA");//是 string 数据类型。沟通后确认 + fpkjObject.put("djlx",StrUtil.isNotBlank(xxKpsqDO.getDjlx())?xxKpsqDO.getDjlx():"xsdd");//是 string 单据类型.沟通后确认 + fpkjObject.put("sjlx",StrUtil.isNotBlank(xxKpsqDO.getSjlx())?xxKpsqDO.getSjlx():"QT");//是 string 数据类型。沟通后确认 + fpkjObject.put("sjly",StrUtil.isNotBlank(xxKpsqDO.getSjly())?xxKpsqDO.getSjly():"OA");//是 string 数据类型。沟通后确认 + fpkjObject.put("ssyt",xxKpsqDO.getSsyt());//是 string 数据类型。沟通后确认 fpkjObject.put("hsbz","0");//是 string 含税标志. 0不含税 1含税 fpkjObject.put("khmc",xxKpsqDO.getKhmc()); //是 string 客户名称 fpkjObject.put("khsh",xxKpsqDO.getKhsh()); //否 string 客户税号 @@ -1437,12 +1441,30 @@ public class BoKpsqServiceImpl implements IBoKpsqService { // fpkjObject.put("tdyslxdm","01"); //否 string 特定要素类型代码 03建筑服务04货物运输05不动产销售06不动产租赁09旅客运输 // // Map map = qywhMapper.selectOneZZSGL_GY_QYXX(); -// fpkjObject.put("xfdh",MapUtil.getStr(map,"LXDH")); //是 string 销方电话 -// fpkjObject.put("xfdz",MapUtil.getStr(map,"DZDH"));//是 string 销方地址 -// fpkjObject.put("xfmc",MapUtil.getStr(map,"QYMC"));//是 string 销方名称 -// fpkjObject.put("xfsh",MapUtil.getStr(map,"QYSH"));//是 string 销方税号 -// fpkjObject.put("xfyh",MapUtil.getStr(map,"KHHMC"));//是 string 销方开户银行 -// fpkjObject.put("xfzh",MapUtil.getStr(map,"YHZH"));//是 string 销方银行账号 + String zzjgdm = xxKpsqDO.getZzjgdm(); + if(StrUtil.isNotBlank(zzjgdm)){ + Map map = new HashMap<>(); + map.put("QYID",zzjgdm); + List maps = null; + try { + maps = iBoQyxxglService.selectZZSGL_XT_QYXX(map); + } catch (SaveException e) { + throw new RuntimeException(e); + } +// Map maps = qywhMapper.selectOneZZSGL_GY_QYXX(map); + if(CollUtil.isNotEmpty(maps)){ + Map map1 = maps.get(0); + fpkjObject.put("xfdh",MapUtil.getStr(map1,"LXDH")); //是 string 销方电话 + fpkjObject.put("xfdz",MapUtil.getStr(map1,"DZDH"));//是 string 销方地址 + fpkjObject.put("xfmc",MapUtil.getStr(map1,"QYMC"));//是 string 销方名称 + fpkjObject.put("xfsh",MapUtil.getStr(map1,"QYSH"));//是 string 销方税号 + fpkjObject.put("xfyh",MapUtil.getStr(map1,"KHHMC"));//是 string 销方开户银行 + fpkjObject.put("xfzh",MapUtil.getStr(map1,"YHZH"));//是 string 销方银行账号 + fpkjObject.put("kpzddm",MapUtil.getStr(map1,"KPDDM"));//是 string 销方银行账号 + } + + } + // fpkjObject.put("yfpdm",MapUtil.getStr(userMap,"YFPDM"));// 是 string 原发票代码 // fpkjObject.put("yfphm",MapUtil.getStr(userMap,"YFPHM"));// 是 string 原发票号码 // BigDecimal total = mxArray.stream() @@ -1460,11 +1482,11 @@ public class BoKpsqServiceImpl implements IBoKpsqService { // fpkjObject.put("zzfpdm","01");//否 string 纸票发票代码 // fpkjObject.put("zzfphm","01"); //否 string 纸质发票号码 // fpkjObject.put("hcyy","01");//否 string 红冲原因 - fpkjObject.put("kz1","1"); - fpkjObject.put("kz2","2"); - fpkjObject.put("kz3","3"); - fpkjObject.put("kz4","4"); - fpkjObject.put("kz5","5"); + fpkjObject.put("kz1",xxKpsqDO.getKz1()); + fpkjObject.put("kz2",xxKpsqDO.getKz2()); + fpkjObject.put("kz3",xxKpsqDO.getKz3()); + fpkjObject.put("kz4",xxKpsqDO.getKz4()); + fpkjObject.put("kz5",xxKpsqDO.getKz5()); fpkjObject.put("kz6","6"); fpkjObject.put("kz7","7"); fpkjObject.put("kz8","8"); diff --git a/src/main/resources/mapper/mysql/htgl/QywhMapper.xml b/src/main/resources/mapper/mysql/htgl/QywhMapper.xml index e34e362..fd21558 100644 --- a/src/main/resources/mapper/mysql/htgl/QywhMapper.xml +++ b/src/main/resources/mapper/mysql/htgl/QywhMapper.xml @@ -231,10 +231,11 @@ ) T diff --git a/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml b/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml index f2143f5..52cf0a2 100644 --- a/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml +++ b/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml @@ -3,11 +3,11 @@ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
@@ -294,6 +386,113 @@ />
+
+
+ 销方信息 +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
开票信息 diff --git a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_open.html b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_open.html index c54404d..ba38e98 100644 --- a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_open.html +++ b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_open.html @@ -316,6 +316,7 @@
+
开票信息