From ef9a1e16ef73c4e06a469de65198bf5b6aae85cd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 30 十月 2025 11:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBS
---
CLOUDWEB/WebService1.asmx.cs | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index bcf6fc7..294eadc 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -60063,22 +60063,35 @@
{
sRelQty = omodel_View.HQty;
}
-
}
else
//鎵规鏉＄爜銆佸搧绉嶆潯鐮�
{
- if (HQty > 0)
+ if (oSystemParameterMain.WMS_CampanyName == "灏忓崼")
{
- sRelQty = HQty;
- }
- else if (omodel_View.HSourceQty > 0)
- {
- sRelQty = omodel_View.HSourceQty;
+ if (HQty > 0 && omodel_View.HQty > HQty)
+ {
+ sRelQty = HQty;
+ }
+ else
+ {
+ sRelQty = omodel_View.HQty;
+ }
}
else
{
- sRelQty = omodel_View.HQty;
+ if (HQty > 0)
+ {
+ sRelQty = HQty;
+ }
+ else if (omodel_View.HSourceQty > 0)
+ {
+ sRelQty = omodel_View.HSourceQty;
+ }
+ else
+ {
+ sRelQty = omodel_View.HQty;
+ }
}
}
@@ -61506,17 +61519,31 @@
else
//鎵规鏉＄爜銆佸搧绉嶆潯鐮�
{
- if (HQty > 0)
+ if (oSystemParameterMain.WMS_CampanyName == "灏忓崼")
{
- sRelQty = HQty;
- }
- else if (omodel_View.HSourceQty > 0)
- {
- sRelQty = omodel_View.HSourceQty;
+ if (HQty > 0 && omodel_View.HQty > HQty)
+ {
+ sRelQty = HQty;
+ }
+ else
+ {
+ sRelQty = omodel_View.HQty;
+ }
}
else
{
- sRelQty = omodel_View.HQty;
+ if (HQty > 0)
+ {
+ sRelQty = HQty;
+ }
+ else if (omodel_View.HSourceQty > 0)
+ {
+ sRelQty = omodel_View.HSourceQty;
+ }
+ else
+ {
+ sRelQty = omodel_View.HQty;
+ }
}
}
--
Gitblit v1.9.1