feat: 包装管理和车次管理接口功能增强

- 新增包装分类获取接口
- 包装列表增加分类信息、包装内数量和车次关联筛选
- 保存包装支持分类字段
- 车次关联包装增加重复校验

SGGL/BLL/API/HJGL/APITrainNumberManagerService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace BLL
@@ -53,6 +53,11 @@ namespace BLL
             {
                 throw new Exception("当前包装状态不可修改车次号");
             }
+            // 检查包装是否已关联其他车次
+            if (!string.IsNullOrEmpty(packModel.TrainNumberId) && packModel.TrainNumberId != trainNumberId)
+            {
+                throw new Exception("该包装已在其他车次中存在，不能重复添加");
+            }
             packModel.TrainNumberId = trainNumberId;
             HJGLPackagingmanageService.UpdateHJGL_PackagingManage(packModel);
         }

SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs

@@ -1,4 +1,4 @@
-using FastReport.DevComponents.DotNetBar;
+using FastReport.DevComponents.DotNetBar;
 using FineUIPro;
 using Model;
 using System;
@@ -15,7 +15,9 @@ namespace BLL
     public static class HJGLPackagingmanageService
     {
         #region Fields
-
+        /// <summary>
+        /// 包装分类映射字典
+        /// </summary>
         public static Dictionary<string, int> CategoryIntMap = new Dictionary<string, int>
         {
             {  "打捆" ,(int)CategoryInt.打捆},
@@ -528,6 +530,20 @@ namespace BLL
                     {
                         baseQuery = baseQuery.Where(z => z.train.Id != null && z.train.Id.Contains(filter.TrainNumberId));
                     }
+                    // 是否关联车次筛选
+                    if (filter.HasTrainNumber.HasValue)
+                    {
+                        if (filter.HasTrainNumber.Value)
+                        {
+                            // 已关联车次：TrainNumberId 不为空
+                            baseQuery = baseQuery.Where(z => z.x.TrainNumberId != null && z.x.TrainNumberId != "");
+                        }
+                        else
+                        {
+                            // 未关联车次：TrainNumberId 为空
+                            baseQuery = baseQuery.Where(z => z.x.TrainNumberId == null || z.x.TrainNumberId == "");
+                        }
+                    }
                 }
 
                 baseQuery = baseQuery.OrderByDescending(z => (z.x.ReceiveDate ?? DateTime.MinValue)).ThenBy(z => z.x.PackagingCode);
@@ -545,6 +561,9 @@ namespace BLL
                              ReceiveMan = z.train.ContactName,
                              ReceiveDate = string.Format("{0:g}", z.x.ReceiveDate),
                              TrainNumber = z.train.TrainNumber,
+                             ComponentCount = db.HJGL_PackagingManageDetail.Count(d => d.PackagingManageId == z.x.PackagingManageId),
+                             CategoryInt = z.x.CategoryInt,
+                             CategoryString = z.x.CategoryInt == 10 ? "打捆" : (z.x.CategoryInt == 20 ? "装箱" : (z.x.CategoryInt == 30 ? "散装" : ""))
                          }).Distinct();
 
                 totalCount = q.Count();

SGGL/Model/APIItem/HJGL/PackagingManageItem.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -20,6 +20,18 @@ namespace Model
         public string ReceiveMan { get; set; }
         public string ReceiveDate { get; set; }
         public string TrainNumber { get; set; }
+        /// <summary>
+        /// 包装内数量（预制组件或散件数量）
+        /// </summary>
+        public int ComponentCount { get; set; }
+        /// <summary>
+        /// 包装分类代码
+        /// </summary>
+        public int? CategoryInt { get; set; }
+        /// <summary>
+        /// 包装分类名称
+        /// </summary>
+        public string CategoryString { get; set; }
 
 
     }

SGGL/Model/HJGL/PreDesign/PackagingManage/PackagingManageInput.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -55,5 +55,9 @@ namespace Model
         /// 车次id
         /// </summary>
         public string TrainNumberId { get; set; }
+        /// <summary>
+        /// 是否关联车次（true:已关联, false:未关联, null:不筛选）
+        /// </summary>
+        public bool? HasTrainNumber { get; set; }
     }
 }

SGGL/Model/HJGL/PreDesign/PackagingManage/PackagingManageOutput.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -31,6 +31,10 @@ namespace Model
         public string TypeString { get; set; }
         public int? CategoryInt { get; set; }
         public string CategoryString { get; set; }
+        /// <summary>
+        /// 包装内数量（预制组件或散件数量）
+        /// </summary>
+        public int ComponentCount { get; set; }
 
 
         #endregion Properties

SGGL/WebAPI/Controllers/HJGL/PreDesign/PackagingManageController.cs

@@ -1,4 +1,4 @@
-using BLL;
+using BLL;
 using Model;
 using System;
 using System.Collections.Generic;
@@ -229,6 +229,26 @@ namespace WebAPI.Controllers
             return responeData;
         }
 
+        /// <summary>
+        /// 获取包装分类列表
+        /// </summary>
+        /// <returns>包装分类字典</returns>
+        [HttpGet]
+        public Model.ResponeData GetPackagingCategories()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = HJGLPackagingmanageService.CategoryIntMap;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
         #endregion Methods
     }
 }