Răsfoiți Sursa

简化层配装箱相关类,优化代码结构

在多个文件中移除了冗余字段和方法,简化了类的结构,提高了可读性和可维护性。具体更改包括:

- `LayerPackingService.cs`:移除大量代码,简化整体结构。
- `LayerPackingBoxInfo.cs`、`LayerPackingConstraints.cs`、`LayerPackingLayerInfo.cs`、`LayerPackingProduct.cs`、`LayerPackingResult.cs`:移除多个字段和方法,优化性能和可维护性。
- `SxServiceExtension.cs` 和 `SXService.cs`:进行了重构和命名空间调整,提升代码组织性。
- `SxPackingHelp.cs`:新增空的静态类 `SxSpcPackingExtension`,为未来功能扩展做准备。
- `SxServiceHelp.cs`:添加焊点盘处理逻辑相关方法,增强装箱功能。
林豪 左 4 luni în urmă
părinte
comite
71da2de621

+ 3 - 3
wms.service/Extensions/LayerPacking/LayerPackingService.cs → wms.service/Help/LayerPacking/LayerPackingService.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using wms.service.Extensions.LayerPacking.model;
+using wms.service.Help.LayerPacking.model;
 
-namespace wms.service.Extensions.LayerPacking
+namespace wms.service.Help.LayerPacking
 {
     /// <summary>
     /// 层配装箱服务
@@ -1669,7 +1669,7 @@ namespace wms.service.Extensions.LayerPacking
                     item.Layer.Products[item.ProductIndex] = replacement;
                     usedIds.Remove(item.Product.Id);
                     usedIds.Add(replacement.Id);
-                    excessJoints -= (item.Product.SolderCount - replacement.SolderCount);
+                    excessJoints -= item.Product.SolderCount - replacement.SolderCount;
                 }
             }
 

+ 1 - 1
wms.service/Extensions/LayerPacking/model/LayerPackingBoxInfo.cs → wms.service/Help/LayerPacking/model/LayerPackingBoxInfo.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace wms.service.Extensions.LayerPacking.model
+namespace wms.service.Help.LayerPacking.model
 {
     /// <summary>
     /// 箱信息

+ 1 - 1
wms.service/Extensions/LayerPacking/model/LayerPackingConstraints.cs → wms.service/Help/LayerPacking/model/LayerPackingConstraints.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace wms.service.Extensions.LayerPacking.model
+namespace wms.service.Help.LayerPacking.model
 {
     /// <summary>
     /// 层配装箱约束条件

+ 2 - 2
wms.service/Extensions/LayerPacking/model/LayerPackingLayerInfo.cs → wms.service/Help/LayerPacking/model/LayerPackingLayerInfo.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace wms.service.Extensions.LayerPacking.model
+namespace wms.service.Help.LayerPacking.model
 {
     /// <summary>
     /// 层信息
@@ -88,7 +88,7 @@ namespace wms.service.Extensions.LayerPacking.model
         {
             var highCount = Products.Count(p => p.TorsChkValue >= highThreshold);
             var lowCount = Products.Count(p => p.TorsChkValue <= lowThreshold);
-            return (highCount == 0 && lowCount == 0) || (highCount == 1 && lowCount == 1);
+            return highCount == 0 && lowCount == 0 || highCount == 1 && lowCount == 1;
         }
 
         /// <summary>

+ 1 - 1
wms.service/Extensions/LayerPacking/model/LayerPackingProduct.cs → wms.service/Help/LayerPacking/model/LayerPackingProduct.cs

@@ -1,7 +1,7 @@
 using System;
 using wms.dto;
 
-namespace wms.service.Extensions.LayerPacking.model
+namespace wms.service.Help.LayerPacking.model
 {
     /// <summary>
     /// 层配产品信息

+ 1 - 1
wms.service/Extensions/LayerPacking/model/LayerPackingResult.cs → wms.service/Help/LayerPacking/model/LayerPackingResult.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace wms.service.Extensions.LayerPacking.model
+namespace wms.service.Help.LayerPacking.model
 {
     /// <summary>
     /// 装箱结果

+ 15 - 0
wms.service/Help/Packing/SxSpcPackingHelp.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace wms.service.Help.Packing
+{
+    /// <summary>
+    /// SPC装箱逻辑
+    /// </summary>
+    public static class SxSpcPackingHelp
+    {
+        #region 验证预占箱数
+        #endregion
+    }
+}

+ 14 - 0
wms.service/Help/SxPackingHelp.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace wms.service.Help
+{
+    /// <summary>
+    /// 封装箱扩展
+    /// </summary>
+    public static class SxSpcPackingExtension
+    {
+    }
+}

+ 3 - 3
wms.service/Extensions/SxServiceExtension.cs → wms.service/Help/SxServiceHelp.cs

@@ -17,12 +17,12 @@ using wms.sqlsugar;
 using wms.sqlsugar.model.sx;
 using wms.util.Ext;
 
-namespace wms.service.Extensions
+namespace wms.service.Help
 {
     /// <summary>
     /// 时效服务扩展
     /// </summary>
-    public static class SxServiceExtension
+    public static class SxServiceHelp
     {
         #region 焊点计算
 
@@ -46,7 +46,7 @@ namespace wms.service.Extensions
             }
 
             // 计算需要获取的焊点盘数量
-            int itemsPerBox = (rule.SpoolType == "BS60" || rule.SpoolType == "BS40") ? 72 : 36;
+            int itemsPerBox = rule.SpoolType == "BS60" || rule.SpoolType == "BS40" ? 72 : 36;
             int requiredSolderBoxes = Math.Max(0, rule.FullCountQty / itemsPerBox * rule.SolderMaxCount);
 
             // 获取所有带焊点的盘并排序

Fișier diff suprimat deoarece este prea mare
+ 777 - 773
wms.service/Service/SXService.cs


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff