From 17378c3946c1aac0dbe3b6cd05911421a17d3b34 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 08 七月 2022 19:47:26 +0800
Subject: [PATCH] 扫码记录缓存报表

---
 WebAPI/Sc_MouldProdInBill/Log/637929058526583161.log             |    3 +
 WebAPI/Sc_MouldProdInBill/Log/637929035026128911.log             |    3 +
 WebAPI/Sc_MouldProdOutBill/Log/637929058581481456.log            |    3 +
 WebAPI/Sc_MouldProdInBill/Log/637929035026089000.log             |    3 +
 WebAPI/Controllers/仓存管理/条码出入库记录/Kf_ICStockInOutBillController.cs |   47 +++++++++++++++
 WebAPI/Sc_MouldProdInBill/Log/637929058526613165.log             |    3 +
 WebAPI/Vlog/webapi20220708.txt                                   |    3 +
 WebAPI/Controllers/WebAPIController.cs                           |   67 +++++++++++++++++++++-
 WebAPI/Sc_MouldProdInBill/Log/637929035024768802.log             |    3 +
 WebAPI/Sc_MouldProdInBill/Log/637929058526173134.log             |    3 +
 Pub_Class/CustomerCls/ClsPub.cs                                  |    2 
 11 files changed, 135 insertions(+), 5 deletions(-)

diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs
index 615388e..e560972 100644
--- a/Pub_Class/CustomerCls/ClsPub.cs
+++ b/Pub_Class/CustomerCls/ClsPub.cs
@@ -709,8 +709,6 @@
             }
         }
 
-
-
         //寰楀埌鏈�澶INTERID 瀛樺偍杩囩▼
         public static Int64 CreateBillID_Prod(string BillCode, ref string sReturn)
         {
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index f9892a7..cef38b2 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -80,6 +80,67 @@
             }
         }
 
+        [Route("Web/GetMAXNumPDA")]
+        [HttpGet]
+        public object GetMAXNumPDA(string HBillType)
+        {
+            try
+            {
+                string HBillNo = "";
+                string sErrMsg = "";
+                Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+                HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref sErrMsg);
+                HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref sErrMsg, true);
+
+                DataSet ds;
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                ds = oCN.RunProcReturn("exec h_p_IF_CheckBillIDExists_WMS  " + HInterID + ",'" + HBillNo + "'", "h_p_IF_CheckBillIDExists_WMS");
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    sErrMsg = "瀛樺湪閲嶅鍗曟嵁鍐呯爜鎴栧崟鎹彿鐨勫崟鎹紝涓嶅厑璁告柊澧烇紝璇烽��鍑哄悗閲嶆柊鐧诲綍锛�";
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = sErrMsg;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "1")
+                {
+                    sErrMsg = "瀛樺湪閲嶅鍗曟嵁鍐呯爜鎴栧崟鎹彿鐨勫崟鎹紝涓嶅厑璁告柊澧烇紝璇烽��鍑哄悗閲嶆柊鐧诲綍锛�";
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = sErrMsg;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    //----------鍒涘缓铏氳〃------------------------
+                    DataTable dt_Main = new DataTable("Json");
+                    dt_Main.Columns.Add("HBillNo", typeof(string));
+                    dt_Main.Columns.Add("HInterID", typeof(int));
+                    //---------鍒涘缓鏂拌------------------------
+                    DataRow dr_main = dt_Main.NewRow();//鍒涘缓鏂拌 
+                    dt_Main.Rows.Add(dr_main);//灏嗘柊琛屽姞鍏ュ埌琛ㄤ腑
+                    dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
+                    dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
+                    //杩斿洖鏁版嵁
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛";
+                    objjson.data = dt_Main;
+                    return objjson;
+                }
+            }
+            catch (Exception e)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
 
 
         //[Route("Web/Get_MaxBillNoAndID")]
@@ -3452,17 +3513,17 @@
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
                     objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
