From a0597a2720e9d5061d5de16bf683183618ad5356 Mon Sep 17 00:00:00 2001
From: 孙世强 <sunshiqiang@ng.com>
Date: 星期五, 14 十一月 2025 17:03:38 +0800
Subject: [PATCH] 1.MES数据库存在变更，适配现有的mes数据库2.新增mes的数据库ip和端口设置
---
optimize_patch/订单排样客户端/EDIT/任务.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git "a/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\344\273\273\345\212\241.cs" "b/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\344\273\273\345\212\241.cs"
index 17e2f71..05cce19 100644
--- "a/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\344\273\273\345\212\241.cs"
+++ "b/optimize_patch/\350\256\242\345\215\225\346\216\222\346\240\267\345\256\242\346\210\267\347\253\257/EDIT/\344\273\273\345\212\241.cs"
@@ -4582,7 +4582,7 @@
cmbGlassType.Focus();
return;
};
-
+ projectnameText.Text = "";
Logger.Info($"鏌ヨ浜嗭細{gThick}mm鍘氬害{gType} 鐜拌ˉ灏忕墖");
if (globel.UserGroup == "琛ョ墖")
{
@@ -6407,7 +6407,16 @@
foreach (DataRow dr in dt.Rows)
{
string gThick = dr["thickness"].ToString();
- string gType = dr["filmsid"].ToString();
+ string gType = "";
+ if (globel.CustomerName == "涔変箤")
+ {
+ gType = dr["filmsid"].ToString();
+ }
+ else {
+ //films_id
+ gType = dr["films_id"].ToString();
+ }
+
if (!lisGlassThick.Contains(gThick))
{
--
Gitblit v1.8.0