ztl 3 лет назад
Родитель
Сommit
66c73e5425

+ 14 - 8
wwwroot/main/ProductCheck/api/EditOemProcessing.ashx

@@ -9,23 +9,29 @@ using Curtain.DataAccess;
 using Curtain.Log;
 using DK.XuWei.WebMes;
 
-public class EditOemProcessing : IHttpHandler {
+public class EditOemProcessing : IHttpHandler
+{
 
-    public void ProcessRequest (HttpContext context) {
+    public void ProcessRequest(HttpContext context)
+    {
 
         string BarCode = context.Request["BarCode"].ToString();
+        string flag = context.Request["flag"];
         using (IDataAccess conn = DataAccess.Create())
         {
-                 int Result = conn.ExecuteNonQuery(@"
-                     UPDATE TP_PM_PRODUCTIONDATA SET OEMPROCESSING = 1 WHERE BARCODE = @BARCODE@",
-                new CDAParameter("BARCODE", context.Request["BarCode"])
-                );
+            int Result = conn.ExecuteNonQuery(@"
+                     UPDATE TP_PM_PRODUCTIONDATA SET OEMPROCESSING = @flag@ WHERE BARCODE = @BARCODE@",
+           new CDAParameter("BARCODE", BarCode),
+           new CDAParameter("flag", flag)
+           );
             context.Response.Write(new JsonResult(Result).ToJson());
         }
     }
 
-    public bool IsReusable {
-        get {
+    public bool IsReusable
+    {
+        get
+        {
             return false;
         }
     }

+ 45 - 0
wwwroot/main/ProductCheck/api/GetOemprocessing.ashx

@@ -0,0 +1,45 @@
+<%@ WebHandler Language="C#" Class="GetKingdeeCode" %>
+
+using System.Web;
+using System.Data;
+using System.Web.SessionState;
+using System.Web.Configuration;
+using Newtonsoft.Json.Linq;
+using Curtain.DataAccess;
+using Curtain.Log;
+using DK.XuWei.WebMes;
+
+public class GetKingdeeCode : IHttpHandler
+{
+
+    public void ProcessRequest(HttpContext context)
+    {
+        string BarCode = context.Request["BarCode"].ToString();
+
+        using (IDataAccess conn = DataAccess.Create())
+        {
+                var a = false;
+            DataTable Result = conn.ExecuteDatatable(@"
+                   	SELECT OEMPROCESSING FROM TP_PM_PRODUCTIONDATA WHERE BARCODE = @BarCode@ AND PROCEDUREID = 2",
+           new CDAParameter("BarCode", BarCode)
+           );
+            if (Result != null && Result.Rows.Count > 0 && Result.Rows[0]["OEMPROCESSING"] != null && Result.Rows[0]["OEMPROCESSING"].ToString() != "")
+            {
+                if (Result.Rows[0]["OEMPROCESSING"].ToString() == "1")
+                {
+                    a = true;
+                }
+            }
+            context.Response.Write(new JsonResult(a).ToJson());
+        }
+    }
+
+    public bool IsReusable
+    {
+        get
+        {
+            return false;
+        }
+    }
+
+}

+ 31 - 16
wwwroot/main/ProductCheck/index.html

@@ -489,6 +489,17 @@
 
         //产品条码变更事件
         function ChangeBarcode() {
+            //查询是否为代加工产品
+            var barcode = document.getElementById("产品条码").value;
+            $.post('api/GetOemprocessing.ashx', { 'BarCode': barcode }, function (data) {
+                var json = JSON.parse(data);
+                if (json['success'] == true && json['rows'] == "1") {
+                    document.getElementById("OemProcessing").checked = true;
+                }
+                else {
+                    document.getElementById("OemProcessing").checked = false;
+                }
+            });
             document.getElementById("OemProcessing").checked = false;
             $('#产品缺陷列表').empty();
             var x = document.getElementById("barcodeStaing");
@@ -890,7 +901,7 @@
 
         //加载编辑数据
         function loadUpdateData(productionDataCheckID) {
-            
+
 
             if (action == "update") {
                 //读取产品编辑ID
@@ -1023,7 +1034,7 @@
                     }
                 });
             }
-           
+
         }
 
         //产品分级 改变连动处理
@@ -1768,6 +1779,24 @@
                 timer: 3000,
             });
             save(true);
+            //代加工
+            var barcode = document.getElementById("产品条码").value;
+            var flag;
+            if (document.getElementById("OemProcessing").checked == true) {
+                flag = 1;
+            } else {
+                flag = 0;
+            }
+            $.post('api/EditOemProcessing.ashx', { 'BarCode': barcode, 'flag': flag }, function (data) {
+                var json = JSON.parse(data);
+                alert(JSON.stringify(json));
+                if (json['success'] == true && json['rows'] == "1") {
+                    document.getElementById("OemProcessing").checked = false;
+                }
+                else {
+
+                }
+            });
         }
 
         function save(ok) {
@@ -1878,21 +1907,7 @@
                         });
                     }
                 });
-                //代加工 
-                var barcode = document.getElementById("产品条码").value;
-                var flag = document.getElementById("OemProcessing").checked;
-                if (flag == true) {
-                    $.post('api/EditOemProcessing.ashx', { 'BarCode': barcode }, function (data) {
-                        var json = JSON.parse(data);
-                        alert(JSON.stringify(json));
-                        if (json['success'] == true && json['rows'] == "1") {
-                            document.getElementById("OemProcessing").checked = false;
-                        }
-                        else {
 
-                        }
-                    });
-                }
             }
         }