-                    objJsonResult.data = ds.Tables[0];
-                    objJsonResult.list = columnNameList;
+                    objJsonResult.data = 0;
                     return objJsonResult;
                     //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                 }
                 else
                 {
-                    objJsonResult.code = "0";
+                    objJsonResult.code = "1";
                     objJsonResult.count = 1;
                     objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
                     objJsonResult.data = ds.Tables[0];
+                    objJsonResult.list = columnNameList;
                     return objJsonResult;
                 }
             }
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
index b3cf4b8..8ca8eef 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
@@ -202,5 +202,52 @@
         #endregion
         #endregion
 
+        #region 鎵爜璁板綍缂撳瓨鍒楄〃
+         [Route("Kf_ICStockInOutBill/GetKF_PonderationBillMain_Temp")]
+        [HttpGet]
+        public object GetKF_PonderationBillMain_Temp(string sWhere)
+        {
+            try
+            {
+                DataSet ds = new DataSet();
+                string sql1 = string.Format(@"select * from h_v_KF_PonderationBillList_Query where 1=1 ");
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_KF_PonderationBillList_Query");
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc", "h_v_KF_PonderationBillList_Query");
+                }
+                if (ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = e.Message.ToString();
+                objJsonResult.data = null;
+            }
+            return objJsonResult;
+        }
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637929035024768802.log b/WebAPI/Sc_MouldProdInBill/Log/637929035024768802.log
new file mode 100644
index 0000000..4b6e016
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637929035024768802.log
@@ -0,0 +1,3 @@
+------------------------2022/7/8 18:58:22------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637929035026089000.log b/WebAPI/Sc_MouldProdInBill/Log/637929035026089000.log
new file mode 100644
index 0000000..8791b61
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637929035026089000.log
@@ -0,0 +1,3 @@
+------------------------2022/7/8 18:58:22------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637929035026128911.log b/WebAPI/Sc_MouldProdInBill/Log/637929035026128911.log
new file mode 100644
index 0000000..bcbb8af
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637929035026128911.log
@@ -0,0 +1,3 @@
+------------------------2022/7/8 18:58:22------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='钃濇捣瀹炰笟闆嗗洟' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-08' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-08'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637929058526173134.log b/WebAPI/Sc_MouldProdInBill/Log/637929058526173134.log
new file mode 100644
index 0000000..5d27cbf
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637929058526173134.log
@@ -0,0 +1,3 @@
+------------------------2022/7/8 19:37:32------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637929058526583161.log b/WebAPI/Sc_MouldProdInBill/Log/637929058526583161.log
new file mode 100644
index 0000000..e7822b3
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637929058526583161.log
@@ -0,0 +1,3 @@
+------------------------2022/7/8 19:37:32------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637929058526613165.log b/WebAPI/Sc_MouldProdInBill/Log/637929058526613165.log
new file mode 100644
index 0000000..5694c40
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637929058526613165.log
@@ -0,0 +1,3 @@
+------------------------2022/7/8 19:37:32------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-08' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-08'order by hmainid desc
+
diff --git a/WebAPI/Sc_MouldProdOutBill/Log/637929058581481456.log b/WebAPI/Sc_MouldProdOutBill/Log/637929058581481456.log
new file mode 100644
index 0000000..e3f37b1
--- /dev/null
+++ b/WebAPI/Sc_MouldProdOutBill/Log/637929058581481456.log
@@ -0,0 +1,3 @@
+------------------------2022/7/8 19:37:38------------------------------
+select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�'
+
diff --git a/WebAPI/Vlog/webapi20220708.txt b/WebAPI/Vlog/webapi20220708.txt
new file mode 100644
index 0000000..138366d
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220708.txt
@@ -0,0 +1,3 @@
+2022/7/8 18:58:22  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-08' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-08';钃濇捣瀹炰笟闆嗗洟
+
+2022/7/8 19:37:32  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-08' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-08';鎵嬫満浜嬩笟閮�

--
Gitblit v1.9.1