合并更改

wwwroot/App_Code/SapApi.cs

@@ -300,7 +300,7 @@ public class SapApi
 
         //输入参数
         rfcApi.SetValue("IN_ALL", 'Y');
-        rfcApi.SetValue("IN_WERKS", 5000);
+        rfcApi.SetValue("IN_WERKS", 5020);
 
         //调用接口
         rfcApi.Invoke(rfcDest);

wwwroot/App_Code/SyncZMMFM054.cs

@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using Curtain.DataAccess;
-
-/// <summary>
-/// 同步WMS系统条码
-/// </summary>
-public class SyncZMMFM054
-{
-    /// <summary>
-    /// 同步WMS系统条码到产成品表
-    /// </summary>
-    /// <returns></returns>
-    public static string Sync()
-    {
-        string ZTYPE;
-        string ZMSG;
-        DataTable dtResult = SapApi.ZMMFM054(out ZTYPE, out ZMSG);
-        dtResult.Columns.Add("MENGE", typeof(decimal));
-        decimal menge = 0;
-
-        return "同步成功";
-
-        // 修改此列为数字类型
-        //foreach (DataRow row in dtResult.Rows)
-        //{
-        //    decimal.TryParse(row["BSTRF"] + "", out menge);
-        //    row["MENGE"] = menge;
-        //}
-        //dtResult.Columns.Remove("BSTRF");
-        //dtResult.Columns["MENGE"].ColumnName = "BSTRF";
-        //dtResult.DefaultView.RowFilter = "BSTRF <> '0'";
-        //dtResult = dtResult.DefaultView.ToTable();
-
-        //if ("E".Equals(ZTYPE) || dtResult == null || dtResult.Rows.Count == 0)
-        //{
-        //    return "同步失败";
-        //}
-
-        //using (IDataAccess conn = DataAccess.Create())
-        //{
-        //    // 开启事务
-        //    conn.BeginTransaction();
-
-        //    // 删除所有
-        //    int result = conn.ExecuteNonQuery(@"
-        //        DELETE FROM TP_PC_BOMPACKUNIT "
-        //    );
-
-        //    // 插入新的
-        //    string sqlString = @"
-        //    INSERT INTO TP_PC_BOMPACKUNIT
-        //        (IDNRK,
-        //         MENGE,
-        //         MEINS,
-        //         ORDERMEINS,
-        //         MAKTX,
-        //         MATKL,
-        //         WGBEZ,
-        //         LABOR,
-        //         LGFSB,
-        //         MTART,
-        //         LVORM,
-        //         PRDHA,
-        //         VTEXT,
-        //         ACCOUNTID,
-        //         CREATEUSERID,
-        //         UPDATEUSERID)
-        //    VALUES
-        //        (@IDNRK@,
-        //         @MENGE@,
-        //         @MEINS@,
-        //         @ORDERMEINS@,
-        //         @MAKTX@,
-        //         @MATKL@,
-        //         @WGBEZ@,
-        //         @LABOR@,
-        //         @LGFSB@,
-        //         @MTART@,
-        //         @LVORM@,
-        //         @PRDHA@,
-        //         @VTEXT@,
-        //         @ACCOUNTID@,
-        //         @USERID@,
-        //         @USERID@) ";
-
-        //    foreach (DataRow row in dtResult.Rows)
-        //    {
-        //        decimal.TryParse(row["BSTRF"] + "", out menge);
-        //        result += conn.ExecuteNonQuery(sqlString,
-        //            new CDAParameter("IDNRK", row["MATNR"]),
-        //            new CDAParameter("MENGE", menge),
-        //            new CDAParameter("MEINS", row["MEINS"]),
-        //            new CDAParameter("ORDERMEINS", row["BSTME"]),
-        //            new CDAParameter("MAKTX", row["MAKTX"]),
-        //            new CDAParameter("MATKL", row["MATKL"]),
-        //            new CDAParameter("WGBEZ", row["WGBEZ"]),
-        //            new CDAParameter("LABOR", row["LABOR"]),
-        //            new CDAParameter("LGFSB", row["LGFSB"]),
-        //            new CDAParameter("MTART", row["MTART"]),
-        //            new CDAParameter("LVORM", row["LVORM"]),
-        //            new CDAParameter("PRDHA", row["PRDHA"]),
-        //            new CDAParameter("VTEXT", row["VTEXT"]),
-        //            new CDAParameter("ACCOUNTID", 1),
-        //            new CDAParameter("USERID", 1)
-        //        );
-        //    }
-
-        //    if (result > 0)
-        //    {
-        //        conn.Commit();
-        //        return "同步成功";
-        //    }
-        //    else
-        //    {
-        //        conn.Rollback();
-        //        return "同步失败";
-        //    }
-        //}
-    }
-}

