Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-2.0/HEGII.ss.mes.web

wwwroot/mes/mst/CommonModelGood/commonmodel_add.html

@@ -38,11 +38,11 @@
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">商标：</div>  
-                    <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1', method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px',editable:false" style="width:100%;height:32px;">
+                    <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:true,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1', method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px',editable:false,onChange:PLATELIMITNUM" style="width:100%;height:32px;">
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">坑距：</div>
-                    <div class="w-field"><input class="easyui-textbox" readonly="readonly" id="OUTLETDISTANCE" name="OUTLETDISTANCE" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                    <div class="w-field"><input class="easyui-textbox" id="OUTLETDISTANCE" name="OUTLETDISTANCE" data-options="required:false,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">物料号：</div>
@@ -58,7 +58,7 @@
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">常用标识：</div>
-                    <div class="w-field"><input class="easyui-textbox" value="1" id="COMMONFLAG" name="COMMONFLAG" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                    <div class="w-field"><input class="easyui-combobox" value="1" id="COMMONFLAG" name="COMMONFLAG" data-options="required:true,prompt:'',tipPosition:'top',data:[{'text': '0', 'value': '0'}, {'text': '1', 'value': '1'}]" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">生效时间：</div>
@@ -90,24 +90,33 @@
         });
 
         function submitForm() {
-            $.dialog.save({
-                formid: 'ff',
-                url: 'goodscommonmodel.ashx?m=i'
-            });
+            var EFFECTIVETIME = $('#EFFECTIVETIME').datebox('getValue');
+            var ENDTIME = $('#ENDTIME').datebox('getValue');
+            if (ENDTIME < EFFECTIVETIME) {
+                alert("截止时间不可以小于生效时间");
+                return;
+            }
+            else {
+                $.dialog.save({
+                    formid: 'ff',
+                    url: 'goodscommonmodel.ashx?m=i'
+                });
+            }
         }
 
         function GETOUTLETDISTANCE() {
-            var goods = $('#GOODS').combobox('getValue').split("#");
+            $('#LOGONAME').textbox('setValue', '');
+            var goods = $('#GOODS').combobox('getText').split("#");
             var logoid = $('#LOGONAME').combobox('getText').split("#");
             $('#OUTLETDISTANCE').textbox('setValue', '');
             $('#MATERIALCODE').textbox('setValue', '');
             $('#PLATELIMITNUM1').textbox('setValue', '');
             $('#PLATELIMITNUM2').textbox('setValue', '');
-            $('#LOGONAME').textbox('setValue', '');
+            //$('#LOGONAME').textbox('setValue', '');
             //获取产品对应商标
 
             $('#LOGONAME').combobox('reload', '../../rpt/rpt.ashx?m=getLogoByGoods&select=1&goodsid='+ goods[0].toString());
-            $('#LOGONAME').combobox('setValue', 0);
+            //$('#LOGONAME').combobox('setValue', 0);
 
                 //$.get("goodscommonmodel.ashx?m=lo&&goodsid=" + goods[0].toString(), function (data) {
                 //    var json = JSON.parse(data);
@@ -129,11 +138,8 @@
                     }
                 });
             }
-            else if (goods[0].toString() == "")
-            {
-                
-            }
-            else {
+
+            if (logoid[0].toString() != "" && goods[0].toString() != "") {
                 //获取物料、新旧装板数量
                 $.get("goodscommonmodel.ashx?m=logo&&logoid=" + logoid[0].toString() + "&&goodsid=" + goods[0].toString(), function (data) {
                     var json = JSON.parse(data);
@@ -151,7 +157,36 @@
                     }
                 });
             }
