From 95fd08692e404e5b3c547bdb3c9d0cc8023ff0be Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 09 八月 2025 16:42:40 +0800
Subject: [PATCH] 1、到货条码打印新增合并明细

---
 DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 4594b5b..1564021 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -106,6 +106,7 @@
                             _row["bld002"] = dym.itemNo;//鐗╂枡缂栧彿 
                             _row["bld003"] = dym.itemName;//鐗╂枡鍚嶇О
                             _row["bld004"] = dym.itemModel;//瑙勬牸鍨嬪彿
+                            _row["kbsl"] = dym.kbsl;
                             _row["dwName"] = dym.dwName;
                             _row["dabGuid"] = dym.dabGuid;
                             _row["bld013"] = idx.ToString();//椤规
@@ -363,11 +364,31 @@
                 {
                     Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                     string _msl = row["bld007"].ToString();
+                    string _kbsl = row["kbsl"].ToString();
                     if (string.IsNullOrEmpty(_msl))
                     {
                         MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
                         return;
                     }
+
+                    if (decimal.TryParse(row["bld007"].ToString(), out decimal msl) &&
+                        decimal.TryParse(row["kbsl"].ToString(), out decimal kbsl))
+                    {
+                        if (msl > kbsl)
+                        {
+                            MsgHelper.ShowError("" +
+                                "鐢宠鏁伴噺涓嶈兘澶т簬鍙ˉ鏁伴噺锛�");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        // 瑙f瀽澶辫触鐨勫鐞�
+                        MsgHelper.ShowError("" +
+                                "杈撳叆鐨勪笉鏄湁鏁堟暟瀛楋紒");
+                        return;
+                    }
+
                     _obj.list.Add(new
                     {
                         Guid = _guid,

--
Gitblit v1.9.3