wwwroot/App_Data/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>\\172.18.32.32\d$\dongke\IBOSS.PRD\DK.MES.PACKING.LINE.9300</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <SiteUrlToLaunchAfterPublish />
+  </PropertyGroup>
+</Project>

wwwroot/Global.asax

@@ -80,14 +80,6 @@
             message = RollingDailyPlan.AutoMateriaPlanOut();
             Logger.Debug("生成领料计划（按领料计划设置）：定时触发结束，结果：" + message);
         }
-
-        // 4点，同步最小包装数(暂不启用)
-        //if ("04:00".Equals(currTime))
-        //{
-        //    Logger.Debug("自动同步最小包装数：定时触发开始");
-        //    string message = SyncZMMFM054.Sync();
-        //    Logger.Debug("自动同步最小包装数：定时触发结束，结果：" + message);
-        //}
     }
     //======================================================
 

wwwroot/mes/dashboard.ashx

@@ -28,46 +28,46 @@ public class dashboard : IHttpHandler
             using (IDataAccess conn = DataAccess.Create())
             {
                 //统计包装单数据,从包装单
-                DataTable dt = conn.ExecuteDatatable(@"
-                    SELECT
-	                    NVL(SUM( CASE WHEN TRUNC( CREATETIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMALLDAY,
-	                    NVL(SUM( CASE WHEN STATUS = '0' OR STATUS = '1' THEN 1 ELSE 0 END ),0) AS COUNTFORMQUEUEDAY,
-	                    NVL(SUM( CASE WHEN STATUS = '2' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMCOMPLETEDAY, 
-	                    NVL(SUM( CASE WHEN STATUS = '3' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMWARNINGDAY 
-                    FROM
-	                    TP_MST_PACKINGFORM 
-                    WHERE
-	                    TRUNC( CREATETIME ) = TRUNC( SYSDATE )
-                        OR (STATUS = '0' OR STATUS = '1')
-	                    OR (STATUS = '2' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ))
-	                    OR (STATUS = '3' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ))
-				    "
-                );
-                if(dt.Rows.Count>0)
-                {
-                    result["countFormAllDay"] = dt.Rows[0]["COUNTFORMALLDAY"].ToString();
-                    result["countFormQueueDay"] = dt.Rows[0]["COUNTFORMQUEUEDAY"].ToString();
-                    result["countFormCompleteDay"] = dt.Rows[0]["COUNTFORMCOMPLETEDAY"].ToString();
-                    result["countFormWarningDay"] = dt.Rows[0]["COUNTFORMWARNINGDAY"].ToString();
-                }
+                //        DataTable dt = conn.ExecuteDatatable(@"
+                //            SELECT
+                //             NVL(SUM( CASE WHEN TRUNC( CREATETIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMALLDAY,
+                //             NVL(SUM( CASE WHEN STATUS = '0' OR STATUS = '1' THEN 1 ELSE 0 END ),0) AS COUNTFORMQUEUEDAY,
+                //             NVL(SUM( CASE WHEN STATUS = '2' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMCOMPLETEDAY, 
+                //             NVL(SUM( CASE WHEN STATUS = '3' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMWARNINGDAY 
+                //            FROM
+                //             TP_MST_PACKINGFORM 
+                //            WHERE
+                //             TRUNC( CREATETIME ) = TRUNC( SYSDATE )
+                //                OR (STATUS = '0' OR STATUS = '1')
+                //             OR (STATUS = '2' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ))
+                //             OR (STATUS = '3' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ))
+                //"
+                //        );
+                //        if(dt.Rows.Count>0)
+                //        {
+                //            result["countFormAllDay"] = dt.Rows[0]["COUNTFORMALLDAY"].ToString();
+                //            result["countFormQueueDay"] = dt.Rows[0]["COUNTFORMQUEUEDAY"].ToString();
+                //            result["countFormCompleteDay"] = dt.Rows[0]["COUNTFORMCOMPLETEDAY"].ToString();
+                //            result["countFormWarningDay"] = dt.Rows[0]["COUNTFORMWARNINGDAY"].ToString();
+                //        }
 
-                //统计入库出库数据，从接口日志
-                dt = conn.ExecuteDatatable(@"
-                    SELECT
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' THEN BARCODECOUNT ELSE 0 END ),0) AS COUNTPRODUCTINDAY,
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' THEN BARCODECOUNT ELSE 0 END ),0) AS COUNTPRODUCTOUTDAY
-                    FROM
-	                    TP_MST_APILOG 
-                    WHERE
-	                    TRUNC( CREATETIME ) = TRUNC( SYSDATE )
-	                    AND STATUS = '1'
-				    "
-                );
-                if(dt.Rows.Count>0)
-                {
-                    result["countProductInDay"] = dt.Rows[0]["COUNTPRODUCTINDAY"].ToString();
-                    result["countProductOutDay"] = dt.Rows[0]["COUNTPRODUCTOUTDAY"].ToString();
-                }
+                //        //统计入库出库数据，从接口日志
+                //        dt = conn.ExecuteDatatable(@"
+                //            SELECT
+                //             NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' THEN BARCODECOUNT ELSE 0 END ),0) AS COUNTPRODUCTINDAY,
+                //             NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' THEN BARCODECOUNT ELSE 0 END ),0) AS COUNTPRODUCTOUTDAY
+                //            FROM
+                //             TP_MST_APILOG 
+                //            WHERE
+                //             TRUNC( CREATETIME ) = TRUNC( SYSDATE )
+                //             AND STATUS = '1'
+                //"
+                //        );
+                //        if(dt.Rows.Count>0)
+                //        {
+                //            result["countProductInDay"] = dt.Rows[0]["COUNTPRODUCTINDAY"].ToString();
+                //            result["countProductOutDay"] = dt.Rows[0]["COUNTPRODUCTOUTDAY"].ToString();
+                //        }
             }
             resultJsonStr = new JsonResult(result).ToJson();
             context.Response.Write(resultJsonStr);
@@ -75,7 +75,7 @@ public class dashboard : IHttpHandler
 
         //乾润库存数量
         if (context.Request["m"].ToString() == "qianrunnumber")
-        { 
+        {
             Hashtable result = new Hashtable();
             result.Add("countProductZnDay", "0");
             result.Add("countProductLtDay", "0");
@@ -119,82 +119,83 @@ public class dashboard : IHttpHandler
             using (IDataAccess conn = DataAccess.Create())
             {
                 //统计入库数据
-                DataTable dt = conn.ExecuteDatatable(@"
-                    SELECT
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 1 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 2 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 3 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 4 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 5 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 6 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 7 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 8 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 9 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 10 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 11 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 12 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 13 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 14 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 15 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 16 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 17 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 18 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 19 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 20 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 21 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 22 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 23 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 24 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 25 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 26 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 27 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 28 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 29 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 30 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 31 THEN BARCODECOUNT ELSE 0 END ),0) AS INNUM,
-											
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 1 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 2 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 3 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 4 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 5 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 6 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 7 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 8 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 9 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 10 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 11 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 12 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 13 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 14 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 15 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 16 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 17 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 18 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 19 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 20 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 21 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 22 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 23 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 24 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 25 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 26 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 27 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 28 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 29 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 30 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
-	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 31 THEN BARCODECOUNT ELSE 0 END ),0) AS OUTNUM
+                //            DataTable dt = conn.ExecuteDatatable(@"
+                //                SELECT
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 1 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 2 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 3 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 4 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 5 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 6 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 7 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 8 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 9 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 10 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 11 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 12 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 13 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 14 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 15 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 16 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 17 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 18 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 19 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 20 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 21 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 22 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 23 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 24 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 25 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 26 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 27 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 28 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 29 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 30 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 31 THEN BARCODECOUNT ELSE 0 END ),0) AS INNUM,
+
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 1 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 2 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 3 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 4 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 5 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 6 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 7 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 8 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 9 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 10 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 11 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 12 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 13 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 14 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 15 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 16 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 17 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 18 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 19 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 20 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 21 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 22 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 23 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 24 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 25 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 26 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 27 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 28 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 29 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 30 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+                //                 NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 31 THEN BARCODECOUNT ELSE 0 END ),0) AS OUTNUM
 
-                    FROM
-	                    TP_MST_APILOG 
-                    WHERE
-	                    EXTRACT(YEAR FROM CREATETIME) = @YEAR@
-	                    AND EXTRACT(MONTH FROM CREATETIME) = @MONTH@
-	                    AND STATUS = '1'
-				",
-                    new CDAParameter("YEAR", DateTime.Now.Year),
-                    new CDAParameter("MONTH", DateTime.Now.Month)
-                );
+                //                FROM
+                //                 TP_MST_APILOG 
+                //                WHERE
+                //                 EXTRACT(YEAR FROM CREATETIME) = @YEAR@
+                //                 AND EXTRACT(MONTH FROM CREATETIME) = @MONTH@
+                //                 AND STATUS = '1'
+                //",
+                //                new CDAParameter("YEAR", DateTime.Now.Year),
+                //                new CDAParameter("MONTH", DateTime.Now.Month)
+                //            );
+                DataTable dt = new DataTable();
                 //统计出库数据
                 if(dt.Rows.Count>0)
                 {
@@ -214,24 +215,25 @@ public class dashboard : IHttpHandler
             using (IDataAccess conn = DataAccess.Create())
             {
                 //统计入库数据
-                DataTable dt = conn.ExecuteDatatable(@"
-                    SELECT
-	                    S.POINTCODE AS 对接点代码,
-	                    S.POINTNAME AS 对接点名称,
-	                    COUNT( * ) AS 执行次数,
-						SUM( DECODE(L.STATUS,'1',1,0)) AS 成功次数,
-	                    SUM( L.BARCODECOUNT ) AS 产品数量,
-						SUM( DECODE(L.STATUS,'1',L.BARCODECOUNT,0)) AS 成功数量
-                    FROM
-	                    TP_SYS_SMARTDEVICEPOINT S
-	                    LEFT JOIN TP_MST_APILOG L ON REPLACE ( S.POINTCODE, '_', '' ) || S.ROADNO || '1' = L.APIID 
-                    WHERE
-	                    TRUNC( L.CREATETIME ) = TRUNC( SYSDATE )
-                    GROUP BY
-	                    S.POINTCODE,
-	                    S.POINTNAME
-				"
-                );
+                //            DataTable dt = conn.ExecuteDatatable(@"
+                //                SELECT
+                //                 S.POINTCODE AS 对接点代码,
+                //                 S.POINTNAME AS 对接点名称,
+                //                 COUNT( * ) AS 执行次数,
+                //		SUM( DECODE(L.STATUS,'1',1,0)) AS 成功次数,
+                //                 SUM( L.BARCODECOUNT ) AS 产品数量,
+                //		SUM( DECODE(L.STATUS,'1',L.BARCODECOUNT,0)) AS 成功数量
+                //                FROM
+                //                 TP_SYS_SMARTDEVICEPOINT S
+                //                 LEFT JOIN TP_MST_APILOG L ON REPLACE ( S.POINTCODE, '_', '' ) || S.ROADNO || '1' = L.APIID 
+                //                WHERE
+                //                 TRUNC( L.CREATETIME ) = TRUNC( SYSDATE )
+                //                GROUP BY
+                //                 S.POINTCODE,
+                //                 S.POINTNAME
+                //"
+                //            );
+                DataTable dt = new DataTable();
                 context.Response.Write(new JsonResult(dt).ToJson());
             }
         }

wwwroot/mes/dashboard2.ashx

@@ -0,0 +1,248 @@
+<%@ WebHandler Language="C#" Class="dashboard" %>
+
+using System;
+using System.Web;
+using System.Collections;
+using System.Data;
+using Curtain.DataAccess;
+using DK.XuWei.WebMes;
+using Newtonsoft.Json.Linq;
+
+public class dashboard : IHttpHandler
+{
+    public void ProcessRequest(HttpContext context)
+    {
+        context.Response.ContentType = "text/plain";
+        string resultJsonStr = "";
+
+        if(context.Request["m"]=="number")
+        {
+            Hashtable result = new Hashtable();
+            result.Add("countFormAllDay", "0");
+            result.Add("countFormQueueDay", "0");
+            result.Add("countFormCompleteDay", "0");
+            result.Add("countFormWarningDay", "0");
+            result.Add("countProductInDay", "0");
+            result.Add("countProductOutDay", "0");
+
+            using (IDataAccess conn = DataAccess.Create())
+            {
+                //统计包装单数据,从包装单
+                DataTable dt = conn.ExecuteDatatable(@"
+                    SELECT
+	                    NVL(SUM( CASE WHEN TRUNC( CREATETIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMALLDAY,
+	                    NVL(SUM( CASE WHEN STATUS = '0' OR STATUS = '1' THEN 1 ELSE 0 END ),0) AS COUNTFORMQUEUEDAY,
+	                    NVL(SUM( CASE WHEN STATUS = '2' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMCOMPLETEDAY, 
+	                    NVL(SUM( CASE WHEN STATUS = '3' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ) THEN 1 ELSE 0 END ),0) AS COUNTFORMWARNINGDAY 
+                    FROM
+	                    TP_MST_PACKINGFORM 
+                    WHERE
+	                    TRUNC( CREATETIME ) = TRUNC( SYSDATE )
+                        OR (STATUS = '0' OR STATUS = '1')
+	                    OR (STATUS = '2' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ))
+	                    OR (STATUS = '3' AND TRUNC( ENDTIME ) = TRUNC( SYSDATE ))
+				    "
+                );
+                if(dt.Rows.Count>0)
+                {
+                    result["countFormAllDay"] = dt.Rows[0]["COUNTFORMALLDAY"].ToString();
+                    result["countFormQueueDay"] = dt.Rows[0]["COUNTFORMQUEUEDAY"].ToString();
+                    result["countFormCompleteDay"] = dt.Rows[0]["COUNTFORMCOMPLETEDAY"].ToString();
+                    result["countFormWarningDay"] = dt.Rows[0]["COUNTFORMWARNINGDAY"].ToString();
+                }
+
+                //统计入库出库数据，从接口日志
+                dt = conn.ExecuteDatatable(@"
+                    SELECT
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' THEN BARCODECOUNT ELSE 0 END ),0) AS COUNTPRODUCTINDAY,
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' THEN BARCODECOUNT ELSE 0 END ),0) AS COUNTPRODUCTOUTDAY
+                    FROM
+	                    TP_MST_APILOG 
+                    WHERE
+	                    TRUNC( CREATETIME ) = TRUNC( SYSDATE )
+	                    AND STATUS = '1'
+				    "
+                );
+                if(dt.Rows.Count>0)
+                {
+                    result["countProductInDay"] = dt.Rows[0]["COUNTPRODUCTINDAY"].ToString();
+                    result["countProductOutDay"] = dt.Rows[0]["COUNTPRODUCTOUTDAY"].ToString();
+                }
+            }
+            resultJsonStr = new JsonResult(result).ToJson();
+            context.Response.Write(resultJsonStr);
+        }
+
+        //乾润库存数量
+        if (context.Request["m"].ToString() == "qianrunnumber")
+        { 
+            Hashtable result = new Hashtable();
+            result.Add("countProductZnDay", "0");
+            result.Add("countProductLtDay", "0");
+            //统计实时库存数据,从乾润接口
+            string jsonStr = QianRunApi.GetGoodsCode("", "", "0");
+            JObject jsonObj = JObject.Parse(jsonStr);
+            int countZn = 0;
+            int countLt = 0;
+            if(jsonObj["success"].ToString().ToLower()=="true")
+            {
+                JArray json = JArray.Parse(jsonObj["rows"].ToString());
+                for (int i = 0; i < json.Count; i++)
+                {
+                    if(json[i]["GoodsSeries"].ToString()=="1")
+                    {
+                        countZn += Convert.ToInt32(json[i]["GoodsCount"]);
+                    }
+                    else
+                    {
+                        countLt += Convert.ToInt32(json[i]["GoodsCount"]);
+                    }
+                }
+                result["countProductZnDay"] = countZn.ToString();
+                result["countProductLtDay"] = countLt.ToString();
+                resultJsonStr = new JsonResult(result).ToJson();
+            }
+            else
+            {
+                resultJsonStr = new JsonResult(JsonStatus.error) { message = "乾润接口请求失败！" }.ToJson();
+            }
+            context.Response.Write(resultJsonStr);
+        }
+
+        //本月出入库统计
+        if (context.Request["m"].ToString() == "inoutmonth")
+        {
+            Hashtable result = new Hashtable();
+            result.Add("inCount", "");
+            result.Add("outCount", "");
+
+            using (IDataAccess conn = DataAccess.Create())
+            {
+                //统计入库数据
+                DataTable dt = conn.ExecuteDatatable(@"
+                    SELECT
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 1 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 2 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 3 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 4 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 5 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 6 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 7 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 8 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 9 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 10 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 11 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 12 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 13 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 14 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 15 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 16 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 17 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 18 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 19 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 20 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 21 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 22 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 23 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 24 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 25 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 26 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 27 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 28 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 29 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 30 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31111 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 31 THEN BARCODECOUNT ELSE 0 END ),0) AS INNUM,
+											
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 1 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 2 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 3 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 4 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 5 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 6 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 7 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 8 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 9 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 10 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 11 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 12 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 13 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 14 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 15 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 16 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 17 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 18 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 19 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 20 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 21 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 22 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 23 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 24 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 25 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 26 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 27 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 28 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 29 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 30 THEN BARCODECOUNT ELSE 0 END ),0) || ',' || 
+	                    NVL(SUM( CASE WHEN APIID = 31013 AND STATUS = '1' AND EXTRACT(DAY FROM CREATETIME) = 31 THEN BARCODECOUNT ELSE 0 END ),0) AS OUTNUM
+
+                    FROM
+	                    TP_MST_APILOG 
+                    WHERE
+	                    EXTRACT(YEAR FROM CREATETIME) = @YEAR@
+	                    AND EXTRACT(MONTH FROM CREATETIME) = @MONTH@
+	                    AND STATUS = '1'
+				",
+                    new CDAParameter("YEAR", DateTime.Now.Year),
+                    new CDAParameter("MONTH", DateTime.Now.Month)
+                );
+                //统计出库数据
+                if(dt.Rows.Count>0)
+                {
+                    result["inCount"] = "[" + dt.Rows[0]["INNUM"].ToString() + "]";
+                    result["outCount"] = "[" + dt.Rows[0]["OUTNUM"].ToString() + "]";
+                }
+
+            }
+            resultJsonStr = new JsonResult(result).ToJson();
+            resultJsonStr = resultJsonStr.Replace("\"[", "[").Replace("]\"", "]");
+            context.Response.Write(resultJsonStr);
+        }
+
+        //设备对接点访问统计
+        if (context.Request["m"].ToString() == "devicenumber")
+        {
+            using (IDataAccess conn = DataAccess.Create())
+            {
+                //统计入库数据
+                DataTable dt = conn.ExecuteDatatable(@"
+                    SELECT
+	                    S.POINTCODE AS 对接点代码,
+	                    S.POINTNAME AS 对接点名称,
+	                    COUNT( * ) AS 执行次数,
+						SUM( DECODE(L.STATUS,'1',1,0)) AS 成功次数,
+	                    SUM( L.BARCODECOUNT ) AS 产品数量,
+						SUM( DECODE(L.STATUS,'1',L.BARCODECOUNT,0)) AS 成功数量
+                    FROM
+	                    TP_SYS_SMARTDEVICEPOINT S
+	                    LEFT JOIN TP_MST_APILOG L ON REPLACE ( S.POINTCODE, '_', '' ) || S.ROADNO || '1' = L.APIID 
+                    WHERE
+	                    TRUNC( L.CREATETIME ) = TRUNC( SYSDATE )
+                    GROUP BY
+	                    S.POINTCODE,
+	                    S.POINTNAME
+				"
+                );
+                context.Response.Write(new JsonResult(dt).ToJson());
+            }
+        }
+
+    }
+
+    public bool IsReusable
+    {
+        get
+        {
+            return false;
+        }
+    }
+}

wwwroot/mes/pc/bompackunit/bompackunit.ashx

@@ -248,19 +248,103 @@ public class bompackunit : IHttpHandler, IReadOnlySessionState
     }
 
     /// <summary>
