From e376ae7ff7dc914a91032a9e5954fca28b20287d Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 27 八月 2025 09:06:16 +0800
Subject: [PATCH] 直接调拨免扫物料条码上传方法修改，条码状态更新导入模块优化
---
WarM/数据导入/Gy_DataIn_UpDateBarCodeStatus.cs | 16 ++++++++++------
WebAPI/Controllers/条码管理/WEBSController.cs | 2 +-
LMES/LMES.csproj | 4 ++++
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index baf72fa..26fef8f 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -91,6 +91,10 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
+ <Reference Include="WebAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\x86\Debug\WebAPI.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ClsShowMod.cs" />
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 != "")
{
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 9fa1b18..2b95002 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -3954,7 +3954,7 @@
//鏁伴噺涓庢簮鍗曟暟閲忎笉涓�鑷存椂锛屾洿鏂版潯鐮佸嚭鍏ュ簱涓存椂琛� HQty 瀛楁鍊�
if (item.HQty != item.HQtyMust)
{
- oCn.RunProc("Update KF_PonderationBillMain_Temp set HQty=" + item.HQty.ToString() + " where HInterID= " + websLsmain.HInterID.ToString() + " and HBillType='" + websLsmain.HBillType + "' and HSourceInterID= " + item.HSourceInterID.ToString() + " and HSourceEntryID= " + item.HSourceEntryID.ToString());
+ oCn.RunProc("Update KF_PonderationBillMain_Temp set HQty2=" + item.HQty.ToString() + " where HInterID= " + websLsmain.HInterID.ToString() + " and HBillType='" + websLsmain.HBillType + "' and HSourceInterID= " + item.HSourceInterID.ToString() + " and HSourceEntryID= " + item.HSourceEntryID.ToString());
}
}
--
Gitblit v1.9.1