姜永辉 6 месяцев назад
Родитель
Сommit
a8a72e1472

+ 1 - 1
wwwroot/Web.config

@@ -14,7 +14,7 @@
   <appSettings>
     <add key="ProductCheckServer" value="http://10.0.8.2:1234"/>
 	  <!--验厂标识 true:  false: -->
-	<add key="FactoryInspectionFlag" value="true"/> 
+	<add key="FactoryInspectionFlag" value="false"/> 
   </appSettings>
   <system.web>
     <customErrors mode="Off"/>

+ 259 - 0
wwwroot/mes/mst/holiday/holiday.ashx

@@ -0,0 +1,259 @@
+<%@ WebHandler Language="C#" Class="post" %>
+
+using System;
+using System.Web;
+using System.Web.SessionState;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Data;
+using Curtain.DataAccess;
+using DK.XuWei.WebMes;
+
+/// <summary>
+/// 
+/// xuwei create 2020-01-14
+/// </summary>
+public class post : IHttpHandler, IReadOnlySessionState
+{
+    public void ProcessRequest(HttpContext context)
+    {
+        context.Response.ContentType = "text/plain";
+
+        if (mes.LoginCheck() && context.Request["m"] is object)
+        {
+            Button b = new Button();
+            if(mes.RightCheck("系统管理"))
+            {
+                b.btnIndex = true;
+                b.btnInsert = true;
+                b.btnInsertBatch = true;
+                b.btnCopy = true;
+                b.btnUpdate = true;
+                b.btnDelete = true;
+                b.btnCancel = true;
+                b.btnSearch = true;
+                b.btnDetail = true;
+                b.btnCheckbox = true;
+                b.btnExport = false;
+                b.btnReload = true;
+            };
+            switch (context.Request["m"].ToString().ToLower())
+            {
+                case "b":
+                    {
+                        //按钮
+                        context.Response.Write(new JsonResult(b).ToJson());
+                        break;
+                    }
+                case "a":
+                    {
+                        //添加
+                        if (b.btnDetail && context.Request["id"].ToString() != "")
+                            context.Response.Write(detail());
+                        else
+                        {
+                            xRecord r = new xRecord();
+                            context.Response.Write(new JsonResult(r).ToJson());
+                        }
+                        break;
+                    }
+                case "s":
+                    {
+                        //搜索
+                        if (b.btnIndex)
+                            context.Response.Write(search(context.Request.Form));
+                        else
+                            context.Response.Write(new JsonResult(JsonStatus.rightError).ToJson());
+                        break;
+                    }
+                case "t":
+                    {
+                        //详细
+                        if (b.btnDetail)
+                            context.Response.Write(detail());
+                        else
+                            context.Response.Write(new JsonResult(JsonStatus.rightError).ToJson());
+                        break;
+                    }
+                case "i":
+                    {
+                        //插入
+                        if (b.btnInsert)
+                            context.Response.Write(insert(context.Request.Form));
+                        else
+                            context.Response.Write(new JsonResult(JsonStatus.rightError).ToJson());
+                        break;
+                    }
+               
+                case "d":
+                    {
+                        //删除
+                        if (b.btnDelete)
+                            context.Response.Write(delete());
+                        else
+                            context.Response.Write(new JsonResult(JsonStatus.rightError).ToJson());
+                        break;
+                    }
+                case "e":
+                    {
+                        //导出
+                        if (b.btnExport)
+                        {
+                            context.Response.Write(export());
+                        }
+                        else
+                        {
+                            context.Response.Write(new JsonResult(JsonStatus.rightError).ToJson());
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        break;
+                    }
+            }
+        }
+        else
+        {
+            context.Response.Write(new JsonResult(JsonStatus.loginError).ToJson());
+        }
+    }
+
+    /// <summary>
+    ///  查询
+    /// </summary>
+    /// <returns>json</returns>
+    private string search(NameValueCollection form)
+    {
+        using(IDataAccess conn=DataAccess.Create())
+        {
+            int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
+            int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10;
+            string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "POSTCODE";
+            string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
+
+            string sqlStr = @"
+                SELECT                      
+                   TO_CHAR(m.DAY_YMD_START,'yyyy-mm-dd')  DAYYMDSTART, 
+                   TO_CHAR(m.DAY_YMD_END,'yyyy-mm-dd')  DAYYMDEND
+                FROM
+                    TP_HOLIDAY_CONFIG m 
+            ";
+            List<CDAParameter> sqlPara = new List<CDAParameter>();             
+            int total = 0;
+            DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
+            return new JsonResult(dt) { total = total}.ToJson();
+        }
+    }
+
+    /// <summary>
+    /// 详细 
+    /// </summary>
+    /// <returns>json</returns>
+    private string detail()
+    {
+        using(IDataAccess conn= DataAccess.Create())
+        {
+                List<CDAParameter> sqlPara = new List<CDAParameter>();
+            DataTable dt = conn.ExecuteDatatable(@"
+                 SELECT                      
+                     TO_CHAR(m.DAY_YMD_START,'yyyy-mm-dd')  DAYYMDSTART, 
+                   TO_CHAR(m.DAY_YMD_END,'yyyy-mm-dd')  DAYYMDEND
+                FROM
+                    TP_HOLIDAY_CONFIG m 
+                ",
+                sqlPara.ToArray()
+            );
+            return new JsonResult(dt).ToJson();
+        }
+    }
+
+    /// <summary>
+    /// 插入 
+    /// </summary>
+    /// <returns>json</returns>
+    private string insert(NameValueCollection form)
+    {
+        using(IDataAccess conn= DataAccess.Create())
+        { 
+            int result = conn.ExecuteNonQuery(@"
+                INSERT INTO TP_HOLIDAY_CONFIG ( 
+                    DAY_YMD_START,
+                    DAY_YMD_END
+                ) VALUES ( @DAYYMDSTART@,@DAYYMDEND@  ) ", 
+                new CDAParameter("DAYYMDSTART",form["DAYYMDSTART"].ToString()),
+                new CDAParameter("DAYYMDEND",form["DAYYMDEND"].ToString())
+            );
+            return new JsonResult(JsonStatus.success).ToJson();
+        }
+    }
+     
+
+    /// <summary>
+    /// 删除 
+    /// </summary>
+    /// <returns>json</returns>
+    private string delete()
+    {
+        using(IDataAccess conn= DataAccess.Create())
+        {
+            if (HttpContext.Current.Request["id"] is object)
+            {
+                int result = conn.ExecuteNonQuery(@"
+                    DELETE 
+                        TP_HOLIDAY_CONFIG 
+                    WHERE 
+                        DAY_YMD_START =  @POSTID@   ",
+                    new CDAParameter("DAYYMDSTART", HttpContext.Current.Request["DAYYMDSTART"].ToString())
+                );
+                return new JsonResult(JsonStatus.success).ToJson();
+            }
+            else
+            {
+                return new JsonResult(JsonStatus.otherError).ToJson();
+            }
+        }
+    }
+
+    /// <summary>
+    /// 导出 
+    /// </summary>
+    /// <returns>json</returns>
+    private string export()
+    {
+        return search(new NameValueCollection());
+    }
+
+    private class Button
+    {
+        public bool btnIndex = false;
+        public bool btnInsert = false;
+        public bool btnInsertBatch = false;
+        public bool btnCopy = false;
+        public bool btnUpdate = false;
+        public bool btnDelete = false;
+        public bool btnCancel = false;
+        public bool btnSearch = false;
+        public bool btnDetail = false;
+        public bool btnCheckbox = false;
+        public bool btnExport = false;
+        public bool btnReload = false;
+    }
+
+    private class xRecord
+    {
+        public string sid { get; set; }
+        public string POSTCODE { get; set; }
+        public string POSTNAME { get; set; }
+        public string REMARKS { get; set; }
+    }
+
+    public bool IsReusable
+    {
+        get
+        {
+            return false;
+        }
+    }
+
+}

+ 68 - 0
wwwroot/mes/mst/holiday/holiday_add.html

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="keywords" content="dongke,mes,ibossmes">
+    <meta name="description" content="制造企业生产过程执行管理系统">
+    <meta name="author" content="xuwei">
+    <title>东科软件</title>
+    <script src="/plugins/xeasyui/xeasyui.min.js"></script>
+</head>
+<body class="easyui-layout">
+   
+    <div data-options="region:'center',plain:true,border:false">
+        <form id="ff" method="post" class="w-form">
+            <div class="w-div">
+                <div class="w-fieldbar" onclick="$('#more1').toggle()" style="cursor:pointer;"></div>
+            </div>
+            <div id="more1" style="display:block;">
+                <div class="w-div">
+                    <div class="w-fieldname">职务ID:</div>
+                    <div class="w-field"><input disabled class="easyui-textbox" id="POSTID" name="POSTID" data-options="required:false,prompt:'请填写POSTID...',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+            </div>
+            <div class="w-div">
+                <div class="w-fieldbar" onclick="$('#more2').toggle()" style="cursor:pointer;"></div>
+            </div>
+            <div id="more2" style="display:block;">
+                <div class="w-div">
+                    <div class="w-fieldname">节假日(用逗号分开):</div>
+                    <div class="w-field"><input class="easyui-textbox" type="text" multiple="true" id="HOLIDAY" name="HOLIDAY" data-options="required:false,prompt:'请填写HOLIDAY...',tipPosition:'top'" style="width:100%;height:100px;"></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">串休日期(用逗号分开):</div>
+                    <div class="w-field"> 
+                        <input class="editor-text-area" id="SHIFTSCHEDULE" name="SHIFTSCHEDULE"  multiple="true"  data-options="required:false,prompt:'请填写SHIFTSCHEDULE...',tipPosition:'top'" style="width:100%;height:100px;" />
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div data-options="region:'south',border:false" class="w-bar">
+        <a href="javascript:void(0)" id="tbSave" class="easyui-linkbutton" data-options="iconCls:'icon-save'" onclick="submitForm()">保存</a>
+        <a href="javascript:void(0)" id="tbClose" class="easyui-linkbutton" data-options="iconCls:'icon-cancel'" onclick="cancelForm()">关闭</a>
+    </div>
+
+    <script type="text/javascript">
+
+        $(function () {
+            $('#ff').formLoad({
+                url: 'holiday.ashx?m=a'
+            });
+            $('#more1').toggle();
+        });
+
+        function submitForm() {
+            $.dialog.save({
+                formid: 'ff',
+                url: 'holiday.ashx?m=i'
+            });
+        }
+
+        function cancelForm() {
+            $.dialog.close();
+        }
+
+    </script>
+</body>
+</html>

+ 96 - 0
wwwroot/mes/mst/holiday/holiday_del.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="keywords" content="dongke,mes,ibossmes">
+    <meta name="description" content="制造企业生产过程执行管理系统">
+    <meta name="author" content="xuwei">
+    <title>东科软件</title>
+    <script src="/plugins/xeasyui/xeasyui.min.js"></script>
+</head>
+<body class="easyui-layout">
+    <!--
+        <input class="easyui-combobox w-input" id="叶子" name="叶子" data-options="prompt:'请填写叶子...',tipPosition:'top',url:'/mes/list.ashx?m=truefalse',method:'get',valueField:'text',textField:'text',panelHeight:'200px',editable:'true'" style="width:100%;height:32px;">
+        <input class="easyui-filebox" id="图片" name="图片" data-options="prompt:'请选择图片...',tipPosition:'top',buttonText:'选择图片',buttonAlign:'right',accept:'image/*',onChange:$.imagePreview" style="width:100%;height:32px;" >
+    -->
+    <div data-options="region:'center',plain:true,border:false">
+        <form id="ff" method="post" class="w-form">
+            <div class="w-div">
+                <div class="w-fieldbar" onclick="$('#more1').toggle()" style="cursor:pointer;"></div>
+            </div>
+            <div id="more1" style="display:block;">
+                <div class="w-div">
+                    <div class="w-fieldname">职务ID:</div>
+                    <div class="w-field"><div id="POSTID" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">有效标识:</div>
+                    <div class="w-field"><div id="VALUEFLAG" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">账套ID:</div>
+                    <div class="w-field"><div id="ACCOUNTID" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">创建工号ID:</div>
+                    <div class="w-field"><div id="CREATEUSERID" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">创建时间:</div>
+                    <div class="w-field"><div id="CREATETIME" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">更新工号ID:</div>
+                    <div class="w-field"><div id="UPDATEUSERID" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">更新时间:</div>
+                    <div class="w-field"><div id="UPDATETIME" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+            </div>
+            <div class="w-div">
+                <div class="w-fieldbar" onclick="$('#more2').toggle()" style="cursor:pointer;"></div>
+            </div>
+            <div id="more2" style="display:block;">
+                <div class="w-div">
+                    <div class="w-fieldname">职务编码:</div>
+                    <div class="w-field"><input class="easyui-textbox" id="POSTCODE" name="POSTCODE" data-options="required:true,prompt:'请填写POSTCODE...',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">职务名称:</div>
+                    <div class="w-field"><input class="easyui-textbox" id="POSTNAME" name="POSTNAME" data-options="required:true,prompt:'请填写POSTNAME...',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">备注:</div>
+                    <div class="w-field"><input class="easyui-textbox" id="REMARKS" name="REMARKS" data-options="required:false,prompt:'请填写REMARKS...',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div data-options="region:'south',border:false" class="w-bar">
+        <a href="javascript:void(0)" id="tbSave" class="easyui-linkbutton" data-options="iconCls:'icon-save'" onclick="submitForm()">保存</a>
+        <a href="javascript:void(0)" id="tbClose" class="easyui-linkbutton" data-options="iconCls:'icon-cancel'" onclick="cancelForm()">关闭</a>
+    </div>
+    <script type="text/javascript">
+
+        $(function () {
+            $('#ff').formLoad({
+                url: 'post.ashx?m=t'
+            });
+            $('#more1').toggle();
+        });
+
+        function submitForm() {
+            $.dialog.save({
+                formid: 'ff',
+                url: 'post.ashx?m=u&id=' + request('id')
+            });
+        }
+
+        function cancelForm() {
+            $.dialog.close();
+        }
+
+    </script>
+</body>
+</html>

+ 117 - 0
wwwroot/mes/mst/holiday/holiday_index.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="keywords" content="dongke,mes,ibossmes">
+    <meta name="description" content="制造企业生产过程执行管理系统">
+    <meta name="author" content="xuwei">
+    <title>东科软件</title>
+    <script src="/plugins/xeasyui/xeasyui.min.js"></script>
+    <link href="/plugins/xeasyui/toolbar.min.css" rel="stylesheet" />
+</head>
+<body>
+    <!--工具条-->
+    <div id="tb" class="i-toolbar">
+        <a href="javascript:void(0)" style="display:none" id="btnInsert" title="添加" class="easyui-linkbutton" iconcls="icon-add" plain="true" onclick="tbAdd()">添加</a>
+        <a href="javascript:void(0)" style="display:none" id="btnDelete" title="删除" class="easyui-linkbutton" iconcls="icon-remove" plain="true" onclick="tbDelete()">删除</a>
+        <a href="javascript:void(0)" id="btnReload" title="刷新" class="easyui-linkbutton" iconcls="icon-reload" plain="true" onclick="tbReload()">刷新</a>
+        <div id="tbSearchDiv" style="display:none;padding:10px;"> </div>
+    </div>
+    <!--表格-->
+    <table id="dg" data-options="toolbar: '#tb', showFooter:false">
+        <thead>
+            <tr>
+                <th data-options="field:'SID',title:'SID',width:220,align:'left',checkbox:true,hidden:true">SID</th>
+                <th data-options="field:'DAYYMDSTART',title:'节假日',align:'left',sortable:true"></th>
+            </tr>
+        </thead>
+    </table>
+    <script type="text/javascript">
+
+        //加载完成
+        $(function () {
+            //加载按钮
+            $('#tb').buttonLoad({
+                url: 'holiday.ashx?m=b'
+            });
+            //加载表格数据
+            tbSearchSubmit();
+        });
+
+        //添加按钮
+        function tbAdd() {
+            $('#dg').datagridDialog({
+                title: '添加数据',
+                width: 640,
+                height: 480,
+                url: 'holiday_add.html'
+            });
+        }
+
+        //修改按钮
+        function tbEdit() {
+            $('#dg').datagridDialog({
+                title: '修改数据',
+                width: 640,
+                height: 480,
+                url: 'holiday_edit.html',
+                requireSelect: true
+            });
+        }
+
+        //删除按钮
+        function tbDelete() {
+            $('#dg').datagridPost({
+                title: '删除操作',
+                url: 'holiday.ashx?m=d',
+                onValidate: function (r) { return true; }
+            });
+        }
+
+        //详细按钮
+        function tbDetail() {
+            $('#dg').datagridDialog({
+                title: '详细数据',
+                width: 640,
+                height: 480,
+                url: 'holiday_detail.html',
+                requireSelect: true
+            });
+        }
+
+        //复选按钮
+        function tbCheck() {
+            $('#dg').datagridCheckbox({
+                buttonid: 'btnCheckbox',
+                valuefield: 'SID'
+            });
+        }
+
+        //搜索按钮
+        function tbSearch() {
+            $('#tbSearchDiv').toggle();
+            $('#dg').datagrid('resize');
+        }
+
+        //搜索提交
+        function tbSearchSubmit() {
+            $('#dg').datagridLoad({
+                title: '节假日配置表',
+                idField: 'SID',
+                queryParams: $('#ff').serializeJson(),
+                url: 'holiday.ashx?m=s'
+            });
+        }
+
+        //刷新
+        function tbReload() {
+            tbSearchSubmit();
+        }
+         
+
+        function formatterTrueFalse(value, row, index) { return value == 'True' ? '是' : '否'; }
+        function stylerTrueFalse(value, row, index) { return value == 'True' ? 'color:black' : 'color:red'; }
+
+    </script>
+</body>
+</html>

+ 2 - 2
wwwroot/mes/mst/user/getFunction.ashx

@@ -21,8 +21,8 @@ public class getFunction : IHttpHandler, IReadOnlySessionState
         {
             DataTable dt = conn.ExecuteDatatable(@"
                 SELECT 
-                    FUNCTIONLEVEL AS id,
-                    FUNCTIONLEVEL AS code,
+                    FUNCTIONCODE AS id,
+                    FUNCTIONCODE AS code,
                     FUNCTIONNAME AS text,
                     URL AS url
                 FROM 

+ 3 - 2
wwwroot/mes/rpt/rpt008/rpt_index.html

@@ -93,9 +93,10 @@
                     title: fields + '详细',
                     width: width/2,
                     height: height,
-                    url: 'rpt_index_detail.html?fields=' + fields + "&index=" + index + "&gs=" + row["产品编码"]
+					url: 'rpt_index_detail.html?fields=' + fields + "&index=" + index + "&gs=" + row["产品编码"]
+                        + "&db=" + $("#datebeginMaster").datetimebox("getValue") + "&de=" + $("#dateendMaster").datetimebox("getValue")
                 });
-            }
+			} 
         }		 
 
 		//搜索提交

