From e251a3f1b6e6f1c7f86b4e1287f96979de098ff4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 02 七月 2024 14:45:58 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 7ab0c3e..a93f31b 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -461,36 +461,36 @@
                 //涓昏〃
 
                 LogService.Write($"5.绯荤粺鎺у埗鏌ヨ鍒ゆ柇锛岀敤鏃�" + sw.Elapsed);
-                //ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
-                //if (ds == null)
-                //{
-                //    oCN.RollBack();
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
-                //LogService.Write($"5.1锛岀敤鏃�" + sw.Elapsed);
-                //if (ds.Tables[0].Rows.Count == 0)
-                //{
-                //    oCN.RollBack();
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
-                //LogService.Write($"5.2锛岀敤鏃�" + sw.Elapsed);
-                //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
-                //{
-                //    oCN.RollBack();
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
+                ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
+                if (ds == null)
+                {
+                    oCN.RollBack();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                LogService.Write($"5.1锛岀敤鏃�" + sw.Elapsed);
+                if (ds.Tables[0].Rows.Count == 0)
+                {
+                    oCN.RollBack();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                LogService.Write($"5.2锛岀敤鏃�" + sw.Elapsed);
+                if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+                {
+                    oCN.RollBack();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 LogService.Write($"6.鍒ゆ柇缁撴潫锛岀敤鏃�" + sw.Elapsed);
                 oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");
                 LogService.Write($"6.1锛岀敤鏃�" + sw.Elapsed);

--
Gitblit v1.9.1