Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2025-04-30 fc2b252f59a8f891d5d0f5d2f7a3fc6278ca3b39

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 WarM/ÌõÂë´òÓ¡/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;
            }

 WarM/ÌõÂë´òÓ¡/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;
            }

 WarM/ÌõÂë´òÓ¡/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;
            }

 WarM/ÌõÂë´òÓ¡/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;
            }

 WarM/ÌõÂë´òÓ¡/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;
            }

 WarM/ÌõÂë´òÓ¡/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;
            }

 WarM/ÌõÂë´òÓ¡/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;
            }

 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" +