修改菜单二级层级父级问题，生产计划单卡控相同产品

wwwroot/mes/pc/productionPlan/productionPlan.ashx

@@ -61,7 +61,7 @@ public class mouldproduceplan : IHttpHandler, IReadOnlySessionState
                                    LEFT JOIN TP_MST_PACKINGBOM PB ON PB.MATNR = PP.MATERIALCODE";
                 sqlStr += " WHERE  PP.BEGINTIME>=DATE'" + ACCOUNTMONTHBEGIN + "'";
                 sqlStr += VALUEFLAG == "2" ? "" : " AND PP.VALUEFLAG ="+VALUEFLAG;
-                
+
                 sqlStr += CONTROLRANGE == "0" ? "" : " AND PP.CONTROLRANGE=" + CONTROLRANGE;
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
 
@@ -74,6 +74,7 @@ public class mouldproduceplan : IHttpHandler, IReadOnlySessionState
                 {
                     sqlStr += " AND PP.MATERIALCODE like '%" + materialcode + "%'";
                 }
+                sqlStr += " ORDER BY PP.CREATETIME ";
                 try
                 {
                     JsonResult data = Easyui.ExecuteJsonResult(conn, sqlStr, sqlPara);
@@ -411,7 +412,6 @@ public class mouldproduceplan : IHttpHandler, IReadOnlySessionState
                 DataTable dt = Import.ExcelToDataTable(diskFileName);
                 if (dt.Rows.Count > 0)
                 {
-
                     try
                     {
                         int result = 0;
@@ -422,65 +422,67 @@ public class mouldproduceplan : IHttpHandler, IReadOnlySessionState
                             //物料编码
                             if (!string.IsNullOrWhiteSpace(item["物料编码"] + ""))
                             {
-
-                                //校验物料编码是否已存在
-                                string sqlStr = @" SELECT 1
-                                    FROM TP_PM_PRODUCTION_PLAN PP
-                                WHERE PP.VALUEFLAG = 1
-                                    AND PP.MATERIALCODE = @MATERIALCODE@ and CONTROLRANGE = @CONTROLRANGE@ 
-                                    AND ((@BEGINTIME@ <= PP.BEGINTIME  AND  @ENDTIME@ > PP.BEGINTIME  ) OR
-                                        (@BEGINTIME@ >= PP.BEGINTIME  AND  @BEGINTIME@ < PP.ENDTIME ))";
+                                //查询产品 
+                                string sqlStr = @"SELECT DISTINCT
+						                            a.GOODSCODE,
+						                            a.GOODSID,
+						                            a.LOGOID,
+                                                    L.LOGONAME,
+						                            a.MATERIALCODE
+					                        FROM
+						                            (
+						                            SELECT
+							                            g.GOODSCODE,
+							                            g.GOODSID,
+							                            g.LOGOID,
+							                            g.MATERIALCODE
+						                            FROM
+							                            TP_MST_GOODS g 
+                                                UNION
+						                            SELECT
+							                            s.GOODSCODE,
+							                            s.GOODSID,
+							                            s.LOGOID,
+							                            s.MATERIALCODE
+						                            FROM
+							                            TP_MST_GOODSLOGOSAP s 
+						                            ) a 
+                                            LEFT JOIN TP_MST_LOGO L ON  L.LOGOID = a.LOGOID
+                                            WHERE a.GOODSCODE = @GOODSCODE@
+                                                AND  L.LOGONAME = @LOGONAME@";
 
                                 List<CDAParameter> sqlPara = new List<CDAParameter>();
-                                sqlPara.Add(new CDAParameter("MATERIALCODE", (item["物料编码"]+"").Trim()));
-                                sqlPara.Add(new CDAParameter("CONTROLRANGE", (item["控制范围"]+"").Trim()=="装配"?"1":"2"));
-                                sqlPara.Add(new CDAParameter("BEGINTIME", Convert.ToDateTime((item["开始时间"]+"").Trim())));
-                                sqlPara.Add(new CDAParameter("ENDTIME", Convert.ToDateTime((item["截止时间"]+"").Trim())));
+                                sqlPara.Add(new CDAParameter("GOODSCODE", (item["产品编码"]+"").Trim()));
+                                sqlPara.Add(new CDAParameter("LOGONAME", (item["商标名称"]+"").Trim()));
 
                                 DataTable dt1 = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
-                                if (dt1.Rows.Count > 0)
-                                {
 
-                                }
-                                else
+                                if (dt1 != null && dt1.Rows.Count > 0 && dt1.Rows[0]["MATERIALCODE"].ToString() == (item["物料编码"]+"").Trim())
                                 {
-                                    //查询产品 
-                                    sqlStr = @"SELECT DISTINCT
-						                                a.GOODSCODE,
-						                                a.GOODSID,
-						                                a.LOGOID,
-                                                        L.LOGONAME,
-						                                a.MATERIALCODE
-					                           FROM
-						                                (
-						                                SELECT
-							                                g.GOODSCODE,
-							                                g.GOODSID,
-							                                g.LOGOID,
-							                                g.MATERIALCODE
-						                                FROM
-							                                TP_MST_GOODS g 
-                                                    UNION
-						                                SELECT
-							                                s.GOODSCODE,
-							                                s.GOODSID,
-							                                s.LOGOID,
-							                                s.MATERIALCODE
-						                                FROM
-							                                TP_MST_GOODSLOGOSAP s 
-						                                ) a 
-                                                LEFT JOIN TP_MST_LOGO L ON  L.LOGOID = a.LOGOID
-                                                WHERE a.GOODSCODE = @GOODSCODE@
-                                                    AND  L.LOGONAME = @LOGONAME@";
+                                    //校验物料编码是否已存在
+                                    sqlStr = @" SELECT 1
+                                        FROM TP_PM_PRODUCTION_PLAN PP
+                                    WHERE PP.VALUEFLAG = 1
+                                        AND PP.MATERIALCODE = @MATERIALCODE@ and CONTROLRANGE = @CONTROLRANGE@ 
+                                        AND PP.GOODSID = @GOODSID@ AND  PP.LOGOID = @LOGOID@ 
+                                        AND ((@BEGINTIME@ <= PP.BEGINTIME  AND  @ENDTIME@ > PP.BEGINTIME  ) OR
+                                            (@BEGINTIME@ >= PP.BEGINTIME  AND  @BEGINTIME@ < PP.ENDTIME ))";
 
                                     sqlPara = new List<CDAParameter>();
-                                    sqlPara.Add(new CDAParameter("GOODSCODE", (item["产品编码"]+"").Trim()));
-                                    sqlPara.Add(new CDAParameter("LOGONAME", (item["商标名称"]+"").Trim()));
-
-                                    dt1 = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
-
-                                    if (dt1 != null && dt1.Rows.Count > 0 && dt1.Rows[0]["MATERIALCODE"].ToString() == (item["物料编码"]+"").Trim())
+                                    sqlPara.Add(new CDAParameter("MATERIALCODE", (item["物料编码"]+"").Trim()));
+                                    sqlPara.Add(new CDAParameter("GOODSID", dt1.Rows[0]["GOODSID"]));
+                                    sqlPara.Add(new CDAParameter("LOGOID", dt1.Rows[0]["LOGOID"]));
+                                    sqlPara.Add(new CDAParameter("CONTROLRANGE", (item["控制范围"]+"").Trim()=="装配"?"1":"2"));
+                                    sqlPara.Add(new CDAParameter("BEGINTIME", Convert.ToDateTime((item["开始时间"]+"").Trim())));
+                                    sqlPara.Add(new CDAParameter("ENDTIME", Convert.ToDateTime((item["截止时间"]+"").Trim())));
+
+                                    DataTable dt2 = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                                    if (dt2 != null && dt2.Rows.Count > 0)
                                     {
+
+                                    }
+                                    else
+                                    {  
                                         //新建
                                         sqlStr = @"INSERT INTO TP_PM_PRODUCTION_PLAN
                                                 (GOODSID
@@ -524,13 +526,13 @@ public class mouldproduceplan : IHttpHandler, IReadOnlySessionState
                                         sqlPara.Add(new CDAParameter("UPDATEUSERID", HttpContext.Current.Session["userId"]));
                                         sqlPara.Add(new CDAParameter("XUHAO",(item["顺序"]+"").Trim()));
                                         sqlPara.Add(new CDAParameter("CONTROLRANGE",(item["控制范围"]+"").Trim()=="装配"?"1":"2"));
-                                        result += conn.ExecuteNonQuery(sqlStr, sqlPara.ToArray());
+                                        result += conn.ExecuteNonQuery(sqlStr, sqlPara.ToArray()); 
                                     }
-                                    else
-                                    {
-                                        //未找到匹配数据
+                                }
+                                else
+                                {
+                                    //未找到匹配数据
 
-                                    }
                                 }
                             }
                             row++;

wwwroot/mes/tree.ashx

@@ -38,7 +38,8 @@ public class tree : IHttpHandler, IReadOnlySessionState
                     AND 
                         ((f.FUNCTIONCODE IN (SELECT FUNCTIONCODE FROM TP_MST_USERRIGHT  WHERE USERID = @USERID@)) 
                         --OR (f.FUNCTIONCODE IN (SELECT SUBSTR( FUNCTIONCODE, 1, LENGTH( FUNCTIONCODE ) - 2 ) FROM TP_MST_USERRIGHT WHERE USERID = @USERID@ )))
-                        OR (f.FUNCTIONLEVEL IN (SELECT SUBSTR( FUNCTIONLEVEL, 1, LENGTH( FUNCTIONLEVEL ) - 2 ) FROM TP_MST_USERRIGHT U INNER JOIN TP_SYS_FUNCTION FF ON FF.FUNCTIONCODE=U.FUNCTIONCODE WHERE U.USERID = @USERID@ )))
+                        OR (f.FUNCTIONLEVEL IN (SELECT SUBSTR( FUNCTIONLEVEL, 1, LENGTH( FUNCTIONLEVEL ) - 2 ) FROM TP_MST_USERRIGHT U INNER JOIN TP_SYS_FUNCTION FF ON FF.FUNCTIONCODE=U.FUNCTIONCODE WHERE U.USERID = @USERID@ ))
+                        OR (f.FUNCTIONLEVEL IN (SELECT SUBSTR( FUNCTIONLEVEL, 1, LENGTH( FUNCTIONLEVEL ) - 4 ) FROM TP_MST_USERRIGHT U INNER JOIN TP_SYS_FUNCTION FF ON FF.FUNCTIONCODE=U.FUNCTIONCODE WHERE U.USERID = @USERID@ )))
                 ORDER BY 
                     f.FUNCTIONLEVEL,
                     f.FUNCTIONCODE