From 1882724680a814ac569318cd4998c3d4ffcc4560 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 25 十月 2024 09:54:53 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 5e32490..2ef736a 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -883,14 +883,15 @@
                         string sReturn = "";
                         if (oSystemParameter.ShowBill(ref sReturn) == true)
                         {
-                            if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
-                            {
-                                objJsonResult.Verify = "Y";
-                            }
-                            else
-                            {
-                                objJsonResult.Verify = "N";
-                            }
+                            objJsonResult.Verify = "Y";
+                            //if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+                            //{
+                            //    objJsonResult.Verify = "Y";
+                            //}
+                            //else
+                            //{
+                            //    objJsonResult.Verify = "N";
+                            //}
                         }
                     }
 
@@ -944,7 +945,14 @@
         {
             try
             {
-                ds = new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+                string HSourceID = dic["HSourceID"].ToString();
+                string HICMOBillNo = dic["HICMOBillNo"].ToString();
+                string HInterID = dic["HInterID"].ToString();
+                string Type = dic["type"].ToString();
+
+                ds = new SQLHelper.ClsCN().RunProcReturn("exec h_p_IpadIndexButton  '"+ HSourceID + "','" + HICMOBillNo + "','" + HInterID + "','" + Type + "'", "h_p_IpadIndexButton");
                 if (ds.Tables[0].Rows.Count > 0)
                 {
                     objJsonResult.code = "1";

--
Gitblit v1.9.1