From 9c6f8961757a479f0332ba7789fd0e9ce6e95aa2 Mon Sep 17 00:00:00 2001 From: xuefeilong <15138742644@163.com> Date: Tue, 23 Apr 2024 17:02:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=94=80=E6=96=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java | 76 ++++++++++--- .../mapper/mysql/xxgl/KpsqMapper.xml | 4 +- .../zzsxt/xxgl/xmkpgl/kpsq/index_edit.js | 70 +++++++++++- .../zzsxt/xxgl/xmkpgl/kpsq/index_edit.html | 107 ++++++++++++++++++ 4 files changed, 238 insertions(+), 19 deletions(-) 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 68b5be5..84269de 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 @@ -21,6 +21,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.htgl.spbmwh.IBoSpbmwhService; 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; @@ -76,6 +77,8 @@ public class BoKpsqServiceImpl implements IBoKpsqService { private FbfpglMapper fbfpglMapper; @Resource private PtDeptAuthorizeMapper ptDeptAuthorizeMapper; + @Resource + private IBoSpbmwhService iBoSpbmwhService; @Override @@ -192,7 +195,6 @@ public class BoKpsqServiceImpl implements IBoKpsqService { } result = kpsqMapper.insertZZSGL_XX_KPSQ(CommonUtil.replaceLDhOfMap(userMap)); - Map map = new HashMap<>(); return result; }catch (Exception e){ @@ -346,7 +348,31 @@ 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",StrUtil.isNotBlank(MapUtil.getStr(userMap,"KPZDDM"))?MapUtil.getStr(userMap,"KPZDDM"):"20231129001");//是 开票终端代码 沟通后确认 + fpkjObject.put("kpzddm","20231129001");//是 开票终端代码 沟通后确认 + if(StrUtil.isNotBlank(MapUtil.getStr(userMap,"QYID"))){ + Map map = new HashMap<>(); + map.put("QYID",MapUtil.getStr(userMap,"QYID")); + 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,"JYDZ"));//是 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 销方银行账号 + }else{ + throw new RuntimeException("请选择销方信息"); + } + + } fpkjObject.put("kplx","0");//是 开票类型 0正数发票 1负数发票 fpkjObject.put("fpsqlsh", MapUtil.getStr(userMap,"SQID")); //是 string 开票申请流水号 不可重复 fpkjObject.put("cfclfs","1");//重复处理方式。重复处理方式 0：fpsqlsh重复时返回已开发票信息 1：返回报错。默认1 @@ -359,7 +385,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService { fpkjObject.put("bz","hnlg演示系统传入"); //否 string 备注 fpkjObject.put("hjje",new BigDecimal(MapUtil.getStr(userMap, "SQKPJE").replaceAll(",",""))); //是 number 合计金额(不含税) fpkjObject.put("hjse",new BigDecimal(MapUtil.getStr(userMap,"SQKPSE").replaceAll(",",""))); //是 number 税额 - fpkjObject.put("hzxxbbh",IdUtil.simpleUUID()); //否 string 红字信息表/红字申请单编号 +// fpkjObject.put("hzxxbbh",IdUtil.simpleUUID()); //否 string 红字信息表/红字申请单编号 // fpkjObject.put("kce","01"); //否 number 扣除额 // fpkjObject.put("khdh","01"); //否 string 客户电话 // fpkjObject.put("khdz","01"); //否 string 客户地址 @@ -376,17 +402,17 @@ public class BoKpsqServiceImpl implements IBoKpsqService { fpkjObject.put("qdbz", mxArray.size()>8?"1":"0"); //是 string 清单标志 0非清单 1清单 超过8行为清单票 fpkjObject.put("sfzsgmfyhzh","N"); //否 string 是否展示购方银行账号到备注 Y/N fpkjObject.put("sfzsxsfyhzh","N");//否 string 是否展示销方银行账号到备注 Y/N - fpkjObject.put("tdyslxdm",MapUtil.getStr(userMap,"TDYW_DM")); //否 string 特定要素类型代码 03建筑服务04货物运输05不动产销售06不动产租赁09旅客运输 +// 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",MapUtil.getStr(userMap,"QYID")); +// Map mapqq = new HashMap<>(); +// 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("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() @@ -423,14 +449,32 @@ public class BoKpsqServiceImpl implements IBoKpsqService { fpmxJsonObj.put("spdm",mxObj.getStr("SPBM"));//否 string 商品代码 fpmxJsonObj.put("spsl",mxObj.getStr("SPSL").replaceAll(",",""));//是 number 商品数量 fpmxJsonObj.put("bhsdj",mxObj.getStr("SPDJ"));//否 string 不含税单价 + if (ObjectUtil.isNotEmpty(mxObj.get("SPSL"))&&mxObj.getBigDecimal("SPSL").compareTo(BigDecimal.ZERO) != 0) { + BigDecimal bhsdj = mxObj.getBigDecimal("JE", BigDecimal.ZERO).divide(mxObj.getBigDecimal("SPSL"), 13, BigDecimal.ROUND_HALF_UP); + fpmxJsonObj.put("bhsdj",bhsdj);//否 string 不含税单价 + } fpmxJsonObj.put("bhsje",StrUtil.isNotBlank(mxObj.getStr("JE"))?new BigDecimal(mxObj.getStr("JE").replaceAll(",","")):"0.00");//否 number 不含税金额 fpmxJsonObj.put("hsdj",mxObj.getStr("SPDJ"));//否 string 含税单价 fpmxJsonObj.put("hsje",StrUtil.isNotBlank(mxObj.getStr("HSJE"))?new BigDecimal(mxObj.getStr("HSJE").replaceAll(",","")):"0.00");//否 number 含税金额 fpmxJsonObj.put("jldw",mxObj.getStr("JLDW"));//否 string 计量单位 fpmxJsonObj.put("ggxh",mxObj.getStr("GGXH"));//否 string 规格型号 fpmxJsonObj.put("lslbs",StrUtil.isNotBlank(mxObj.getStr("HSBZ"))?mxObj.getStr("HSBZ"):"0");//是 string 零税率标识 0正常税率1是免税2是不征税3普通零税率 - fpmxJsonObj.put("spbm","1010101010000000000");//是 string 税收编码 -// fpmxJsonObj.put("ssmc",mxObj.getStr("HSJE"));//否 string 税收分类名称 + try { + Map spMap = new HashMap<>(4); + spMap.put("ID", mxObj.getStr("SPID")); + List spbmList=iBoSpbmwhService.selectZZSGL_GY_SPBM(spMap); + if(CollUtil.isNotEmpty(spbmList)){ + fpmxJsonObj.put("spbm",spbmList.get(0).get("SPBM"));//是 string 税收编码 + fpmxJsonObj.put("ssmc",spbmList.get(0).get("JM"));//否 string 税收分类名称 + }else{ + fpmxJsonObj.put("spbm","1010101010000000000");//是 string 税收编码 + fpmxJsonObj.put("ssmc","谷物");//否 string 税收分类名称 + } + + } catch (SaveException e) { + throw new RuntimeException(e); + } + fpmxJsonObj.put("tax",StrUtil.isNotBlank(mxObj.getStr("SL"))?new BigDecimal(mxObj.getStr("SL").replaceAll(",","")):"0.00");//是 number 税率 例：0.13 fpmxJsonObj.put("taxje",StrUtil.isNotBlank(mxObj.getStr("SE"))?new BigDecimal(mxObj.getStr("SE").replaceAll(",","")):"0.00");//是 number 税额 fpmxJsonObj.put("yhzcbs",mxObj.getStr("0"));//是 string 优惠政策 0不使用1使用 @@ -1456,12 +1500,12 @@ public class BoKpsqServiceImpl implements IBoKpsqService { 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("xfdz",MapUtil.getStr(map1,"JYDZ"));//是 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("kpzddm",MapUtil.getStr(map1,"KPDDM"));//是 string 销方开票终端代码 } } diff --git a/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml b/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml index 52cf0a2..9b672d1 100644 --- a/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml +++ b/src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml @@ -431,7 +431,7 @@ #{SQZT}, #{XMKPBZ}, #{XMSQHBBZ}, #{QTKPSQLX}, #{LSSJ}, #{CZRY_DM}, NOW(), #{HBBZ}, #{BHBSQID}, #{KPZT}, #{SQKPHSJE}, - #{GCJSD}, #{FPSX} ,#{BZ},#{USERID},#{khmc},#{khsh},#{qylxr},#{qylxdh},#{khhzh},#{isChangeTitle}, #{KPSX}, #{DJLX}, #{gsdm}, #{yhdm} + #{GCJSD}, #{FPSX} ,#{BZ},#{USERID},#{khmc},#{khsh},#{qylxr},#{qylxdh},#{khhzh},#{isChangeTitle}, #{KPSX}, #{DJLX}, #{gsdm}, #{yhdm},#{sjly},#{sjlx},#{ssyt} ,#{YSQID} @@ -453,7 +453,7 @@ ,#{YFPHM} - ,#{sjly},#{sjlx},#{ssyt},#{kz1} ,#{kz2} ,#{kz3} ,#{kz4} ,#{kz5} + ,#{kz1} ,#{kz2} ,#{kz3} ,#{kz4} ,#{kz5} ) diff --git a/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_edit.js b/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_edit.js index 0771a8e..03985be 100644 --- a/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_edit.js +++ b/src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_edit.js @@ -13,7 +13,8 @@ var kpsq_edit =(function(){ var SQZJE_dis=0; var inithjhsje = 0; var kpsx = top.window.iframeLayerData.kpsx; - var djlx = top.window.iframeLayerData.djlx; + var qyxxList; + // var djlx = top.window.iframeLayerData.djlx; //私有方法 //初始化页面布局 var initLayout = function(){ @@ -21,6 +22,7 @@ var kpsq_edit =(function(){ $("[name=thzkje]").hide(); } selectedKpsqObj=top.window.iframeLayerData.KPSQ_obj; + console.log(selectedKpsqObj) //初始化公用可操作表格组件 var tableType=[{ "table_id":"tbSave_kpmx",//动态表ID @@ -67,6 +69,10 @@ var kpsq_edit =(function(){ form.on('select(changeTitleSelect)', function(data){ kpsq_edit.changeTitle(data); }); + //监听select下拉框 + form.on('select(changeXfxxSelect)', function(data){ + kpsq_edit.changXfxx(data); + }); //监听select下拉框 form.on('select(htidSelect)', function(data){ @@ -100,6 +106,7 @@ var kpsq_edit =(function(){ //curSeg.onComputeHj(); curSeg.onUploadFile(); curSeg.onQueryKpry(); + curSeg.onQueryXfxx(); }, //自动计算税额、价税合计 onAutoComputeSE:function (obj) { @@ -267,6 +274,7 @@ var kpsq_edit =(function(){ if(data.length==1){//如果只有一个总包合同，默认选中 ht += ''; //curSeg.onQueryZbhtMx(element.HTID); + console.log(selectedKpsqObj) }else{ if(selectedKpsqObj.HTID==element.HTID){ ht += ''; @@ -705,6 +713,66 @@ var kpsq_edit =(function(){ }); } }) + }, + // 查询销方信息 + onQueryXfxx : function(){ + var url = "/web/xtgl/qyxxgl/selectZZSGL_XT_QYXX.do"; + baseTools.xhrAjax({ + url: url, + params: { + noPage:true + }, + callback: [function (jsonObj, xhrArgs) { + var data = jsonObj.data.list; + qyxxList = jsonObj.data.list; + var ht = ''; + $.each(data,function(index,element){ + if(data.length==1){//如果只有一个，默认选中 + ht += ''; + //curSeg.onQueryZbhtMx(element.HTID); + }else{ + console.log(selectedKpsqObj) + // ht += ''; + if(selectedKpsqObj.ZZJG_DM === element.QYID){ + ht += ''; + $('#QYMC').val(element.QYMC); + $('#QYID').val(element.QYID); + $('#QYSH').val(element.QYSH); + $('#LXDH').val(element.LXDH); + $('#DZDH').val(element.DZDH); + $('#KHHMC').val(element.KHHMC); + $('#YHZH').val(element.YHZH); + $('#KPZDDM').val(element.YHZH); + }else{ + ht += ''; + } + + } + }); + $('#QYID').append(ht); + layui.use('form', function () { + var form = layui.form; + form.render(); + }); + + }] + }); + }, + changXfxx: function (data) { + console.log(data.value); + console.log(qyxxList); + $.each(qyxxList,function(index,element){ + if(data.value==element.QYID){ + $('#QYMC').val(element.QYMC); + $('#QYSH').val(element.QYSH); + $('#LXDH').val(element.LXDH); + $('#DZDH').val(element.DZDH); + $('#KHHMC').val(element.KHHMC); + $('#YHZH').val(element.YHZH); + $('#KPZDDM').val(element.YHZH); + } + }) + } }; })(); diff --git a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_edit.html b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_edit.html index a5fd81d..0b657c5 100644 --- a/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_edit.html +++ b/src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_edit.html @@ -195,6 +195,113 @@ /> +
+
+ 销方信息 +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
开票信息