+ 2 - 1
wwwroot/mes/rpt/rpt008/rpt_index_detail.html

@@ -80,7 +80,8 @@
                 title: '',
                 idField: 'SID',
                 queryParams: queryParams,
-                url: 'rptnew_detail.ashx?fields=' + params["fields"] + "&index=" + params["index"] + "&gs=" + params["gs"],
+                url: 'rptnew_detail.ashx?fields=' + params["fields"] + "&index=" + params["index"] + "&gs=" + params["gs"]
+                    + "&db=" + params["db"] + "&de=" + params["de"],
                 fixWidth: 140,
                 mergeWidth: 80,
                 pagination: false,

+ 3 - 3
wwwroot/mes/rpt/rpt008/rptnew_detail.ashx

@@ -13,7 +13,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain"; 
-        string fields = context.Request["fields"].ToString();
+        string fields = context.Request["fields"].ToString(); 
         int index = Convert.ToInt32(context.Request["index"] + "");
         string gs = context.Request["gs"].ToString();
 
@@ -517,8 +517,8 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
             sqlDetail = sqlDetail.Replace("{BUILDINGNO}", buding);
             //获取查询条件
             List<CDAParameter> sqlPara = new List<CDAParameter>();
-            sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
-            sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1), DataType.DateTime));
+            sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["db"].ToString()), DataType.DateTime));
+            sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["de"].ToString()).AddSeconds(1), DataType.DateTime));
             sqlPara.Add(new CDAParameter("GLAZETYPEID", context.Request["glazetypeidMaster"]));
             sqlPara.Add(new CDAParameter("LOGOID", context.Request["logoidMaster"]));
             sqlPara.Add(new CDAParameter("GOODSMODEL", context.Request["goodsmodelMaster"]));