+ 
+
+        }
+
+        function PLATELIMITNUM()
+        {
+            var goods = $('#GOODS').combobox('getText').split("#");
+            var logoid = $('#LOGONAME').combobox('getText').split("#");
+            $('#OUTLETDISTANCE').textbox('setValue', '');
+            $('#MATERIALCODE').textbox('setValue', '');
+            $('#PLATELIMITNUM1').textbox('setValue', '');
+            $('#PLATELIMITNUM2').textbox('setValue', '');
+            if (logoid[0].toString() != "" && goods[0].toString() != "") {
+                //获取物料、新旧装板数量
+                $.get("goodscommonmodel.ashx?m=logo&&logoid=" + logoid[0].toString() + "&&goodsid=" + goods[0].toString(), function (data) {
+                    var json = JSON.parse(data);
+                    if (json["success"] == true) {
+                        $('#MATERIALCODE').textbox('setValue', json["rows"][0]['MATERIALCODE'].toString());
+                        $('#PLATELIMITNUM1').textbox('setValue', json["rows"][0]['PLATELIMITNUM'].toString());
+                        $('#PLATELIMITNUM2').textbox('setValue', json["rows"][0]['PLATELIMITNUMNEW'].toString());
+                    }
+                });
 
+                $.get("goodscommonmodel.ashx?m=o&&goodsid=" + goods[0].toString(), function (data) {
+                    var json = JSON.parse(data);
+                    if (json["success"] == true) {
+                        $('#OUTLETDISTANCE').textbox('setValue', json["rows"][0]['OUTLETDISTANCE'].toString());
+                    }
+                });
+            }
         }
 
         function cancelForm() {

wwwroot/mes/mst/CommonModelGood/commonmodel_edit.html

@@ -38,11 +38,11 @@
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">商标：</div>
-                    <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:true,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogo&select=1',method:'get',valueField:'LOGOID',textField:'LOGONAME',panelHeight:'300px',editable:true,onChange:GETOUTLETDISTANCE" style="width:100%;height:32px;">
+                    <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:true,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px',editable:false,onChange:PLATELIMITNUM" style="width:100%;height:32px;">
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">坑距：</div>
-                    <div class="w-field"><input class="easyui-textbox" readonly="readonly" id="OUTLETDISTANCE" name="OUTLETDISTANCE" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                    <div class="w-field"><input class="easyui-textbox" id="OUTLETDISTANCE" name="OUTLETDISTANCE" data-options="required:false,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">物料号：</div>
@@ -58,18 +58,18 @@
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">常用标识：</div>
-                    <div class="w-field"><input class="easyui-textbox" id="COMMONFLAG" name="COMMONFLAG" data-options="required:true,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                    <div class="w-field"><input class="easyui-combobox" id="COMMONFLAG" name="COMMONFLAG" data-options="required:true,prompt:'',tipPosition:'top',data:[{'text': '0', 'value': '0'}, {'text': '1', 'value': '1'}]" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">生效时间：</div>
                     <div class="w-field">
-                        <input class="easyui-datebox" id="EFFECTIVETIME" name="EFFECTIVETIME" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 100%; height: 32px;">
+                        <input class="easyui-datebox" id="EFFECTIVETIME" name="EFFECTIVETIME" data-options="prompt:'',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-datebox" id="ENDTIME" name="ENDTIME" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 100%; height: 32px;">
+                        <input class="easyui-datebox" id="ENDTIME" name="ENDTIME" data-options="prompt:'',tipPosition:'top'" style="width: 100%; height: 32px;">
                     </div>
                 </div>
             </div>
@@ -85,23 +85,42 @@
             $('#ff').formLoad({
                 url: 'goodscommonmodel.ashx?m=t'
             });
-            //$('#more1').toggle();
         });
 
         function submitForm() {
+            var logoid = $('#LOGONAME').combobox('getText').split("#");
             $.dialog.save({
                 formid: 'ff',
-                url: 'goodscommonmodel.ashx?m=u&id=' + request('id')
+                url: 'goodscommonmodel.ashx?m=u&id=' + request('id') + "&logoid=" + logoid[0].toString()
             });
         }
 
         function GETOUTLETDISTANCE() {
-            var goods = $('#GOODS').combobox('getValue').split("#");
+            $('#LOGONAME').textbox('setValue', '');
+            var goods = $('#GOODS').combobox('getText').split("#");
             var logoid = $('#LOGONAME').combobox('getText').split("#");
             $('#OUTLETDISTANCE').textbox('setValue', '');
             $('#MATERIALCODE').textbox('setValue', '');
             $('#PLATELIMITNUM1').textbox('setValue', '');
             $('#PLATELIMITNUM2').textbox('setValue', '');
+            //$('#LOGONAME').textbox('setValue', '');
+            //获取产品对应商标
+
+            $('#LOGONAME').combobox('reload', '../../rpt/rpt.ashx?m=getLogoByGoods&select=1&goodsid=' + goods[0].toString());
+            //$('#LOGONAME').combobox('setValue', 0);
+
+            //$.get("goodscommonmodel.ashx?m=lo&&goodsid=" + goods[0].toString(), function (data) {
+            //    var json = JSON.parse(data);
+            //    if (json["success"] == true) {
+            //        for (var i = 0; i < json.rows.length; i++) {
+            //            $('#LOGONAME').combobox('setValue', json["rows"][i]['LOGOID'].toString());
+            //            $('#LOGONAME').combobox('setText', json["rows"][i]['LOGONAME'].toString());
+            //        }
+            //    }
+            //});
+
+
+            //获取坑距
             if (logoid[0].toString() == "") {
                 $.get("goodscommonmodel.ashx?m=o&&goodsid=" + goods[0].toString(), function (data) {
                     var json = JSON.parse(data);
@@ -110,10 +129,9 @@
                     }
                 });
             }
