From fc2b252f59a8f891d5d0f5d2f7a3fc6278ca3b39 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 30 四月 2025 14:45:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.cs | 1 +
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs | 1 +
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs | 2 ++
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs | 1 +
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 1 +
WarM/条码打印/Gy_BarCodeBill_New.cs | 1 +
WarM/条码打印/Gy_BarCodeBill.cs | 1 +
WebAPI/Controllers/GG_NoticeController.cs | 2 +-
8 files changed, 9 insertions(+), 1 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 72fb226..a00dba1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -1943,6 +1943,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
index 36353ba..e7111db 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_New.cs"
@@ -1050,6 +1050,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index 622be66..f270974 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -1050,6 +1050,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
index 6627b0f..dae024a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -2243,6 +2243,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
index 2bcc8d5..93c7d97 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
@@ -2356,6 +2356,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
index 0f192e4..c2dce87 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
@@ -1009,6 +1009,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
index 42705a0..003b41e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -1156,6 +1156,7 @@
{
sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
}
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sMoney = Math.Ceiling(sMoney);
grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
@@ -1169,6 +1170,7 @@
{
sWMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HWMinQtyCol].Value);
}
+ sWMoney = Math.Round(sWMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
sWMoney = Math.Ceiling(sWMoney);
grdMain.Rows[sRow].Cells[HWBQtyCol].Value = sWMoney;
}
diff --git a/WebAPI/Controllers/GG_NoticeController.cs b/WebAPI/Controllers/GG_NoticeController.cs
index 35c2687..1362eae 100644
--- a/WebAPI/Controllers/GG_NoticeController.cs
+++ b/WebAPI/Controllers/GG_NoticeController.cs
@@ -318,7 +318,7 @@
try
{
List<object> columnNameList = new List<object>();
- var sql = "select top(10) m.HMakeDate as 鏃ユ湡, m.HLevel as 鐘跺喌, m.HContext as 涓婚 " +
+ var sql = "select top(10) m.HInterID,s.HEntryID,m.HMakeDate as 鏃ユ湡, m.HLevel as 鐘跺喌, m.HContext as 涓婚 " +
", m.HContext as 鍐呭" +
", m.HSendMan as 鍙戦�佷汉, s.HReceiveMan as 鎺ユ敹浜�, d.HName as 鍙戦�侀儴闂� " +
" from OA_InformBillMain as m" +
--
Gitblit v1.9.1