王 垚
2022-02-16 387e4c0a9b8d44732180de62fa67c48ad6f11f94
NOTHING
4个文件已修改
73 ■■■■■ 已修改文件
WebSRM/App_Data/MssqlReportData.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/送货单.grf 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/App_Data/MssqlReportData.cs
@@ -150,8 +150,16 @@
{
    public static void GenOneRecordset(System.Web.UI.Page DataPage, string QuerySQL)
    {
        LogService.Write(QuerySQL);
        SqlReportData.DoGenDetailData(DataPage, QuerySQL, ReportDataBase.DefaultDataType, false);
    }
    public static void GenOneRecordsetAR(System.Web.UI.Page DataPage, string QuerySQL)
    {
        LogService.Write(QuerySQL);
        return;
        SqlReportData.DoGenDetailData(DataPage, QuerySQL, ReportDataBase.DefaultDataType, false);
    }
    public static void GenMultiRecordset(System.Web.UI.Page DataPage, ArrayList QueryList)
    {
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -106,15 +106,15 @@
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
        <label class="layui-form-label">状态</label>
        <div class="layui-input-block">
            <select name="HStatus" id="HStatus" lay-filter="">
                <option value="">全部</option>
                <option value="未打印" selected="">未打印</option>
                <option value="已打印">已打印</option>
            </select>
        </div>
    </div>-->
                                    <label class="layui-form-label">状态</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus" id="HStatus" lay-filter="">
                                            <option value="">全部</option>
                                            <option value="未打印" selected="">未打印</option>
                                            <option value="已打印">已打印</option>
                                        </select>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">采购组织</label>
@@ -256,6 +256,7 @@
                    , { field: 'sorderid', title: '序号', width: 80/*, fixed: true*/ }
                    , { field: 'hmainid', title: 'hmainid', sort: true/*, fixed: true*/, hide: true }
                    , { field: 'hsubid', title: 'hsubid', sort: true/*, fixed: true*/, hide: true }
                    , { field: 'HPrintId', title: 'HPrintId', sort: true/*, fixed: true*/, hide: true }//打印ID
                    , { field: '状态', title: '状态', width: 100, sort: true/*, fixed: true*/ }
                    , { field: '单据状态', title: '单据状态', sort: true/*, fixed: true*/ }
                    , { field: '单据号', title: '单据号', width: 150, sort: true/*, fixed: true*/ }
@@ -407,12 +408,11 @@
                            layer.msg("请选择数据", { icon: 5 });
                            return;
                        }
                        //for (var i = 0; i < data.length; i++) {
                        //    if (data[i].单据状态 != "审核") {
                        //        layer.msg("选中行未审核", { icon: 5 });
                        //        return;
                        //    }
                        //}
                        var PrintIds = "";
                        for (var i = 0; i < data.length; i++) {
                            PrintIds += data[i].HPrintId + ","
                        }
                        PrintIds = PrintIds.substring(0, PrintIds.length - 1);
                        layer.open({
                            type: 2
                            , area: ['50%', '50%']
@@ -420,7 +420,7 @@
                            , shade: 0.6 //遮罩透明度
                            , maxmin: false //允许全屏最小化
                            , anim: 0 //0-6的动画形式,-1不开启
                            , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=SRM_POInStockBillList', 'yes']
                            , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds  + '&MyMsg=' + data[0].hmainid.toString() + '&Type=SRM_POInStockBillList', 'yes']
                            , resize: false
                            //, cancel: function () {
                            //    $(".layui-btn").removeClass("layui-btn-disabled");
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx
@@ -9,14 +9,15 @@
    <script runat="server"> 
        protected void Page_Load(object sender, EventArgs e)
        {
            List<ReportQueryItem> SqlList = new List<ReportQueryItem>();
             for (int i = 0; i <2; i++)
             {
                 SqlList.Add(new ReportQueryItem("select * from h_v_SRM_POInStockBillList where hmainid in(31690) order by ç‰©æ–™ä»£ç ", "tb"+i));
             }
             //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
             SqlXMLReportData.GenEntireData1(this,SqlList);
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_POInStockBillList where hmainid in(31690) order by ç‰©æ–™ä»£ç ");
          var ids = Request.Params["linterid"];
            var idsArray = ids.Split(',');
            var PrintIds = "";
            for (int i = 0; i < idsArray.Length; i++)
            {
                PrintIds += "'" + idsArray[i] + "',";
            }
            PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
            SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_POInStockBillList where HPrintId in("+ PrintIds+") order by ç‰©æ–™ä»£ç ");
        }
    </script>
</head>
WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/ËÍ»õµ¥.grf
@@ -7,7 +7,6 @@
        Charset=134
    End
    Object Printer
        Height=29.7
        Oriention=Landscape
        LeftMargin=1.5
        TopMargin=0.5
@@ -395,6 +394,21 @@
                End
            End
        End
        Items Group
            Item
                Name='Group1'
                ByFields='单据号'
                Object GroupHeader
                    Height=0
                    NewPage=Before
                    RepeatOnPage=T
                    NewPageColumn=Before
                End
                Object GroupFooter
                    Height=0
                End
            End
        End
    End
    Items ReportHeader
        Item