From 1dc303dbbbaf5b4182961611516120518476c623 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 27 九月 2022 13:04:01 +0800
Subject: [PATCH] 条码生成模块，生成条码时四维尔增加是否启用批号判断控制
---
SCM/条码打印/Gy_BarCodeBill.cs | 37 +++++++++++++++++++++++++++++++++----
SCM/公用类/ClsPub1.cs | 5 +----
2 files changed, 34 insertions(+), 8 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 e26538e..cb1bdc0 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"
@@ -14,11 +14,8 @@
//public static string WEBSURL = "http://124.70.129.242/WEBS-WMS/WebService1.asmx"; //闆呯惇璇�
//public static string WEBSURL = "http://192.168.1.29/WEBS-WMS/WebService1.asmx"; //鍦ｉ緳 鍐呯綉
//public static string WEBSURL = "http://122.227.138.236/WEBS-WMS/WebService1.asmx"; //鍦ｉ緳(涓嶇敤)
- public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 澶栫綉
- //public static string WEBSURL = "http://192.168.0.66/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鍐呯綉
- //public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS-TEST/WebService1.asmx"; //鍥涚淮灏旀祴璇�
//public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 澶栫綉
- //public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 鍐呯綉
+ public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 鍐呯綉
//public static string WEBSURL = "http://122.227.199.62:5050/LMESWEBS/WebService1.asmx"; //闊╃數 澶栫綉JIT锛堜笉鐢級
//public static string WEBSURL = "http://122.227.199.62:5050/WMSWEBS/WebService1.asmx"; //闊╃數 澶栫綉
//public static string WEBSURL = "http://192.168.10.60/WMSWEBS/WebService1.asmx"; //闊╃數 鍐呯綉瀹佹尝
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 f45ac67..67d024d 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"
@@ -643,13 +643,42 @@
}
else if (CampanyName == "鍥涚淮灏�")
{
- if (BarCodeCheckAuxPropID(ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value)) && ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value) == 0)
+ long sHMaterID = 0;
+ sHMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ if (sHMaterID != 0)
{
- MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 锛屽惎鐢ㄤ簡杈呭姪灞炴�э紝杈呭姪灞炴�у垪涓嶅厑璁镐负绌猴紝璇峰厛閫夋嫨瀵瑰簲杈呭姪灞炴�э紒");
- return false;
+ //鍒ゆ柇CLOUD鐗╂枡杈呭姪灞炴�ц〃閲岃鐗╂枡鏄惁鍚敤浜嗙墿鏂欏睘鎬э紙1涓哄惎鐢級
+ DataSet DS = oWeb.getDataSetBySQL("exec h_p_Gy_BarCodeCheckAuxPropID_CLD " + sHMaterID, "h_p_Gy_BarCodeCheckAuxPropID_CLD", ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ if (DS == null || DS.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 锛屽湪閲戣澏浜戜腑鏈煡璇㈠埌璇ョ墿鏂欎俊鎭紒");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["FISENABLE"]) == 1 && ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value) == 0)
+ {
+ MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 锛屽惎鐢ㄤ簡杈呭姪灞炴�э紝杈呭姪灞炴�у垪涓嶅厑璁镐负绌猴紝璇峰厛閫夋嫨瀵瑰簲杈呭姪灞炴�э紒");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBatchManager"]) == 1 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value) == "")
+ {
+ MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 锛屽惎鐢ㄦ壒娆＄鐞嗭紝鎵规涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBatchManager"]) == 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value) != "")
+ {
+ MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 锛屾湭鍚敤鎵规绠＄悊锛屼笉鍏佽鏈夋壒娆★紒");
+ return false;
+ }
}
- }
+ ////鍘熸帶鍒�
+ //if (BarCodeCheckAuxPropID(ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value)) && ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value) == 0)
+ //{
+ // MessageBox.Show(" 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 锛屽惎鐢ㄤ簡杈呭姪灞炴�э紝杈呭姪灞炴�у垪涓嶅厑璁镐负绌猴紝璇峰厛閫夋嫨瀵瑰簲杈呭姪灞炴�э紒");
+ // return false;
+ //}
+ }
}
if (CampanyName == "妫シ") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
{
--
Gitblit v1.9.1