修改新增合同没填金额bug

src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsh/KpshController.java

@@ -56,6 +56,8 @@ public class KpshController extends BaseController{
     public String kpshIndexOpen(){
         return "zzsxt/xxgl/xmkpgl/kpsh/index_open";
     }
+    
+    
 
     /**
      *@Author rdd

src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/kpsq/KpsqController.java

@@ -120,6 +120,11 @@ public class KpsqController extends BaseController{
        return "zzsxt/xxgl/xmkpgl/kpsq/index_open";
    }
 
+    @RequestMapping(value="/kpsq/index_bw",method = RequestMethod.GET)
+    public String kpsqIndexBw(){
+        return "zzsxt/xxgl/xmkpgl/kpsq/index_bw";
+    }
+
     /**
      *@Author zhoushaozhi
      *@Description 待办任务查看

src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java

@@ -198,7 +198,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
 //                userMap.put("url","https://f7-demo.jchl.com/taxshare/api/xxApi/djts");
 //                asyncInvoicing(userMap);
             }
-
+            userMap.put("msg",results);
             result = kpsqMapper.insertZZSGL_XX_KPSQ(CommonUtil.replaceLDhOfMap(userMap));
             return result>0?results:"";
 
@@ -503,7 +503,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
         resJSON.put("kjUrl", BasicConstant.DJTS_URL);
         resJSON.put("appkey",MapUtil.getStr(maps.get(0),"APPID"));
         resJSON.put("appSecret", MapUtil.getStr(maps.get(0),"APPSECRET"));
-        resJSON.put("body", jsonObject.toJSONString(1));
+        resJSON.put("body", jsonObject);
         
         //获取token
         cn.hutool.json.JSONObject tokenJsonObReq = new cn.hutool.json.JSONObject();
@@ -1449,7 +1449,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
             resJSON.put("tsUrl", BasicConstant.DJTS_URL);
             resJSON.put("appkey", JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).getStr("appKey"));
             resJSON.put("appSecret", JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).getStr("appSecret"));
-            resJSON.put("body", JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).toString());
+            resJSON.put("body", jsonObject);
             
             
             StaticLog.info("appkey:{}",JSONUtil.parseObj(jsonObject1.getJSONArray("list").get(0)).getStr("appKey"));
@@ -1466,10 +1466,14 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
                     .body(jsonObject)
                     .execute().body();
             resJSON.put("result",reslut);
-            res.append(resJSON);
             StaticLog.info("新增异步开票申请和明细信息成功:{}",reslut);
+            Map<String,Object> kpsqMap = new HashMap<>();
+            kpsqMap.put("djbh",xxKpsqDO.getSqid());
+            kpsqMap.put("msg",resJSON.toString());
+            kpsqMapper.updataZZSGL_XX_KPSQ(kpsqMap);
+            res.append(resJSON.toString());
         }
-        
+       
         return res.toString();
     }
 

src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml

@@ -379,7 +379,7 @@
              (SQID,ZZJG_DM,      XMID,       XMZPID,      HTID,             FPLXDM,    SQKPJE,      SQKPSE,
               FBFPJE,        FBFPSE,     FBFPKCJE,  SQZT,       XMKPBZ,     XMSQHBBZ,
               QTKPSQLX,      LSSJ,       SQRYDM,     SQSJ,       HBBZ,         BHBSQID,    KPZT,      SQKPHSJE,
-              GCJSD,         FPSX,       BZ,  USERID,khmc,khsh,qylxr,qylxdh,khhzh,is_change_title, KPSX,DJLX,gsdm,yhdm,sjly,sjlx,ssyt
+              GCJSD,         FPSX,       BZ,  USERID,khmc,khsh,qylxr,qylxdh,khhzh,is_change_title, KPSX,DJLX,gsdm,yhdm,sjly,sjlx,ssyt,msg
                 <if test="YSQID!=null and YSQID!=''">
                     ,YSQID
                 </if>
@@ -431,7 +431,7 @@
                 </choose>
                                                      #{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},#{sjly},#{sjlx},#{ssyt}
+              #{GCJSD},  #{FPSX}  ,#{BZ},#{USERID},#{khmc},#{khsh},#{qylxr},#{qylxdh},#{khhzh},#{isChangeTitle}, #{KPSX}, #{DJLX}, #{gsdm}, #{yhdm},#{sjly},#{sjlx},#{ssyt},#{msg}
                 <if test="YSQID!=null and YSQID!=''">
                     ,#{YSQID}
                 </if>
@@ -515,7 +515,7 @@
     <select id="selectZZSGL_XX_KPSQ_KPMX" parameterType="map" resultType="hashMap">
         SELECT F.*, (SELECT SUM(SQKPHSJE) FROM ZZSGL_XX_KPSQ KPSQ WHERE KPSQ.HTID=F.HTID) SQZJE
         FROM (
-        SELECT T.*, G.QYMC, G.QYSH, G.YHZH, G.JGSZD, K.BZ,
+        SELECT T.*, G.QYMC, G.QYSH, G.YHZH, G.JGSZD, K.BZ,k.msg,
                 K.XMID, K.XMZPID, K.HTID, K.HBBZ, K.BHBSQID, G.LXDH, K.GCJSD, K.FPDM, K.FPHM, K.KPSX, K.YKJFPJE
          FROM  ZZSGL_XX_KPSQ_KPMX T, ZZSGL_XX_KPSQ K, ZZSGL_HT_ZBHT H, ZZSGL_HT_GLQYXX G
         WHERE T.SQID = K.SQID
@@ -1007,6 +1007,9 @@
             <if test="tzdbh!='' and tzdbh!=null">
                 tzdbh=#{tzdbh},
             </if>
+            <if test="msg!='' and msg!=null">
+                msg=#{msg},
+            </if>
             <if test="jshj!='' and jshj!=null">
                 YKJFPJE=#{jshj},
             </if>

src/main/resources/static/commons/common/sctTools.js

@@ -31,8 +31,8 @@ sctTools.successMsg = function (msg, fun, delytime) {
 };
 
 //弹出错误信息
-sctTools.errorMsg = function (msg) {
+sctTools.errorMsg = function (msg,delytime) {
-  this.layerMsgBase("5", msg);
+  this.layerMsgBase("5", msg,delytime);
 };
 
 sctTools.layTable = function (obj) {

src/main/resources/static/commons/layuiadmin/layui/lay/modules/layer.js

@@ -141,9 +141,10 @@ var layer = {
       shade: false,
       skin: skin,
       title: false,
-      closeBtn: false,
+      closeBtn: true,
       btn: false,
       resize: false,
+      shadeClose: true,
       end: end
     }, (type && !ready.config.skin) ? {
       skin: skin + ' layui-layer-hui',

src/main/resources/static/zzsxt/dbsx/index_gzl.js

@@ -55,6 +55,8 @@ var kpsq_gzl =(function(){
         onOperat : function (op,obj) {
             if(op=="1"){
                 $("#mxxx").attr("src","/web/xxgl/xmkpgl/kpsq/index_open?XMID="+selectedKpsqObj.XMID);
+            }else if(op=="10"){
+                $("#mxxx").attr("src","/web/xxgl/xmkpgl/kpsq/index_bw?XMID="+selectedKpsqObj.XMID);
             }else if(op=="2"){
                 $("#mxxx").attr("src","/activiti/selectLcgj.do?ACT_INSTANCE_ID="+selectedKpsqObj.ACT_INSTANCE_ID);
             }else{

src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsh/index.js

@@ -473,33 +473,66 @@ var kpsq_list = (function() {
             }else if(BZ == '2'){
                 title = "开启流程";
                 btnName = ['开启流程', '关闭'];
+            }else if(BZ == '10'){
+                title = "查看开票报文信息";
+                btnName = ['导出', '关闭'];
             }
-            top.window.iframeLayerData = {KPSQ_obj: data,BZ:BZ};
+            if(BZ == '10'){
-            top.sctTools.openPage({
+                top.window.iframeLayerData = {KPSQ_obj: data,BZ:BZ};
-                type: 2,
+                top.sctTools.openPage({
-                id: 'win_kpsq_openfpxx',
+                    type: 2,
-                title: title,
+                    id: 'win_kpsq_openfpxx',
-                maxmin: true,
+                    title: title,
-                shadeClose: true, //点击遮罩关闭层
+                    maxmin: true,
-                area: ['80%', '75%'],
+                    shadeClose: true, //点击遮罩关闭层
-                content: '/web/xxgl/xmkpgl/kpsq/index_open',
+                    area: ['80%', '75%'],
-                btn: btnName,
+                    content: '/web/xxgl/xmkpgl/kpsq/index_bw',
-                btnAlign: 'c',
+                    btn: btnName,
-                yes: function (index, layero) {
+                    btnAlign: 'c',
-                    parent.layer.closeAll();
+                    yes: function (index, layero) {
+                        parent.layer.closeAll();
+
+                        /*if(BZ == '1'){
+                            //top.layer.close(index);
+                            var body = top.layer.getChildFrame('body', index);
+                            body.find("#kpsqOpenExport").click();
+                        }else */if(BZ == '2'){
+                            layui.table.reload("table_sb", {page: {curr: $(".layui-laypage-em").next().html()}});
+                        }
+                    },
+                    btn2: function (index, layero) {
 
-                    /*if(BZ == '1'){
-                        //top.layer.close(index);
-                        var body = top.layer.getChildFrame('body', index);
-                        body.find("#kpsqOpenExport").click();
-                    }else */if(BZ == '2'){
-                        layui.table.reload("table_sb", {page: {curr: $(".layui-laypage-em").next().html()}});
                     }
-                },
+                });
-                btn2: function (index, layero) {
+            }else{
+                top.window.iframeLayerData = {KPSQ_obj: data,BZ:BZ};
+                top.sctTools.openPage({
+                    type: 2,
+                    id: 'win_kpsq_openfpxx',
+                    title: title,
+                    maxmin: true,
+                    shadeClose: true, //点击遮罩关闭层
+                    area: ['80%', '75%'],
+                    content: '/web/xxgl/xmkpgl/kpsq/index_open',
+                    btn: btnName,
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        parent.layer.closeAll();
 
-                }
+                        /*if(BZ == '1'){
-            });
+                            //top.layer.close(index);
+                            var body = top.layer.getChildFrame('body', index);
+                            body.find("#kpsqOpenExport").click();
+                        }else */if(BZ == '2'){
+                            layui.table.reload("table_sb", {page: {curr: $(".layui-laypage-em").next().html()}});
+                        }
+                    },
+                    btn2: function (index, layero) {
+
+                    }
+                });
+            }
+            
         },
         /**
             *@return

src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index.js

@@ -187,10 +187,18 @@ var kpsq_list = (function() {
                     success: function (jsonObj) {
                         console.log(jsonObj)
                         if(jsonObj.code==0){
-                            sctTools.successMsg(jsonObj.msg);
+                            parent.layer.msg(jsonObj.msg, {
+                                icon: 6,
+                                time: 0
+                            });
+                            baseTools.hideMash();
                             layui.table.reload("table_sb", {page: {curr: $(".layui-laypage-em").next().html()}});
                         }else if(jsonObj.code==-1){
-                            sctTools.errorMsg(jsonObj.msg);
+                            parent.layer.msg(jsonObj.msg, {
+                                icon: 2,
+                                time: 0
+                            });
+                            baseTools.hideMash();
                         }
                     },
                 });
@@ -351,6 +359,7 @@ var kpsq_list = (function() {
                         }else{
                             html = html + '<a href="#" accesskey="e" class="layui-btn layui-btn-xs" lay-event="addFsdj">生成负数开票单</a>'
                         }
+                        html = html + '<a href="#" accesskey="e" class="layui-btn layui-btn-xs" lay-event="bw">报文</a>'
                         return html;
                     }}
             ];
@@ -435,6 +444,7 @@ var kpsq_list = (function() {
                         if(data.KPZT == "0"){
                             html = html + '<a href="#" accesskey="e" class="layui-btn layui-btn-xs" lay-event="addFsdj">生成负数开票单</a>'
                         }
+                        html = html + '<a href="#" accesskey="e" class="layui-btn layui-btn-xs" lay-event="bw">报文</a>'
                         return html;
                     }}
             ];
@@ -515,6 +525,7 @@ var kpsq_list = (function() {
                             html = html + '<a href="#" accesskey="e" class="layui-btn layui-btn-xs" lay-event="edit">修改</a>'
                             html = html + '<a href="#" accesskey="d" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del" >删除</a>';
                         }
+                        html = html + '<a href="#" accesskey="d" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="bw" >报文</a>';
                         return html;
                     }}
             ];
@@ -584,6 +595,7 @@ var kpsq_list = (function() {
                         if(data.KPZT == "0"){
                             html = html + '<a href="#" accesskey="e" class="layui-btn layui-btn-xs" lay-event="addFsdj">生成负数开票单</a>'
                         }
+                        html = html + '<a href="#" accesskey="e" class="layui-btn layui-btn-xs" lay-event="bw">报文</a>'
                         return html;
                     }}
             ];
@@ -786,6 +798,8 @@ var kpsq_list = (function() {
                     var layEvent = obj.event;
                     if (layEvent === 'view') {
                         curSeg.onOpen(data,1);
+                    }else if (layEvent === 'bw') {
+                        curSeg.onOpen(data,10);
                     } else if (layEvent === 'del') {
                         var dataArr = [data];
                         curSeg.onDelete(dataArr);
@@ -1042,34 +1056,64 @@ var kpsq_list = (function() {
             }else if(BZ == '2'){
                 title = "开启流程";
                 btnName = ['关闭'];
+            }else if(BZ == '10'){
+                title = "查看开票报文信息";
+                btnName = ['关闭'];
             }
-            top.window.iframeLayerData = {KPSQ_obj: data,BZ:BZ,kpsx:kpsx};
+            if(BZ == '10'){
-            top.sctTools.openPage({
+                top.window.iframeLayerData = {KPSQ_obj: data,BZ:BZ,kpsx:kpsx};
-                type: 2,
+                top.sctTools.openPage({
-                id: 'win_kpsq_openfpxx',
+                    type: 2,
-                title: title,
+                    id: 'win_kpsq_openfpxx',
-                maxmin: true,
+                    title: title,
-                shadeClose: true, //点击遮罩关闭层
+                    maxmin: true,
-                area: ['80%', '75%'],
+                    shadeClose: true, //点击遮罩关闭层
-                content: '/web/xxgl/xmkpgl/kpsq/index_open',
+                    area: ['80%', '75%'],
-                btn: btnName,
+                    content: '/web/xxgl/xmkpgl/kpsq/index_bw',
-                btnAlign: 'c',
+                    btn: btnName,
-                yes: function (index, layero) {
+                    btnAlign: 'c',
-                    parent.layer.closeAll();
+                    yes: function (index, layero) {
+                        parent.layer.closeAll();
+
+                        // if(BZ == '2'){
+                        //     layui.table.reload("table_sb", {page: {curr: $(".layui-laypage-em").next().html()}});
+                        // }
+                    },
+                    btn2: function (index, layero) {
 
-                    /*if(BZ == '1'){
-                        //top.layer.close(index);
-                        var body = top.layer.getChildFrame('body', index);
-                        body.find("#kpsqOpenExport").click();
-                    }else */if(BZ == '2'){
-                        layui.table.reload("table_sb", {page: {curr: $(".layui-laypage-em").next().html()}});
                     }