-            else if (goods[0].toString() == "") {
 
-            }
-            else {
+            if (logoid[0].toString() != "" && goods[0].toString() != "") {
+                //获取物料、新旧装板数量
                 $.get("goodscommonmodel.ashx?m=logo&&logoid=" + logoid[0].toString() + "&&goodsid=" + goods[0].toString(), function (data) {
                     var json = JSON.parse(data);
                     if (json["success"] == true) {
@@ -131,6 +149,34 @@
                 });
             }
 
+
+        }
+
+        function PLATELIMITNUM() {
+            var goods = $('#GOODS').combobox('getText').split("#");
+            var logoid = $('#LOGONAME').combobox('getText').split("#");
+            $('#OUTLETDISTANCE').textbox('setValue', '');
+            $('#MATERIALCODE').textbox('setValue', '');
+            $('#PLATELIMITNUM1').textbox('setValue', '');
+            $('#PLATELIMITNUM2').textbox('setValue', '');
+            if (logoid[0].toString() != "" && goods[0].toString() != "") {
+                //获取物料、新旧装板数量
+                $.get("goodscommonmodel.ashx?m=logo&&logoid=" + logoid[0].toString() + "&&goodsid=" + goods[0].toString(), function (data) {
+                    var json = JSON.parse(data);
+                    if (json["success"] == true) {
+                        $('#MATERIALCODE').textbox('setValue', json["rows"][0]['MATERIALCODE'].toString());
+                        $('#PLATELIMITNUM1').textbox('setValue', json["rows"][0]['PLATELIMITNUM'].toString());
+                        $('#PLATELIMITNUM2').textbox('setValue', json["rows"][0]['PLATELIMITNUMNEW'].toString());
+                    }
+                });
+
+                $.get("goodscommonmodel.ashx?m=o&&goodsid=" + goods[0].toString(), function (data) {
+                    var json = JSON.parse(data);
+                    if (json["success"] == true) {
+                        $('#OUTLETDISTANCE').textbox('setValue', json["rows"][0]['OUTLETDISTANCE'].toString());
+                    }
+                });
+            }
         }
 
         function cancelForm() {

wwwroot/mes/mst/CommonModelGood/commonmodel_index.html

@@ -83,7 +83,7 @@
             $('#dg').datagridDialog({
                 title: '修改数据',
                 width: 640,
-                height: 480,
+                height: 580,
                 url: 'commonmodel_edit.html',
                 requireSelect: true
             });

wwwroot/mes/mst/CommonModelGood/getOrganization.ashx

@@ -1,53 +0,0 @@
-<%@ WebHandler Language="C#" Class="getOrganization" %>
-
-using System;
-using System.Web;
-using System.Web.SessionState;
-using System.Data;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Curtain.DataAccess;
-using DK.XuWei.WebMes;
-
-public class getOrganization : IHttpHandler, IReadOnlySessionState
-{
-    public void ProcessRequest(HttpContext context)
-    {
-        context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
-        {
-            DataTable dt = conn.ExecuteDatatable(@"
-                SELECT 
-                    ORGANIZATIONID AS id,
-                    ORGANIZATIONCODE AS code,
-                    ORGANIZATIONNAME AS text,
-                    '' AS url
-                FROM 
-                    TP_MST_ORGANIZATION
-                WHERE 
-                    VALUEFLAG = '1'
-                ORDER BY 
-                    ORGANIZATIONCODE
-            ");
-            string rootId = dt.Rows[0]["id"].ToString();
-            string rootCode = dt.Rows[0]["code"].ToString();
-            string rootText = dt.Rows[0]["text"].ToString();
-            string children = Easyui.TableToEasyUITree(dt, rootCode, 3);
-            string jsonStr = "[{\"id\":\"" + rootId + "\",\"text\":\"" + rootText + "\"" + children + "}]";
-            context.Response.Write(jsonStr);
-        }
-
-    }
-
-    public bool IsReusable
-    {
-        get
-        {
-            return false;
-        }
-    }
-
-}

wwwroot/mes/mst/CommonModelGood/getUser.ashx

@@ -1,47 +0,0 @@
-<%@ WebHandler Language="C#" Class="getUser" %>
-
-using System;
-using System.Web;
-using System.Web.SessionState;
-using System.Data;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Curtain.DataAccess;
-using DK.XuWei.WebMes;
-
-public class getUser : IHttpHandler, IReadOnlySessionState
-{
-    public void ProcessRequest(HttpContext context)
-    {
-        context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
-        {
-            DataTable dt = conn.ExecuteDatatable(@"
-                SELECT 
-                    USERID AS ID,
-                    USERCODE AS CODE,
-                    USERNAME AS NAME
-                FROM 
-                    TP_MST_USER
-                WHERE 
-                    VALUEFLAG = '1'
-                ORDER BY 
-                    USERCODE
-            ");
-            context.Response.Write(dt.ToJson());
-        }
-
-    }
-
-    public bool IsReusable
-    {
-        get
-        {
-            return false;
-        }
-    }
-
-}

wwwroot/mes/mst/CommonModelGood/getWorkstation.ashx

@@ -1,46 +0,0 @@
-<%@ WebHandler Language="C#" Class="getWorkstation" %>
-
-using System;
-using System.Web;
-using System.Web.SessionState;
-using System.Data;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Curtain.DataAccess;
-using DK.XuWei.WebMes;
-
-public class getWorkstation : IHttpHandler, IReadOnlySessionState
-{
-    public void ProcessRequest(HttpContext context)
-    {
-        context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
-        {
-            DataTable dt = conn.ExecuteDatatable(@"
-                SELECT 
-                    WORKSTATIONID AS ID,
-                    WORKSTATIONNAME AS NAME
-                FROM 
-                    TP_MST_WORKSTATION
-                WHERE 
-                    VALUEFLAG = '1'
-                ORDER BY 
-                    DISPLAYNO
-            ");
-            context.Response.Write(dt.ToJson());
-        }
-
-    }
-
-    public bool IsReusable
-    {
-        get
-        {
-            return false;
-        }
-    }
-
-}

wwwroot/mes/mst/CommonModelGood/goodscommonmodel.ashx

@@ -88,7 +88,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
                     {
                         //修改
                         if (b.btnUpdate)
-                            context.Response.Write(update(context.Request.Form));
+                            context.Response.Write(update(context.Request.Form,context.Request["logoid"].ToString()));
                         else
                             context.Response.Write(new JsonResult(JsonStatus.rightError).ToJson());
                         break;
@@ -166,12 +166,12 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
                 TMCM.PLATELIMITNUM1,
                 TMCM.PLATELIMITNUM2,
                 TMCM.COMMONFLAG,
-                TMCM.EFFECTIVETIME,
-                TMCM.ENDTIME
+                CASE WHEN TO_CHAR(TMCM.EFFECTIVETIME,'yyyy') = '2000' THEN NULL ELSE TMCM.EFFECTIVETIME END EFFECTIVETIME,
+				CASE WHEN TO_CHAR(TMCM.ENDTIME,'yyyy') = '2099' THEN NULL ELSE TMCM.ENDTIME END ENDTIME
                 FROM TP_MST_COMMONMODEL TMCM
                 LEFT JOIN TP_MST_LOGO TML ON TMCM.LOGOID = TML.LOGOID
              WHERE
-	                TMCM.VALUEFLAG = '1' 
+	                TMCM.VALUEFLAG = '1'
 	                AND TMCM.ACCOUNTID = @ACCOUNTID@
             ";
             List<CDAParameter> sqlPara = new List<CDAParameter>();
@@ -231,9 +231,9 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
         using (IDataAccess conn = DataAccess.Create())
         {
             DataTable dt = conn.ExecuteDatatable(@"
-                SELECT OUTLETDISTANCE FROM TP_MST_GOODS WHERE GOODSID = @GOODSID@
+                SELECT OUTLETDISTANCE FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@
                 ",
-            new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"])
+            new CDAParameter("GOODSCODE", HttpContext.Current.Request["goodsid"])
         );
             string jsonStr = new JsonResult(dt).ToJson();
             return jsonStr;
@@ -262,7 +262,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
 	                FROM
 		                TP_MST_GOODSLOGOSAP SAP 
 	                WHERE
-		                GOODSID = @GOODSID@
+		                GOODSID = (SELECT GOODSID FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@)
 		                AND LOGOID = (SELECT LOGOID FROM TP_MST_LOGO WHERE LOGONAME = @LOGONAME@)
                     UNION
 	                SELECT
@@ -276,7 +276,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
 	                FROM
 		                TP_MST_GOODS G 
 	                WHERE
-		                GOODSID = @GOODSID@
+		                GOODSID = (SELECT GOODSID FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@)
 		                AND LOGOID = (SELECT LOGOID FROM TP_MST_LOGO WHERE LOGONAME = @LOGONAME@)
 	                ORDER BY
 		                GOODSCODE,
@@ -287,7 +287,7 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
                 ORDER BY
 	                id DESC
                 ",
-            new CDAParameter("GOODSID", HttpContext.Current.Request["goodsid"]),
+            new CDAParameter("GOODSCODE", HttpContext.Current.Request["goodsid"]),
             new CDAParameter("LOGONAME", HttpContext.Current.Request["logoid"])
         );
             string jsonStr = new JsonResult(dt).ToJson();
@@ -334,8 +334,8 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
     /// <returns>json</returns>
     private string insert(NameValueCollection form)
     {
-         var EFFECTIVETIME = "";
-         var ENDTIME = "";
+        var EFFECTIVETIME = "";
+        var ENDTIME = "";
         using (IDataAccess conn = DataAccess.Create())
         {
             //判断是否存在
@@ -361,10 +361,18 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
                     {
                         EFFECTIVETIME = "2000-01-01";
                     }
+                    else
+                    {
+                        EFFECTIVETIME = form["EFFECTIVETIME"];
+                    }
                     if (form["ENDTIME"] == "")
                     {
                         ENDTIME = "2099-12-31";
                     }
+                    else
+                    {
+                        ENDTIME = form["ENDTIME"];
+                    }
                     result = conn.ExecuteNonQuery(@"
                INSERT INTO TP_MST_COMMONMODEL 
                     (GOODSCODE,GOODSID,LOGOID,OUTLETDISTANCE,MATERIALCODE,PLATELIMITNUM1,PLATELIMITNUM2,COMMONFLAG,EFFECTIVETIME,ENDTIME,CREATEUSERID,UPDATEUSERID,ACCOUNTID)
@@ -417,20 +425,39 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
     /// 更新 TP_MST_WORKSTATIONUSER
     /// </summary>
     /// <returns>json</returns>
-    private string update(NameValueCollection form)
+    private string update(NameValueCollection form,string logoid)
     {
+             var EFFECTIVETIME = "";
+        var ENDTIME = "";
         using (IDataAccess conn = DataAccess.Create())
         {
+                 if (form["EFFECTIVETIME"] == "")
+                    {
+                        EFFECTIVETIME = "2000-01-01";
+                    }
+                    else
+                    {
+                        EFFECTIVETIME = form["EFFECTIVETIME"];
+                    }
+                    if (form["ENDTIME"] == "")
+                    {
+                        ENDTIME = "2099-12-31";
+                    }
+                    else
+                    {
+                        ENDTIME = form["ENDTIME"];
+                    }
             int result = conn.ExecuteNonQuery(@"
                 UPDATE TP_MST_COMMONMODEL 
                 SET
-                    GOODSCODE = (SELECT GOODSCODE FROM TP_MST_GOODS WHERE GOODSID = @GOODSCODE@),
-                    GOODSID = @GOODSCODE@,
-                    LOGOID = @LOGOID@,
+                    GOODSCODE = @GOODSCODE@,
+                    GOODSID = (SELECT GOODSID FROM TP_MST_GOODS WHERE GOODSCODE = @GOODSCODE@),
+                    LOGOID = (SELECT LOGOID FROM TP_MST_LOGO WHERE LOGONAME = @LOGOID@),
                     OUTLETDISTANCE = @OUTLETDISTANCE@,
                     MATERIALCODE = @MATERIALCODE@,
                     PLATELIMITNUM1 = @PLATELIMITNUM1@,
                     PLATELIMITNUM2 = @PLATELIMITNUM2@,
+                    COMMONFLAG = @COMMONFLAG@,
                     EFFECTIVETIME = @EFFECTIVETIME@,
                     ENDTIME = @ENDTIME@,
                     UPDATEUSERID = @UPDATEUSERID@,
@@ -439,14 +466,14 @@ public class workstationuser : IHttpHandler, IRequiresSessionState
                     COMMONGOODSID = @COMMONGOODSID@
                 ",
                 new CDAParameter("GOODSCODE", form["GOODS"]),
-                new CDAParameter("LOGOID", form["LOGONAME"]),
+                new CDAParameter("LOGOID", logoid),
                 new CDAParameter("OUTLETDISTANCE", form["OUTLETDISTANCE"]),
                 new CDAParameter("MATERIALCODE", form["MATERIALCODE"]),
-                new CDAParameter("ORGANIZATIONID", form["ORGANIZATIONID"]),
                 new CDAParameter("PLATELIMITNUM1", form["PLATELIMITNUM1"]),
                 new CDAParameter("PLATELIMITNUM2", form["PLATELIMITNUM2"]),
-                new CDAParameter("EFFECTIVETIME", form["EFFECTIVETIME"], DataType.DateTime),
-                new CDAParameter("ENDTIME", form["ENDTIME"], DataType.DateTime),
+                new CDAParameter("COMMONFLAG", form["COMMONFLAG"]),
+                new CDAParameter("EFFECTIVETIME", EFFECTIVETIME, DataType.DateTime),
+                new CDAParameter("ENDTIME", ENDTIME, DataType.DateTime),
                 new CDAParameter("UPDATEUSERID", HttpContext.Current.Session["userId"]),
                 new CDAParameter("COMMONGOODSID", HttpContext.Current.Request["id"])
             );

wwwroot/mes/rpt/rpt.ashx

@@ -1091,9 +1091,9 @@ order by tt.stype, tt.displayno, tt.ssid
                         using (IDataAccess conn = DataAccess.Create())
                         {
                             DataTable result = new DataTable();
-                            if (context.Request["goodsid"] is object)
-                            {
-                                result = conn.ExecuteDatatable(@"
+                                if (context.Request["goodsid"] is object)
+                                {
+                                    result = conn.ExecuteDatatable(@"
                                 SELECT
                                 DISTINCT
                                 T.LOGOID ID,
@@ -1106,7 +1106,7 @@ order by tt.stype, tt.displayno, tt.ssid
 	                                TP_MST_GOODS G
 	                                LEFT JOIN TP_MST_LOGO TML ON G.LOGOID = TML.LOGOID 
                                 WHERE
-	                                G.GOODSID = @GOODSID@ UNION ALL
+	                                G.GOODSCODE = @GOODSID@ UNION ALL
                                 SELECT
 	                                GLS.LOGOID,
 	                                L.LOGONAME 
@@ -1114,15 +1114,15 @@ order by tt.stype, tt.displayno, tt.ssid
 	                                TP_MST_GOODSLOGOSAP GLS
 	                                INNER JOIN TP_MST_LOGO L ON L.LOGOID = GLS.LOGOID 
                                 WHERE
-	                                GLS.GOODSID = @GOODSID@ 
+	                                GLS.GOODSCODE = @GOODSID@ 
 	                                ) T
                                 ",
-                                    new CDAParameter("GOODSID", context.Request["goodsid"])
-                                );
-                            }
-                            else
-                            {
-                                result = conn.ExecuteDatatable(@"
+                                        new CDAParameter("GOODSID", context.Request["goodsid"])
+                                    );
+                                }
+                                else
+                                {
+                                    result = conn.ExecuteDatatable(@"
                                     SELECT
                                     DISTINCT
                                     T.LOGOID ID,
@@ -1143,9 +1143,8 @@ order by tt.stype, tt.displayno, tt.ssid
 	                                    INNER JOIN TP_MST_LOGO L ON L.LOGOID = GLS.LOGOID  
 	                                    ) T
                                     "
-                                    );
-                            } 
-
+                                        );
+                                }
                             context.Response.Write(result.ToJson());
                         }
                     }

wwwroot/mes/rpt2/rpt8009/rpt.ashx

@@ -415,7 +415,6 @@ SELECT
 								GDD.MATERIALCODE SAPCODE,
 								PD.USERCODE,
 							CASE
-									
 									WHEN HGDI.WORKSHOP = 2 
 									AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 THEN
 										1 
@@ -2121,7 +2120,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 20
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2256,7 +2255,7 @@ SELECT
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (20,30,40)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.SCRAPNUM = a.SCRAPNUM ) s
@@ -2312,7 +2311,7 @@ SELECT
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.REPAIRNUM NOT IN (0)
 										 AND THDB.DATACODE IN ('20','30','40')
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,REPAIRNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2381,7 +2380,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 50
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2490,7 +2489,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (50)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2579,7 +2578,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON TT.groutingdailydetailid = GDD.groutingdailydetailid
 INNER JOIN tp_mst_goods g ON g.goodsid = GDD.goodsid
 INNER JOIN tp_mst_goodstype gt ON g.goodstypeid = gt.goodstypeid WHERE TT.nodetype = @nodetype@ )TT1
- WHERE  TT1.车间 = @WORKSHOP@
+ WHERE  TT1.车间 = @WORKSHOP@ and TT1.BARCODE is not null
                 ";
                 if (context.Request["shorname"].ToString() == "注浆数")
                 {
@@ -2668,7 +2667,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 20
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2760,7 +2759,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 50
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2969,7 +2968,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.REPAIRNUM NOT IN (0)
 										 AND THDB.DATACODE IN ('20','30','40')
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,REPAIRNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -3137,7 +3136,7 @@ SELECT
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (20,30,40)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.SCRAPNUM = a.SCRAPNUM ) s
@@ -3278,7 +3277,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (50)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s

wwwroot/mes/rpt2/rpt8009/rpt_index.html

@@ -24,7 +24,7 @@
 
             <div id="tbSearchDiv" style="display:block;padding:10px;">
                 <form id="ffMaster">
-                    <div>
+                    <div>   
                         开始日期：
                         <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
                         截止日期：