From efe75a69d2b6e3efa6b52cb00b8b824c3afd1ccd Mon Sep 17 00:00:00 2001
From: jl <jialigo@163.com>
Date: Tue, 10 Jun 2025 14:07:58 +0800
Subject: [PATCH]

---
 Epost.BLL/Work_DisplayJobThread.cs            |  2 +-
 Epost.BLL/Work_ScanThread.cs                  | 19 ++++++++-------
 .../PublishProfiles/Toolsweb.pubxml.user      | 24 +++++++++----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Epost.BLL/Work_DisplayJobThread.cs b/Epost.BLL/Work_DisplayJobThread.cs
index 96e8181..7778554 100644
--- a/Epost.BLL/Work_DisplayJobThread.cs
+++ b/Epost.BLL/Work_DisplayJobThread.cs
@@ -140,7 +140,7 @@ namespace Epost.BLL
                                 showmodel.Wholeqty = SumCkQuantity;
                                 showmodel.Unit = "件";
                                 showmodel.Wholeunit = "箱";
-                                showmodel.Contents = queueDT.Rows[0]["sku"].ToString() + "\r规格： " + discount + " \r总数量：" + zcount; ;
+                                showmodel.Contents = queueDT.Rows[0]["sku"].ToString() + "\r规格： " + discount + " \r总数量：" + zcount;  
                             }
                             comBLL.ShowBoxMessage_M(showmodel);//点亮显示标签 
                             #endregion
diff --git a/Epost.BLL/Work_ScanThread.cs b/Epost.BLL/Work_ScanThread.cs
index ef686f8..5c45d42 100644
--- a/Epost.BLL/Work_ScanThread.cs
+++ b/Epost.BLL/Work_ScanThread.cs
@@ -260,21 +260,22 @@ namespace Epost.BLL
                             int SumCkQuantity = 0;//= Convert.ToInt32(skudt.Rows[0]["SumCkQuantity"].ToString());
                                                   //散件总数
                             int SumQuantity = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
-                            //if (discount != 1)
-                            //{
-                            //    if (SumQuantity >= discount)
-                            //    {
+                            int zcount = Convert.ToInt32(skudt.Rows[0]["SumQuantity"].ToString());
+                            if (discount != 1)
+                            {
+                                if (SumQuantity >= discount)
+                                {
 
-                            //        SumCkQuantity = SumQuantity / discount;
-                            //        SumQuantity = SumQuantity % discount;
-                            //    }
-                            //}
+                                    SumCkQuantity = SumQuantity / discount;
+                                    SumQuantity = SumQuantity % discount;
+                                }
+                            }
                             ShowMessageModel_M show = new ShowMessageModel_M();
                             show.Title = skudt.Rows[0]["goodsname"].ToString();
                             show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
                             show.Block = item.block;
                             show.Islock = true;
-                            show.Contents = data.Parameter + "(" + scanStr + ")\r";// + "规格：" + discount;
+                            show.Contents = data.Parameter + "(" + scanStr + ")\r规格：" + discount + " \r总数量：" + zcount;
                             show.Qty = SumQuantity.ToString();
                             show.Wholeqty = SumCkQuantity;
                             show.Unit = "件";
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 9b63599..72b73ce 100644
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@@ -7,7 +7,7 @@
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl>
-    <History>True|2025-06-09T03:40:40.2739751Z||;True|2025-06-08T16:20:45.8519262+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;True|2024-11-01T16:04:56.3535724+08:00||;True|2024-09-01T10:13:37.1598955+08:00||;True|2024-08-31T17:27:57.5375469+08:00||;True|2022-07-15T16:41:13.9750291+08:00||;True|2022-07-14T14:02:20.7983427+08:00||;True|2022-07-13T17:40:22.7531000+08:00||;True|2022-07-13T17:34:22.9908701+08:00||;True|2022-07-13T17:30:06.3588502+08:00||;True|2022-07-11T10:32:06.9053981+08:00||;True|2021-04-26T10:07:37.4889549+08:00||;True|2021-04-09T10:32:51.9130162+08:00||;True|2021-04-09T10:31:50.4974012+08:00||;</History>
+    <History>True|2025-06-10T05:21:34.1684919Z||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;True|2024-11-01T16:04:56.3535724+08:00||;True|2024-09-01T10:13:37.1598955+08:00||;True|2024-08-31T17:27:57.5375469+08:00||;True|2022-07-15T16:41:13.9750291+08:00||;True|2022-07-14T14:02:20.7983427+08:00||;True|2022-07-13T17:40:22.7531000+08:00||;True|2022-07-13T17:34:22.9908701+08:00||;True|2022-07-13T17:30:06.3588502+08:00||;True|2022-07-11T10:32:06.9053981+08:00||;True|2021-04-26T10:07:37.4889549+08:00||;True|2021-04-09T10:32:51.9130162+08:00||;True|2021-04-09T10:31:50.4974012+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -33,19 +33,19 @@
       <publishTime>04/04/2018 15:45:12</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>06/09/2025 11:53:17</publishTime>
+      <publishTime>06/10/2025 13:32:17</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>06/09/2025 11:53:17</publishTime>
+      <publishTime>06/10/2025 13:32:17</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>02/24/2020 15:29:24</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>06/09/2025 11:40:16</publishTime>
+      <publishTime>06/10/2025 13:21:07</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>06/09/2025 11:40:16</publishTime>
+      <publishTime>06/10/2025 13:21:07</publishTime>
     </File>
     <File Include="bin/ComposerSDK.dll">
       <publishTime>04/29/2020 16:50:14</publishTime>
@@ -63,25 +63,25 @@
       <publishTime>10/23/2017 13:15:20</publishTime>
     </File>
     <File Include="bin/Epost.BLL.dll">
-      <publishTime>06/09/2025 11:53:06</publishTime>
+      <publishTime>06/10/2025 13:32:07</publishTime>
     </File>
     <File Include="bin/Epost.BLL.pdb">
-      <publishTime>06/09/2025 11:53:06</publishTime>
+      <publishTime>06/10/2025 13:32:07</publishTime>
     </File>
     <File Include="bin/Epost.BLL.XmlSerializers.dll">
       <publishTime>08/26/2020 18:09:48</publishTime>
     </File>
     <File Include="bin/Epost.DAL.dll">
-      <publishTime>06/09/2025 11:40:16</publishTime>
+      <publishTime>06/10/2025 13:21:08</publishTime>
     </File>
     <File Include="bin/Epost.DAL.pdb">
-      <publishTime>06/09/2025 11:40:16</publishTime>
+      <publishTime>06/10/2025 13:21:08</publishTime>
     </File>
     <File Include="bin/Epost.DPS.dll">
-      <publishTime>06/09/2025 11:53:08</publishTime>
+      <publishTime>06/10/2025 13:32:09</publishTime>
     </File>
     <File Include="bin/Epost.DPS.pdb">
-      <publishTime>06/09/2025 11:53:08</publishTime>
+      <publishTime>06/10/2025 13:32:09</publishTime>
     </File>
     <File Include="bin/Epost.Model.dll">
       <publishTime>06/08/2025 16:20:17</publishTime>
@@ -5652,7 +5652,7 @@
       <publishTime>05/30/2022 16:58:47</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>06/09/2025 11:53:10</publishTime>
+      <publishTime>06/10/2025 13:32:11</publishTime>
     </File>
     <File Include="Scripts/ai.0.22.9-build00167.js">
       <publishTime>04/04/2018 15:45:12</publishTime>