From 2b0d3b1a9f62e5ec48e4b559f95b3d4bdc3bee09 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 01 4月 2025 10:45:22 +0800
Subject: [PATCH] 打印支持 10张

---
 LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码.btw                                                  |    0 
 LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码 - 支持10个板前的备份.btw                                     |    0 
 LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs |   10 +++++++++-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index d4bb416..03a8218 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -345,6 +345,13 @@
                         var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
                         var gg = mylist.GroupBy(x => new { x.DetailName, x.Info16 });
                         int i = 0;
+                        int maxCount = 10;
+                        if (gg.Count() > 10)
+                        {
+                            errMsg = $"鎵撳嵃閿欒 鎵撳嵃鏈哄悕绉皗_PrinterName},閿欒淇℃伅锛氭墦鍗拌秴鍑轰簡闄愬埗鏉℃暟锛屾渶澶т笉鑳借秴杩噞maxCount}鏉★紝瀹為檯{gg.Count()}鏉�";
+                            Log4NetHelper.WriteErrorLog(LogType.Print, errMsg, null);
+                            return;
+                        }
                         foreach (var g in gg)
                         {
                             i++;
@@ -353,7 +360,8 @@
                             data.Add("detail_" + i + "_number", g.ToList().Count());//閮ㄤ欢鏁伴噺
                         }
                         //杩欎釜鍦版柟鏄皢鍓╀笅鐨勬暟鎹� 娓呯┖ 
-                        for (int p = (i + 1); p <= 6; p++)
+                        //鏈�澶у�兼敼涓� 10  銆怑ditby shaocx,2025-03-31銆�
+                        for (int p = (i + 1); p <= maxCount; p++)
                         {
                             data.Add("detail_" + p, "");//閮ㄤ欢鍚嶇О
                             data.Add("detail_" + p + "_length", "");//閮ㄤ欢灏哄
diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201 - \346\224\257\346\214\20110\344\270\252\346\235\277\345\211\215\347\232\204\345\244\207\344\273\275.btw" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201 - \346\224\257\346\214\20110\344\270\252\346\235\277\345\211\215\347\232\204\345\244\207\344\273\275.btw"
new file mode 100644
index 0000000..ccc57a3
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201 - \346\224\257\346\214\20110\344\270\252\346\235\277\345\211\215\347\232\204\345\244\207\344\273\275.btw"
Binary files differ
diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
index ccc57a3..d074464 100644
--- "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
Binary files differ

--
Gitblit v1.9.3