From 6c663b92b0078aa89657df22ec188dff65599f04 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 21 十月 2025 17:24:38 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs |   95 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 90 insertions(+), 5 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs"
index bbbd858..87df8eb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs"
@@ -1,5 +1,9 @@
-锘縰sing Masuit.Tools;
+锘縰sing Mapster;
+using Masuit.Tools;
+using SqlSugar;
 using System.ComponentModel.DataAnnotations;
+using System.Linq.Expressions;
+using WIDESEA_Core.BaseRepository;
 using WIDESEA_DTO.Basic;
 using WIDESEA_IOrderRepository;
 
@@ -8,9 +12,47 @@
 public class BoxingInfoService : ServiceBase<DtBoxingInfo, IBoxingInfoRepository>, IBoxingInfoService
 {
     private readonly IDt_InboundOrderRepository _inboundOrderRepository;
-    public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository) : base(BaseDal)
+    private readonly IUnitOfWorkManage _unitOfWorkManage;
+    public BoxingInfoService(IBoxingInfoRepository BaseDal, IDt_InboundOrderRepository inboundOrderRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
     {
         _inboundOrderRepository = inboundOrderRepository;
+        _unitOfWorkManage = unitOfWorkManage;
+    }
+    public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
+    {
+        string wheres = ValidatePageOptions(options);
+        //鑾峰彇鎺掑簭瀛楁
+        Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+        List<OrderByModel> orderByModels = new List<OrderByModel>();
+        foreach (var item in orderbyDic)
+        {
+            OrderByModel orderByModel = new()
+            {
+                FieldName = item.Key,
+                OrderByType = item.Value
+            };
+            orderByModels.Add(orderByModel);
+        }
+
+
+        int totalCount = 0;
+        List<SearchParameters> searchParametersList = new List<SearchParameters>();
+        if (!string.IsNullOrEmpty(options.Wheres))
+        {
+            try
+            {
+                searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+                options.Filter = searchParametersList;
+            }
+            catch { }
+        }
+        var data = BaseDal.Db.Queryable<DtBoxingInfo>()
+            .Includes(x => x.BoxingInfoDetails)
+            .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+            .OrderBy(orderByModels)
+            .ToPageList(options.Page, options.Rows, ref totalCount);
+        new PageGridData<DtBoxingInfo>(totalCount, data);
+        return new PageGridData<DtBoxingInfo>(totalCount, data);
     }
 
     public async Task<WebResponseContent> AddBoxingInfoAsync(AddBoxingDto boxingInfo)
@@ -18,6 +60,10 @@
         WebResponseContent content = new WebResponseContent();
         try
         {
+            if(boxingInfo == null || boxingInfo.OrderNos.IsNullOrEmpty() || boxingInfo.palletCode.IsNullOrEmpty())
+            {
+                return content.Error("鍙傛暟閿欒");
+            }
             var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.palletCode);
             if (!info.IsNullOrEmpty())
             {
@@ -80,18 +126,57 @@
                     BoxingInfoDetails= details
                 };
                 await BaseDal.AddDataNavAsync(boxing);
+                content.OK("缁勭洏鎴愬姛");
             }
             return content;
         }
         catch (Exception ex)
         {
-            return content.OK();
+            return content.Error(ex.Message);
         }
     }
 
-    public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
+    public async Task<WebResponseContent> DeleteBoxingInfoAsync(AddBoxingDto boxingInfo)
     {
-        return base.GetPageData(options);
+        WebResponseContent content = new WebResponseContent();
+        try
+        {
+            if (boxingInfo == null || boxingInfo.palletCode.IsNullOrEmpty())
+            {
+                return content.Error("鍙傛暟閿欒");
+            }
+            var boxing = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == boxingInfo.palletCode);
+            if (!boxing.IsNullOrEmpty())
+            {
+                DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
+                boxingInfo_Hty.ModifyDate = DateTime.Now;
+                await _unitOfWorkManage.UseTranAsync(async () =>
+                {
+                    await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
+                                            .Include(x => x.BoxingInfoDetails)
+                                            .ExecuteCommandAsync();
+                    await AddBoxingHtyAsync(boxingInfo_Hty);
+                });
+                content.OK("瑙ｇ洏鎴愬姛");
+            }
+            else
+            {
+                content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
+            }
+            return content;
+        }
+        catch (Exception ex)
+        {
+            return content.Error(ex.Message);
+        }
+    }
+    private async Task AddBoxingHtyAsync(DtBoxingInfo_Hty boxingInfo)
+    {
+        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(boxingInfo).IncludesAllFirstLayer().ExecuteCommandAsync();
+        if (!isStockAdd)
+        {
+            throw new Exception("缁勭洏鍘嗗彶淇℃伅娣诲姞澶辫触");
+        }
     }
 
     // 楠岃瘉妯″瀷

--
Gitblit v1.9.3