From ff1f14aa3e83bf9084991c2e411f1d838a9ba81b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 一月 2024 09:51:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs
index dba32a3..4683155 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs
@@ -359,7 +359,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勯攢鍞鍗曞彉鏇村崟锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -482,13 +482,20 @@
else
{
double HRelationQty = 0;
+ double HRelationQty_ICMO = 0;
//鑾峰彇閿�鍞鍗曞彉鏇村崟涓搴旂墿鏂欏湪婧愬崟-閿�鍞鍗曚腑鐨勫叧鑱旀暟閲�
HRelationQty = double.Parse(ds.Tables[0].Rows[0]["HRelationQty"].ToString());
+ HRelationQty_ICMO = double.Parse(ds.Tables[0].Rows[0]["HRelationQty_ICMO"].ToString());
- //鍒ゆ柇鐗╂枡鏂版暟閲忔槸鍚﹀皬浜庢簮鍗曞崟鎹腑瀵瑰簲鐗╂枡鐨勫叧鑱旀暟閲�
+ //鍒ゆ柇鐗╂枡鏂版暟閲忔槸鍚﹀皬浜庢簮鍗曞崟鎹腑瀵瑰簲鐗╂枡鐨勫嚭搴撳叧鑱旀暟閲�
if (oSub.HQty_New < HRelationQty)
{
- errorMessage += "绗�" + oSub.HEntryID + "琛岀墿鏂欐柊鏁伴噺灏忎簬婧愬崟-閿�鍞鍗曡鍏宠仈鏁伴噺!";
+ errorMessage += "绗�" + oSub.HEntryID + "琛岀墿鏂欐柊鏁伴噺灏忎簬婧愬崟-閿�鍞鍗曞嚭搴撳叧鑱旀暟閲�!";
+ }
+ //鍒ゆ柇鐗╂枡鏂版暟閲忔槸鍚﹀皬浜庢簮鍗曞崟鎹腑瀵瑰簲鐗╂枡鐨勫嚭搴撳叧鑱旀暟閲�
+ if (oSub.HQty_New < HRelationQty_ICMO)
+ {
+ errorMessage += "绗�" + oSub.HEntryID + "琛岀墿鏂欐柊鏁伴噺灏忎簬婧愬崟-閿�鍞鍗曠敓浜у叧鑱旀暟閲�!";
}
//鍒ゆ柇鏂颁氦璐ф棩鏈熸槸鍚︽棭浜庡綋鏃�
if (oSub.HDate_New.CompareTo(today) < 0)
@@ -532,7 +539,7 @@
sql = "exec h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill " + oBill.omodel.HInterID;
oCN.RunProcReturn(sql, "h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill");
//淇＄敤鎺у埗
- sql = "exec h_p_Kf_CheckSeOrderBill_CrediControl " + oBill.omodel.HMainSourceInterID;
+ sql = "exec h_p_Kf_CheckSeOrderChangeBill_CrediControl " + oBill.omodel.HMainSourceInterID;
ds = oCN.RunProcReturn(sql, "h_p_Kf_CheckSeOrderBill_CrediControl");
if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
{
--
Gitblit v1.9.1