From 88d941c245a34ea3564d37e187d80aaaf748c5d6 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 03 十一月 2021 17:29:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/流转卡管理/MES_StationOutBillList_Bad.cs |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
index 1912471..189f440 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList_Bad.cs"
@@ -622,7 +622,8 @@
             int HKeepCol = Fun_GetCol("K3淇濈");
             int HSecManagerCol = Fun_GetCol("K3楠屾敹");
             int HDeptCol = Fun_GetCol("K3閮ㄩ棬");
-            DAL.ClsKf_ProductInBill oClsKf_ProductInBill ;
+            DAL.ClsKf_ProductInBill oClsKf_ProductInBill;
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             //鑾峰彇绯荤粺鍙傛暟
             Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
             if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
@@ -639,6 +640,34 @@
                 MessageBox.Show("浼氳鏈熼棿鏈夐敊璇紒 " + DBUtility.ClsPub.sExeReturnInfo);
                 return;
             }
+            string sHInterID = "";
+            for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+            {
+                sHInterID = sHInterID + "," + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[MainIDCol].Value);
+            }
+            if (sHInterID=="")
+            {
+                MessageBox.Show("娌℃湁閫変腑鐨勫崟鎹槑缁嗚锛岃鍏堥�夋嫨瑕佸叆搴撶殑鍗曟嵁锛�", "鎻愮ず");
+                return;
+            }
+            else
+            {
+                DataSet DS = oCn.RunProcReturn("exec h_p_MES_StationOutBillList_Bad_PreProductIn '" + sHInterID + "'", "h_p_MES_StationOutBillList_Bad_PreProductIn", ref DBUtility.ClsPub.sExeReturnInfo);
+                if (DS == null || DS.Tables[0].Rows.Count == 0)
+                {
+                    MessageBox.Show("鍏ュ簱鍓嶅垽鏂け璐ワ紒", "鎻愮ず");
+                    return;
+                }
+                else
+                {
+                    if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
+                    {
+                        MessageBox.Show(DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]));
+                        return;
+                    }
+                }
+            }
+
             Int64 n = 0;
             //寰幆 閫変腑琛�
             for (int i = 0; i < grdMain.SelectedRows.Count; i++)

--
Gitblit v1.9.1