-    /// 同步最小包装数
+    /// 删除 TP_PC_BOMPACKUNIT
     /// </summary>
     /// <returns>json</returns>
-    public string sync(HttpContext context)
+    private string sync(HttpContext context)
     {
-        string message = SyncZMMFM054.Sync();
-        if ("同步成功".Equals(message))
+        string ZTYPE;
+        string ZMSG;
+        DataTable dtResult = SapApi.ZMMFM054(out ZTYPE, out ZMSG);
+
+        if ("E".Equals(ZTYPE) || dtResult == null || dtResult.Rows.Count == 0)
         {
-            return new JsonResult(JsonStatus.success).ToJson();
+            return new JsonResult(JsonStatus.otherError).ToJson();
+
         }
-        else
+
+        using (IDataAccess conn = DataAccess.Create())
         {
-            return new JsonResult(JsonStatus.error).ToJson();
+            // 开启事务
+            conn.BeginTransaction();
+
+            // 删除所有
+            int result = conn.ExecuteNonQuery(@"
+                DELETE FROM TP_PC_BOMPACKUNIT "
+            );
+
+            // 插入新的
+            string sqlString = @"
+            INSERT INTO TP_PC_BOMPACKUNIT
+                (IDNRK,
+                 MENGE,
+                 MEINS,
+                 ORDERMEINS,
+                 MAKTX,
+                 MATKL,
+                 WGBEZ,
+                 LABOR,
+                 LGFSB,
+                 MTART,
+                 LVORM,
+                 PRDHA,
+                 VTEXT,
+                 ACCOUNTID,
+                 CREATEUSERID,
+                 UPDATEUSERID)
+            VALUES
+                (@IDNRK@,
+                 @MENGE@,
+                 @MEINS@,
+                 @ORDERMEINS@,
+                 @MAKTX@,
+                 @MATKL@,
+                 @WGBEZ@,
+                 @LABOR@,
+                 @LGFSB@,
+                 @MTART@,
+                 @LVORM@,
+                 @PRDHA@,
+                 @VTEXT@,
+                 @ACCOUNTID@,
+                 @USERID@,
+                 @USERID@) ";
+
+            decimal menge = 0;
+            foreach (DataRow row in dtResult.Rows)
+            {
+                decimal.TryParse(row["BSTRF"] + "", out menge);
+                menge = menge == 0 ? 1 : menge;
+
+                result += conn.ExecuteNonQuery(sqlString,
+                    new CDAParameter("IDNRK", row["MATNR"]),
+                    new CDAParameter("MENGE", menge),
+                    new CDAParameter("MEINS", row["MEINS"]),
+                    new CDAParameter("ORDERMEINS", row["BSTME"]),
+                    new CDAParameter("MAKTX", row["MAKTX"]),
+                    new CDAParameter("MATKL", row["MATKL"]),
+                    new CDAParameter("WGBEZ", row["WGBEZ"]),
+                    new CDAParameter("LABOR", row["LABOR"]),
+                    new CDAParameter("LGFSB", row["LGFSB"]),
+                    new CDAParameter("MTART", row["MTART"]),
+                    new CDAParameter("LVORM", row["LVORM"]),
+                    new CDAParameter("PRDHA", row["PRDHA"]),
+                    new CDAParameter("VTEXT", row["VTEXT"]),
+                    new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]),
+                    new CDAParameter("USERID", HttpContext.Current.Session["userId"])
+                );
+            }
+
+            if (result > 0)
+            {
+                conn.Commit();
+                return new JsonResult(JsonStatus.success).ToJson();
+            }
+            else
+            {
+                conn.Rollback();
+                return new JsonResult(JsonStatus.error).ToJson();
+            }
         }
     }
 

