13寸强制归类厚度和实际厚度一样

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -660,11 +660,16 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (width > 7)
             else if (width > 7)
             {
             {
+                var forceSame = ConfigHelper.Config.Get("13寸强制归类厚度和实际厚度一样", true);
                 var height28MinActualHeight = ConfigHelper.Config.Get($"13寸高度归类为28mm的最小实际高度", 22);
                 var height28MinActualHeight = ConfigHelper.Config.Get($"13寸高度归类为28mm的最小实际高度", 22);
                 var height28MaxActualHeight = ConfigHelper.Config.Get($"13寸高度归类为28mm的最大实际高度", 28);
                 var height28MaxActualHeight = ConfigHelper.Config.Get($"13寸高度归类为28mm的最大实际高度", 28);
                 if (LastTotalHeight >= height28MinActualHeight && LastTotalHeight <= height28MaxActualHeight)
                 if (LastTotalHeight >= height28MinActualHeight && LastTotalHeight <= height28MaxActualHeight)
                 {
                 {
                     LastHeight = 28;
                     LastHeight = 28;
+                    if(forceSame)
+                    {
+                        LastTotalHeight = LastHeight;
+                    }
                     LogUtil.info($"实际高度在{height28MinActualHeight}与{height28MaxActualHeight}，实际高度归类为28");
                     LogUtil.info($"实际高度在{height28MinActualHeight}与{height28MaxActualHeight}，实际高度归类为28");
                 }
                 }
                 var height20MinActualHeight = ConfigHelper.Config.Get($"13寸高度归类为20mm的最小实际高度", 16);
                 var height20MinActualHeight = ConfigHelper.Config.Get($"13寸高度归类为20mm的最小实际高度", 16);
@@ -672,12 +677,20 @@ namespace OnlineStore.DeviceLibrary
                 if (LastTotalHeight >= height20MinActualHeight && LastTotalHeight <= height20MaxActualHeight)
                 if (LastTotalHeight >= height20MinActualHeight && LastTotalHeight <= height20MaxActualHeight)
                 {
                 {
                     LastHeight = 20;
                     LastHeight = 20;
+                    if (forceSame)
+                    {
+                        LastTotalHeight = LastHeight;
+                    }
                     LogUtil.info($"实际高度在{height20MinActualHeight}与{height20MaxActualHeight}，实际高度归类为20");
                     LogUtil.info($"实际高度在{height20MinActualHeight}与{height20MaxActualHeight}，实际高度归类为20");
                 }
                 }
                 var height12MaxActualHeight = ConfigHelper.Config.Get($"13寸高度归类为12mm的最大实际高度", 16);
                 var height12MaxActualHeight = ConfigHelper.Config.Get($"13寸高度归类为12mm的最大实际高度", 16);
                 if (LastTotalHeight < height12MaxActualHeight)
                 if (LastTotalHeight < height12MaxActualHeight)
                 {
                 {
                     LastHeight = 12;
                     LastHeight = 12;
+                    if (forceSame)
+                    {
+                        LastTotalHeight = LastHeight;
+                    }
                     LogUtil.info($"实际高度小于{height12MaxActualHeight}，实际高度归类为12");
                     LogUtil.info($"实际高度小于{height12MaxActualHeight}，实际高度归类为12");
                 }
                 }
             }
             }