From 6a2a02e183b0c0a8b01bebd0452bd0ac0bbed445 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 03 十一月 2025 16:26:34 +0800
Subject: [PATCH] 1
---
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 4 ++--
WebAPI/Controllers/基础资料/基础资料/Gy_PlanImplementation_ReportController.cs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index b440953..528db2a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -4547,11 +4547,11 @@
}
else
{
- tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HSPGroupID"].ToString();
}
string HWHID = tb2.Rows[i]["HWHID"].ToString();
//鏌ヨ浠撲綅
- ds = oCN.RunProcReturn("select * from Gy_StockPlace where HName='" + HSPName + "'and HSPGroupID=" + HWHID+ " and HUSEORGID=" + HORGid + "", "Gy_Warehouse");
+ ds = oCN.RunProcReturn("select * from Gy_StockPlace where HName='" + HSPName + "'and HSPGroupID=" + HWHID+ " and HUSEORGID=" + HORGid + "", "Gy_StockPlace");
if (ds.Tables[0].Rows.Count == 0)
{
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PlanImplementation_ReportController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PlanImplementation_ReportController.cs"
index fb41d63..028de70 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PlanImplementation_ReportController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PlanImplementation_ReportController.cs"
@@ -92,7 +92,7 @@
}
- ds = oCN.RunProcReturn($"exec h_p_OperationBill '{HBeginDate}','{HEndDate}',''{HEquipmentNumber}", "h_p_OperationBill");
+ ds = oCN.RunProcReturn($"exec h_p_OperationBill '{HBeginDate}','{HEndDate}','{HEquipmentNumber}'", "h_p_OperationBill");
// 娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index 35e5324..ce68c30 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
--
Gitblit v1.9.1