-                },
+                });
-                btn2: function (index, layero) {
+            }else{
+                top.window.iframeLayerData = {KPSQ_obj: data,BZ:BZ,kpsx:kpsx};
+                top.sctTools.openPage({
+                    type: 2,
+                    id: 'win_kpsq_openfpxx',
+                    title: title,
+                    maxmin: true,
+                    shadeClose: true, //点击遮罩关闭层
+                    area: ['80%', '75%'],
+                    content: '/web/xxgl/xmkpgl/kpsq/index_open',
+                    btn: btnName,
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        parent.layer.closeAll();
 
-                }
+                        /*if(BZ == '1'){
-            });
+                            //top.layer.close(index);
+                            var body = top.layer.getChildFrame('body', index);
+                            body.find("#kpsqOpenExport").click();
+                        }else */if(BZ == '2'){
+                            layui.table.reload("table_sb", {page: {curr: $(".layui-laypage-em").next().html()}});
+                        }
+                    },
+                    btn2: function (index, layero) {
+
+                    }
+                });
+            }
+            
         },
+        
         /**
             *@return
             *@author Blue shaoming

src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_add.js

@@ -189,30 +189,37 @@ var kpsq_add =(function(){
                 url: url,
                 params: data,
                 callback: [function (jsonObj,xhrArgs) {
+                    var myMsg ;
                     if(jsonObj.code==1){
                         kpsq_add.calPareFuc();
-                        parent.layer.msg(jsonObj.msg, {
+                        myMsg = parent.layer.msg(jsonObj.msg, {
                             icon: 6,
-                            time: 3000
+                            time: 0
                         });
+                       
                     }else if(jsonObj.code==-1){
-                        parent.layer.msg(jsonObj.msg, {
+                        myMsg=parent.layer.msg(jsonObj.msg, {
                             icon: 2,
-                            time: 3000
+                            time: 0
                         });
+                        
                     }else if(jsonObj.code==-2){
-                        parent.layer.msg(jsonObj.msg, {
+                        myMsg=parent.layer.msg(jsonObj.msg, {
                             icon: 2,
-                            time: 3000
+                            time: 0
                         });
+                         
                         baseTools.hideMash();
                     }else if(jsonObj.code==-3){
-                        parent.layer.msg(jsonObj.msg, {
+                        myMsg =parent.layer.msg(jsonObj.msg, {
                             icon: 2,
-                            time: 3000
+                            time: 0
                         });
+                       
                         baseTools.gotoLogin();
                     }
+                    $(document).on("click",".layui-layer-shade",function(){layer.close(myMsg);
+                    });
                 }]
             });
         },

src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_open.js

@@ -88,6 +88,7 @@ var kpsq_open =(function(){
             initLayout();
             curSeg.onQueryZbht();
             curSeg.onQueryKpmx();
+            curSeg.onQueryMsg();
             curSeg.onSavePre();
 
         },
@@ -381,6 +382,17 @@ var kpsq_open =(function(){
                 }]
             });
         },
+        //查询报文
+        onQueryMsg:function () {
+            var url = "/web/xxgl/xmkpgl/kpsq/selectZZSGL_XX_KPSQ.do";
+            baseTools.xhrAjax({
+                url: url,
+                params: {
+                    SQID: selectedKpsqObj.SQID,
+                },
+                callback: [curSeg.pageFlowControl]
+            });
+        },
         //查询开票明细历史记录，并回显到界面
         onQueryKpmx:function () {
             var url = "/web/xxgl/xmkpgl/kpsq/selectZZSGL_XX_KPSQ_KPMX.do";

src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index.html

@@ -135,6 +135,7 @@
                     <script id="barDemo" type="text/html">
 
                         <a href="#" accesskey="v" class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+                        <a href="#" accesskey="bw" class="layui-btn layui-btn-xs" lay-event="bw">报文</a>
                         {{#
                             if(d.SQZT=="0" || d.SQZT=="1" || d.SQZT=="4"){
                         }}

src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_bw.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>查看开票申请</title>
+    <meta name="renderer" content="webkit"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
+    <meta http-equiv="Expires" content="0"/>
+    <meta http-equiv="Pragma" content="no-cache"/>
+    <meta http-equiv="Cache-control" content="no-cache"/>
+    <meta http-equiv="Cache" content="no-cache"/>
+    <script src="/commons/common/include_ui_pt.js?dm=505352"></script>
+    <link rel="stylesheet" href="/commons/common/layui/css/layui.css" />
+    <link rel="stylesheet" href="/commons/css/public.css" />
+    <script type="text/javascript" src="/zzsxt/xxgl/xmkpgl/kpsq/index_open.js"></script>
+    <script type="text/javascript" src="/zzsxt/public/table.js"></script>
+    <script type="text/javascript" src="/commons/js/layui_exts/excel.js"></script>
+    <script type="text/javascript" src="/zzsxt/public/kpsqUtil.js"></script>
+    <script type="text/javascript" src="/zzsxt/public/fileUpload.js"></script>
+    <style type="text/css">
+        input::-webkit-input-placeholder{
+            font-style: italic;
+        }
+        input::-moz-placeholder{   /* Mozilla Firefox 19+ */
+            font-style: italic;
+        }
+        input:-moz-placeholder{    /* Mozilla Firefox 4 to 18 */
+            font-style: italic;
+        }
+        input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
+            font-style: italic;
+        }
+    </style>
+</head>
+<body>
+    <form class="layui-form" name="form_open" id="form_open" method="get" action="" lay-filter="form_open">
+        <div class="g_box">
+            <div class="layui-inline">
+                <label class="layui-form-label">开票报文：</label>
+                <div class="layui-input-block">
+                    <textarea 
+                           id="msg"
+                           name="msg"
+                           cols="150"
+                           rows="15"
+                           value=""
+                           readonly="readonly"
+                    ></textarea>
+                </div>
+            </div>
+            
+        </div>
+    </form>
+</body>
+</html>