From 7e3dcb837f59ba78fca9ceec874ec8ab2beaa49c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期日, 21 一月 2024 12:43:45 +0800
Subject: [PATCH] 销售订单变更单:保存与审核时,判定新数量是否大于源单的出库关联数量与生产关联数量

---
 WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs
index 1d424a4..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)

--
Gitblit v1.9.1