From 0635805fdb44a5bd038134e567a3c12dd73b8c05 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 27 九月 2022 13:04:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-SCM
---
SCM/条码打印/Gy_BarCodeBill.cs | 7 +++++--
SCM/公用类/ClsPub1.cs | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs" "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
index cb1bdc0..9c5cbfa 100644
--- "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
+++ "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
@@ -27,7 +27,7 @@
//public static string WEBSURL = "http://192.168.2.18/WEBS-WMS/WebService1.asmx"; //鍏徃鍙板紡鏈�
//public static string WEBSURL = "http://192.168.0.107/WEBS-WMS/WebService1.asmx"; //瀹�
- //public static string WEBSURL = "http://47.96.97.237/WEBS-WMS/WebService1.asmx"; //鍏徃鍙板紡鏈�
+ //public static string WEBSURL = "http://47.96.97.237/WEBS-WMS/WebService1.asmx"; //鍏徃鏈嶅姟鍣�
public static long HOrgID = 0;
public static string HOrgNumber = "";
public static long HPersonL = 2; // 浠撳簱浜哄憳涓�1锛岃溅闂翠汉鍛樹负2
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 67d024d..2c72ce9 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -1565,7 +1565,8 @@
pb1.Value = 0;
pb1.Maximum = HBQty;
//
- string[] sSQLNoMul = new string[ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value)];
+ //string[] sSQLNoMul = new string[ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value)];
+ string[] sSQLNoMul = new string[1];
int nn = 0;
//
for (int i = k; i < HBQty; i++) //浠嶬鍒版�诲寘鏁帮紝 鏄疮鍔犵殑鏂瑰紡
@@ -1712,10 +1713,12 @@
k = k + 1;
n = n + 1;
//oWeb.getRunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
- sSQLNoMul[nn] = " exec h_p_WMS_SetMaxNo '" + sTMNumber + "' ";
+ //sSQLNoMul[nn] = " exec h_p_WMS_SetMaxNo '" + sTMNumber + "' ";
nn = nn + 1;
}
//鍚庡彴鎵归噺鎵ц璇彞
+
+ sSQLNoMul[0] = " exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "',"+ nn.ToString() + " ";
if (oWeb.getRunProcByMul_Back(sSQLNoMul, ref DBUtility.ClsPub.sExeReturnInfo) == false)
{
MessageBox.Show("鏉＄爜鐢熸垚澶辫触,鎵归噺鐢熸垚娴佹按鍙峰け璐ワ紒");
--
Gitblit v1.9.1