wwwroot/website.publishproj

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+
+***********************************************************************************************
+website.publishproj
+
+警告: 请勿修改此文件，它将用于 Web 发布过程。
+
+版权所有 (C) Microsoft Corporation。保留所有权利。
+
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.30319</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0a737fb8-c04a-4b6e-8099-7888dcc9b69d}</ProjectGuid>
+    <SourceWebPhysicalPath>$(MSBuildThisFileDirectory)</SourceWebPhysicalPath>
+    <SourceWebVirtualPath>/wwwroot</SourceWebVirtualPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SourceWebProject></SourceWebProject>
+    <SourceWebMetabasePath></SourceWebMetabasePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <!-- for VS2010 we need to use 10.5 but for VS2012+ we should use VisualStudioVersion -->
+    <WebPublishTargetsVersion Condition=" '$(WebPublishTargetsVersion)' =='' and '$(VisualStudioVersion)' == 10.0 ">10.5</WebPublishTargetsVersion>
+    <WebPublishTargetsVersion Condition=" '$(WebPublishTargetsVersion)'=='' ">$(VisualStudioVersion)</WebPublishTargetsVersion>
+
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(WebPublishTargetsVersion)</VSToolsPath>
+    <_WebPublishTargetsPath Condition=" '$(_WebPublishTargetsPath)'=='' ">$(VSToolsPath)</_WebPublishTargetsPath>
+    <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">1.0.0.0</AssemblyFileVersion>
+    <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">1.0.0.0</AssemblyVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <AssemblyAttributes Include="AssemblyFileVersion">
+      <Value>$(AssemblyFileVersion)</Value>
+    </AssemblyAttributes>
+    <AssemblyAttributes Include="AssemblyVersion">
+      <Value>$(AssemblyVersion)</Value>
+    </AssemblyAttributes>
+  </ItemGroup>
+  <Import Project="$(_WebPublishTargetsPath)\Web\Microsoft.WebSite.Publishing.targets" />
+</Project>