From 3f745fba68b1ec4e2bac4eff026f9db35fa9518c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 29 八月 2025 09:11:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/数据导入/Gy_DataIn_UpDateBarCodeStatus.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git "a/WarM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_UpDateBarCodeStatus.cs" "b/WarM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_UpDateBarCodeStatus.cs"
index 112807e..ec8c0ed 100644
--- "a/WarM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_UpDateBarCodeStatus.cs"
+++ "b/WarM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_UpDateBarCodeStatus.cs"
@@ -69,11 +69,15 @@
HBarCodeStatus = DBUtility.ClsPub.isStrNull(grdmain.Rows[i].Cells[sHBarCodeStatusCol].Value);
//必填项判断
- if (HBarCode == "")
- {
- sHRemark = sHRemark + "第" + DBUtility.ClsPub.isStrNull(i + 1) + "行，条码编号不能为空！";
- }
- else
+ //if (HBarCode == "")
+ //{
+ // sHRemark = sHRemark + "第" + DBUtility.ClsPub.isStrNull(i + 1) + "行，条码编号不能为空！";
+ //}
+ //else
+ //{
+ // b = true;
+ //}
+ if (HBarCode != "")
{
b = true;
}
@@ -222,7 +226,7 @@
}
OpenExcelFile.Title = "Open Excel File ";
OpenExcelFile.FileName = "";
- OpenExcelFile.Filter = "Microsoft Office Excel Files(*.xls)|*.xls";
+ OpenExcelFile.Filter = "Microsoft Office Excel Files(*.xls;*.xlsx)|*.xls;*.xlsx";
OpenExcelFile.ShowDialog();
if (OpenExcelFile.FileName != "")
{
--
Gitblit v1.9.1