From f929e794ed9deafe75653d58839fe42df7d2e6aa Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 25 十月 2025 17:00:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index afe83fa..a071de3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -105,6 +105,8 @@
_row["kcQty"] = dym.kcQty; //搴撳瓨鏁伴噺
_row["depotId"] = dym.depotId; //搴撳瓨鏁伴噺
_row["depotName"] = dym.depotName; //搴撳瓨鏁伴噺
+ _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd");
+ _row["fEntrynote"] = dym.entryNote; ;
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
@@ -368,13 +370,11 @@
MsgHelper.ShowError("閿�鍞崟鐗╂枡鏄庣粏涓嶈兘涓虹┖锛�");
return;
}
-
if (string.IsNullOrEmpty(row["depotId"].ToString()))
{
MsgHelper.ShowError("璇烽�夋嫨鍙戣揣浠撳簱锛�");
return;
}
-
_obj.list.Add(new
{
Guid = _guid,
@@ -382,6 +382,7 @@
Sqsl = (row["fMustQty"].ToString()),
Bz = (row["fEntrynote"].ToString()),
Yjsj = (row["YjfhDate"].ToString()),
+ depotId = (row["depotId"].ToString()),
});
}
}
@@ -710,5 +711,7 @@
};
frm.ShowDialog();
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3