Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.ContainerManagementApi/Controllers/CM_BaseInfoController.cs

@@ -66,5 +66,16 @@ public class CM_BaseInfoController : ApiController
         return res;
     }
 
+    /// <summary>
+    /// 校验箱号
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("CM_CheckCntrno")]
+    public DataResult<CM_CheckCntrnoRes> CM_CheckCntrno([FromBody] CM_CheckCntrno model)
+    {
+        var res = _invokeService.CM_CheckCntrno(model);
+        return res;
+    }
 
 }

ds-wms-service/DS.WMS.Core/Code/Interface/ICodeCtnService.cs

@@ -88,4 +88,5 @@ public interface ICodeCtnService
     /// <returns></returns>
     Task<DataResult> LoadCache();
 
+    public bool ValidateContainerNumber(string containerNumber);
 }

ds-wms-service/DS.WMS.Core/Code/Method/CodeCtnService.cs

@@ -251,4 +251,95 @@ public class CodeCtnService:ICodeCtnService
 
         return DataResult.Failed(MultiLanguageConst.LoadCacheFailDataNull);
     }
+
+    #region 箱号校验
+    public static int numtostr(char strcode)
+    {
+        int result = 0;
+        if (strcode == 'A') result = 10;
+        if (strcode == 'B') result = 12;
+        if (strcode == 'C') result = 13;
+        if (strcode == 'D') result = 14;
+        if (strcode == 'E') result = 15;
+        if (strcode == 'F') result = 16;
+        if (strcode == 'G') result = 17;
+        if (strcode == 'H') result = 18;
+        if (strcode == 'I') result = 19;
+        if (strcode == 'J') result = 20;
+        if (strcode == 'K') result = 21;
+        if (strcode == 'L') result = 23;
+        if (strcode == 'M') result = 24;
+        if (strcode == 'N') result = 25;
+        if (strcode == 'O') result = 26;
+        if (strcode == 'P') result = 27;
+        if (strcode == 'Q') result = 28;
+        if (strcode == 'R') result = 29;
+        if (strcode == 'S') result = 30;
+        if (strcode == 'T') result = 31;
+        if (strcode == 'U') result = 32;
+        if (strcode == 'V') result = 34;
+        if (strcode == 'W') result = 35;
+        if (strcode == 'X') result = 36;
+        if (strcode == 'Y') result = 37;
+        if (strcode == 'Z') result = 38;
+
+        return result;
+
+    }
+    public bool ValidateContainerNumber(string containerNumber)
+    {
+        // 集装箱号的校验规则
+        // - 由4位字母（ISO代码）+ 6位数字 + 1位校验码组成
+        // - 校验码的计算方式是将字母转换为数字，然后按照一定的公式计算得出
+
+        if (containerNumber.Length != 11)
+        {
+            return false;
+        }
+
+        string letters = containerNumber.Substring(0, 4);
+        string numbers = containerNumber.Substring(4, 6);
+        string checkDigit = containerNumber.Substring(10, 1);
+
+        // 检查字母部分是否都是大写字母
+        if (!letters.All(char.IsUpper))
+        {
+            return false;
+        }
+
+        // 检查数字部分是否都是数字字符
+        if (!numbers.All(char.IsDigit))
+        {
+            return false;
+        }
+
+        // 计算校验码
+        int[] letterValues = letters.Select(c => numtostr(c)).ToArray();
+        int[] numberValues = numbers.Select(c => c - '0').ToArray();
+
+        int sum = letterValues[0] * 1 + letterValues[1] * 2 + letterValues[2] * 4 + letterValues[3] * 8;
+        int classint = 16;
+        for (int i = 0; i < numberValues.Length; i++)
+        {
+            if (i == 0) classint = 16;
+            if (i == 1) classint = 32;
+            if (i == 2) classint = 64;
+            if (i == 3) classint = 128;
+            if (i == 4) classint = 256;
+            if (i == 5) classint = 512;
+            sum += numberValues[i] * (classint);
+        }
+
+        int calculatedCheckDigit = sum % 11 % 10;
+
+        // 检查校验码是否匹配
+        if (calculatedCheckDigit != int.Parse(checkDigit))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    #endregion
 }

ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_CheckCntrno.cs

@@ -0,0 +1,37 @@
+using DS.Module.Core;
+using DS.Module.Core.Enums;
+using DS.WMS.ContainerManagement.Info.Entity;
+using FluentValidation;
+using Mapster;
+using Masuit.Tools.Systems;
+using SqlSugar;
+
+namespace DS.WMS.ContainerManagement.Info.Dtos;
+
+/// <summary>
+/// 箱管_箱号校验
+/// </summary>
+public class CM_CheckCntrno
+{
+    /// <summary>
+    /// 集装箱号
+    /// </summary>
+    public string Cntrno { get; set; }
+    
+}
+
+public class CM_CheckCntrnoRes
+{
+    public List<string> RightCntrnoList { get; set; } = new List<string>();
+    public List<string> WrongCntrnoList { get; set; } = new List<string>();
+
+    public void AddCntrno(string CNTRNO, bool isRight) {
+        if (isRight)
+        {
+            RightCntrnoList.Add(CNTRNO);
+        }
+        else {
+            WrongCntrnoList.Add(CNTRNO);
+        }
+    }
+}

ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_Rent_DetailBase.cs

@@ -184,4 +184,6 @@ public class CM_Rent_DetailBase
     /// 在 租箱租入_退租 或 租箱租出_退租 中 记录对应的租入或租出业务Id
     /// </summary>
     public long RentDetailId { get; set; }
+
+
 }

ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_Rent_HeadBase.cs

@@ -126,4 +126,6 @@ public class CM_Rent_HeadBase : BussinessStateRes
     /// Desc:未还箱
     /// </summary>
     public string DropoffRemainCtntotal { get; set; }
+
+    public List<CM_Rent_DetailBase> _bodyList { get; set; }
 }

ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_State_ChangeReq.cs

@@ -239,8 +239,10 @@ public class CM_State_ChangeReq_Multi : CM_State_ChangeReq {
         Cntrno = Cntrno.Replace("，", ",");
         Cntrno = Cntrno.Replace("；", ",");
         Cntrno = Cntrno.Replace("、", ",");
+        Cntrno = Cntrno.Replace(" ", ",");
+        Cntrno = Cntrno.Replace("　", ",");
         var splitchar = new char[] { ',', '\n', '\r', ' ', '\t', ';' };
-        string[] itemsByCommaAndNewLine = Cntrno.Split();
+        //string[] itemsByCommaAndNewLine = Cntrno.Split();
 
         var cntrnoList = new List<string>();
         var result = new List<CM_State_ChangeReq>();

ds-wms-service/DS.WMS.Core/ContainerManagement/Interface/ICM_BaseInfoService.cs

@@ -32,5 +32,10 @@ public interface ICM_BaseInfoService
     /// <returns></returns>
     DataResult<CM_BaseInfoRes> GetCM_BaseInfo(string id);
 
-
+    /// <summary>
+    /// 获取详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    DataResult<CM_CheckCntrnoRes> CM_CheckCntrno(CM_CheckCntrno model);
 }

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CMServiceBase.cs

@@ -1,4 +1,5 @@
-using System.Linq.Expressions;
+using System;
+using System.Linq.Expressions;
 using DS.Module.Core;
 using DS.Module.Core.Extensions;
 using DS.Module.SqlSugar;
@@ -11,7 +12,10 @@ using DS.WMS.Core.Code.Entity;
 using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Flow.Entity;
+using DS.WMS.Core.Info.Dtos;
 using DS.WMS.Core.Op.Entity;
+using LanguageExt.Pipes;
+using Mapster;
 using Microsoft.Extensions.DependencyInjection;
 using NPOI.SS.Formula.Functions;
 using SqlSugar;
@@ -238,5 +242,150 @@ namespace DS.WMS.ContainerManagement.Info.Method
                 return result;
             }
         }
+
+        public class CtnTotalHelper2 <T>
+        { 
+            List<CM_Rent_DetailBase> bodyList { get; set; }=new List<CM_Rent_DetailBase>();
+
+            public CtnTotalHelper2() {
+
+            }
+
+            public CtnTotalHelper2 ( T _bodyList)
+            {
+                if (_bodyList != null) {
+                    bodyList = _bodyList.Adapt<List<CM_Rent_DetailBase>>();
+                }
+
+                
+            }
+
+            /*
+            public CtnTotalHelper2(CM_RentIn _head,List<CM_RentIn_Detail> _bodyList)
+            {
+
+                head = _head.Adapt<CM_Rent_HeadBase>();
+
+                head._bodyList = _bodyList.Adapt<List<CM_Rent_DetailBase>>();
+            }
+            public CtnTotalHelper2(CM_RentOut _head, List<CM_RentOut_Detail> _bodyList)
+            {
+
+                head = _head.Adapt<CM_Rent_HeadBase>();
+
+                head._bodyList = _bodyList.Adapt<List<CM_Rent_DetailBase>>();
+            }
+            public CtnTotalHelper2(CM_RentOneWay _head, List<CM_RentOneWay_Detail> _bodyList)
+            {
+
+                head = _head.Adapt<CM_Rent_HeadBase>();
+
+                head._bodyList = _bodyList.Adapt<List<CM_Rent_DetailBase>>();
+            }
+
+            public CtnTotalHelper2(CM_BuyCtn _head, List<CM_BuyCtn_Detail> _bodyList)
+            {
+                head = _head.Adapt<CM_Rent_HeadBase>();
+
+                head._bodyList = _bodyList.Adapt<List<CM_Rent_DetailBase>>();
+            }
+
+            public CtnTotalHelper2(CM_SellCtn _head, List<CM_SellCtn_Detail> _bodyList)
+            {
+                head = _head.Adapt<CM_Rent_HeadBase>();
+
+                head._bodyList = _bodyList.Adapt<List<CM_Rent_DetailBase>>();
+            }
+            public CtnTotalHelper2(CM_CtnScrap _head, List<CM_CtnScrap_Detail> _bodyList)
+            {
+                head = _head.Adapt<CM_Rent_HeadBase>();
+
+                head._bodyList = _bodyList.Adapt<List<CM_Rent_DetailBase>>();
+            }*/
+
+            public string GetCtnTotalStr()
+            {
+                var result = "";
+
+                var ch = new CtnTotalHelper();
+
+                foreach (var item in bodyList) 
+                { 
+                    ch.Add(item.Ctnall);
+                }
+
+                result= ch.GetStr();
+
+                return result;
+            }
+
+            public string Get已提箱Str()
+            {
+                var result = "";
+
+                var ch = new CtnTotalHelper();
+
+                foreach (var item in bodyList)
+                {
+                    if(item.PickupDate!= null)
+                        ch.Add(item.Ctnall);
+                }
+
+                result = ch.GetStr();
+
+                return result;
+            }
+
+            public string Get未提箱Str()
+            {
+                var result = "";
+
+                var ch = new CtnTotalHelper();
+
+                foreach (var item in bodyList)
+                {
+                    if (item.PickupDate == null)
+                        ch.Add(item.Ctnall);
+                }
+
+                result = ch.GetStr();
+
+                return result;
+            }
+
+            public string Get已还箱Str()
+            {
+                var result = "";
+
+                var ch = new CtnTotalHelper();
+
+                foreach (var item in bodyList)
+                {
+                    if (item.DropoffDate != null)
+                        ch.Add(item.Ctnall);
+                }
+
+                result = ch.GetStr();
+
+                return result;
+            }
+
+            public string Get未还箱Str()
+            {
+                var result = "";
+
+                var ch = new CtnTotalHelper();
+
+                foreach (var item in bodyList)
+                {
+                    if (item.DropoffDate == null)
+                        ch.Add(item.Ctnall);
+                }
+
+                result = ch.GetStr();
+
+                return result;
+            }
+        }
     }
 }

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_BaseInfoService.cs

@@ -135,5 +135,123 @@ public class CM_BaseInfoService : ICM_BaseInfoService
         return DataResult<CM_BaseInfoRes>.Success(data, MultiLanguageConst.DataQuerySuccess);
     }
 
+    //CM_CheckCntrno(CM_CheckCntrno model);
+    public DataResult<CM_CheckCntrnoRes> CM_CheckCntrno(CM_CheckCntrno req)
+    {
+
+
+        var Cntrno = req.Cntrno;
+
+        Cntrno = Cntrno.Replace("，", ",");
+        Cntrno = Cntrno.Replace("；", ",");
+        Cntrno = Cntrno.Replace("、", ",");
+        Cntrno = Cntrno.Replace(" ", ",");
+        Cntrno = Cntrno.Replace("　", ",");
+        var splitchar = new char[] { ',', '\n', '\r', ' ', '\t', ';' };
+        //string[] itemsByCommaAndNewLine = Cntrno.Split();
+
+        var cntrnoList = new List<string>();
+
+        cntrnoList = Cntrno.Split(',').ToList();
+
+        var result = new CM_CheckCntrnoRes();
+
+        if (cntrnoList != null) {
+            foreach (var cntrno in cntrnoList) {
+                var istrue = ValidateContainerNumber(cntrno);
+
+                result.AddCntrno(cntrno, istrue);
+            }
+        }
+
+        return DataResult <CM_CheckCntrnoRes>.Success(result,MultiLanguageConst.DataQuerySuccess);
+    }
+
+    public static int numtostr(char strcode)
+    {
+        int result = 0;
+        if (strcode == 'A') result = 10;
+        if (strcode == 'B') result = 12;
+        if (strcode == 'C') result = 13;
+        if (strcode == 'D') result = 14;
+        if (strcode == 'E') result = 15;
+        if (strcode == 'F') result = 16;
+        if (strcode == 'G') result = 17;
+        if (strcode == 'H') result = 18;
+        if (strcode == 'I') result = 19;
+        if (strcode == 'J') result = 20;
+        if (strcode == 'K') result = 21;
+        if (strcode == 'L') result = 23;
+        if (strcode == 'M') result = 24;
+        if (strcode == 'N') result = 25;
+        if (strcode == 'O') result = 26;
+        if (strcode == 'P') result = 27;
+        if (strcode == 'Q') result = 28;
+        if (strcode == 'R') result = 29;
+        if (strcode == 'S') result = 30;
+        if (strcode == 'T') result = 31;
+        if (strcode == 'U') result = 32;
+        if (strcode == 'V') result = 34;
+        if (strcode == 'W') result = 35;
+        if (strcode == 'X') result = 36;
+        if (strcode == 'Y') result = 37;
+        if (strcode == 'Z') result = 38;
+
+        return result;
+
+    }
+    public static bool ValidateContainerNumber(string containerNumber)
+    {
+        // 集装箱号的校验规则
+        // - 由4位字母（ISO代码）+ 6位数字 + 1位校验码组成
+        // - 校验码的计算方式是将字母转换为数字，然后按照一定的公式计算得出
 
+        if (containerNumber.Length != 11)
+        {
+            return false;
+        }
+
+        string letters = containerNumber.Substring(0, 4);
+        string numbers = containerNumber.Substring(4, 6);
+        string checkDigit = containerNumber.Substring(10, 1);
+
+        // 检查字母部分是否都是大写字母
+        if (!letters.All(char.IsUpper))
+        {
+            return false;
+        }
+
+        // 检查数字部分是否都是数字字符
+        if (!numbers.All(char.IsDigit))
+        {
+            return false;
+        }
+
+        // 计算校验码
+        int[] letterValues = letters.Select(c => numtostr(c)).ToArray();
+        int[] numberValues = numbers.Select(c => c - '0').ToArray();
+
+        int sum = letterValues[0] * 1 + letterValues[1] * 2 + letterValues[2] * 4 + letterValues[3] * 8;
+        int classint = 16;
+        for (int i = 0; i < numberValues.Length; i++)
+        {
+            if (i == 0) classint = 16;
+            if (i == 1) classint = 32;
+            if (i == 2) classint = 64;
+            if (i == 3) classint = 128;
+            if (i == 4) classint = 256;
+            if (i == 5) classint = 512;
+            sum += numberValues[i] * (classint);
+        }
+
+        int calculatedCheckDigit = sum % 11 % 10;
+
+        // 检查校验码是否匹配
+        if (calculatedCheckDigit != int.Parse(checkDigit))
+        {
+            return false;
+        }
+
+        return true;
+    }
 }

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_BuyCtnService.cs

@@ -126,8 +126,6 @@ public class CM_BuyCtnService : CMServiceBase, ICM_BuyCtnService
         //}
         填充明细空白字段(ref req);
 
-        var ch = new CtnTotalHelper();
-
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
         if (req.Id == 0)
         {
@@ -140,17 +138,6 @@ public class CM_BuyCtnService : CMServiceBase, ICM_BuyCtnService
             }
             data.Billno = sequence.Data;
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-            data.Ctntotal = ch.GetStr();
             //var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
             var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync();
 
@@ -182,20 +169,6 @@ public class CM_BuyCtnService : CMServiceBase, ICM_BuyCtnService
 
             info = req.Adapt(info);
 
-
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            info.Ctntotal = ch.GetStr();
-
             await tenantDb.Updateable(info).ExecuteCommandAsync();
 
             if (req.BodyList.Count > 0)
@@ -286,6 +259,11 @@ public class CM_BuyCtnService : CMServiceBase, ICM_BuyCtnService
             }
         }
 
+        var ch = new CtnTotalHelper2<List<CM_BuyCtn_DetailReq>>(req.BodyList);
+        req.CntrnoAll = string.Join(",", req.BodyList.Select(s => s.Cntrno).Distinct().ToList());
+        req.Ctntotal = ch.GetCtnTotalStr();
+        req.PickupCtntotal = ch.Get已提箱Str();
+        req.RemainCtntotal = ch.Get未提箱Str();
     }
 
     /// <summary>
@@ -364,28 +342,11 @@ public class CM_BuyCtnService : CMServiceBase, ICM_BuyCtnService
         data.BillState = "Confirm";
         //data.IsBusinessLocking = true;
 
-        var 已提箱 = new CtnTotalHelper();
-        var 未提箱 = new CtnTotalHelper();
-        if (body.Count > 0)
-        {
-            //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-            foreach (var item in body)
-            {
-
-                if (item.PickupDate == null)
-                {
-                    未提箱.Add(item.Ctnall);
-                }
-                if (item.PickupDate != null)
-                {
-                    已提箱.Add(item.Ctnall);
-                }
-
-            }
-        }
+        var ch = new CtnTotalHelper2<List<CM_BuyCtn_Detail>>(body);
 
-        data.PickupCtntotal = 已提箱.GetStr();
-        data.RemainCtntotal = 未提箱.GetStr();
+        data.Ctntotal = ch.GetCtnTotalStr();
+        data.PickupCtntotal = ch.Get已提箱Str();
+        data.RemainCtntotal= ch.Get未提箱Str();
 
         var entity = await tenantDb.Updateable(data).ExecuteCommandAsync();
 

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_BuyCtn_DetailService.cs

@@ -140,19 +140,11 @@ public class CM_BuyCtn_DetailService : CMServiceBase, ICM_BuyCtn_DetailService
 
         var body = TenantDb.Queryable<CM_BuyCtn_Detail>().Where(a => a.Pid == headid).ToList();
 
-        var ch = new CtnTotalHelper();
+        var ch = new CtnTotalHelper2<List<CM_BuyCtn_Detail>>(body);
 
-        if (body.Count > 0)
-        {
-            //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-            foreach (var item in body)
-            {
-
-                ch.Add(item.Ctnall);
-            }
-        }
-
-        data.Ctntotal = ch.GetStr();
+        data.Ctntotal = ch.GetCtnTotalStr();
+        data.PickupCtntotal = ch.Get已提箱Str();
+        data.RemainCtntotal = ch.Get未提箱Str();
 
         await TenantDb.Updateable<CM_BuyCtn>(data).ExecuteCommandAsync();
 

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_CtnScrapService.cs

@@ -125,10 +125,14 @@ public class CM_CtnScrapService : CMServiceBase, ICM_CtnScrapService
             }
         }
 
+        var ch = new CtnTotalHelper2<List<CM_BuyCtn_DetailReq>>(req.BodyList);
+
+        req.Ctntotal = ch.GetCtnTotalStr();
+        req.PickupCtntotal = ch.Get已提箱Str();
+        req.RemainCtntotal = ch.Get未提箱Str();
 
-        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
-        var ch = new CtnTotalHelper();
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
         if (req.Id == 0)
         {
@@ -141,18 +145,6 @@ public class CM_CtnScrapService : CMServiceBase, ICM_CtnScrapService
             }
             data.Billno = sequence.Data;
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-            data.Ctntotal = ch.GetStr();
-
             //var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
             var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync();
 
@@ -184,20 +176,6 @@ public class CM_CtnScrapService : CMServiceBase, ICM_CtnScrapService
 
             info = req.Adapt(info);
 
-
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            info.Ctntotal = ch.GetStr();
-
             await tenantDb.Updateable(info).ExecuteCommandAsync();
 
             if (req.BodyList.Count > 0)
@@ -631,6 +609,18 @@ public class CM_CtnScrapService : CMServiceBase, ICM_CtnScrapService
             if (addList != null && addList.Count > 0) {
                 await TenantDb.Insertable(addList).ExecuteCommandAsync();
 
+
+                var _body = await TenantDb.Queryable<CM_RentIn_Detail>().Where(a => a.Pid == id).ToListAsync();
+
+                var ch = new CtnTotalHelper2<List<CM_RentIn_Detail>>(_body);
+
+                head.Ctntotal = ch.GetCtnTotalStr();
+                head.PickupCtntotal = ch.Get已提箱Str();
+                head.RemainCtntotal = ch.Get未提箱Str();
+
+                await TenantDb.Updateable(head).ExecuteCommandAsync();
+
+
                 return DataResult.Successed("添加成功!", id, MultiLanguageConst.DataCreateSuccess);
             }
             else {

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_CtnScrap_DetailService.cs

@@ -140,19 +140,11 @@ public class CM_CtnScrap_DetailService : CMServiceBase, ICM_CtnScrap_DetailServi
 
         var body = TenantDb.Queryable<CM_BuyCtn_Detail>().Where(a => a.Pid == headid).ToList();
 
-        var ch = new CtnTotalHelper();
+        var ch = new CtnTotalHelper2<List<CM_BuyCtn_Detail>>(body);
 
-        if (body.Count > 0)
-        {
-            //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-            foreach (var item in body)
-            {
-
-                ch.Add(item.Ctnall);
-            }
-        }
-
-        data.Ctntotal = ch.GetStr();
+        data.Ctntotal = ch.GetCtnTotalStr();
+        data.PickupCtntotal = ch.Get已提箱Str();
+        data.RemainCtntotal = ch.Get未提箱Str();
 
         await TenantDb.Updateable<CM_BuyCtn>(data).ExecuteCommandAsync();
 

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_RentInService.cs

@@ -31,6 +31,7 @@ using DS.WMS.Core.TaskPlat.Dtos;
 using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Method;
 using Org.BouncyCastle.Ocsp;
+using Masuit.Tools;
 
 namespace DS.WMS.ContainerManagement.Info.Method;
 
@@ -113,10 +114,6 @@ public class CM_RentInService : CMServiceBase, ICM_RentInService
 
         填充明细空白字段(ref req);
 
-        req.Ctntotal = "";
-
-        var ch = new CtnTotalHelper();
-
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
         if (req.Id == 0)
         {
@@ -129,18 +126,20 @@ public class CM_RentInService : CMServiceBase, ICM_RentInService
             }
             data.Billno = sequence.Data;
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
 
-                    ch.Add(item.Ctnall);
+            var ch = new CtnTotalHelper2<List<CM_RentIn_DetailReq>>(req.BodyList);
 
-                }
-            }
+            data.Ctntotal = ch.GetCtnTotalStr();
 
-            data.Ctntotal = ch.GetStr();
+            if (data.RentDirectId == CMRentDirectEnum.租入) {
+                data.PickupCtntotal = ch.Get已提箱Str();
+                data.PickupRemainCtntotal = ch.Get未提箱Str();
+            }
+            if (data.RentDirectId == CMRentDirectEnum.租入退租)
+            {
+                data.DropoffCtntotal = ch.Get已还箱Str();
+                data.DropoffRemainCtntotal = ch.Get未还箱Str();
+            }
 
             //var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
             var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync();
@@ -171,18 +170,20 @@ public class CM_RentInService : CMServiceBase, ICM_RentInService
 
             info = req.Adapt(info);
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
+            var ch = new CtnTotalHelper2<List<CM_RentIn_DetailReq>>(req.BodyList);
 
-                    ch.Add(item.Ctnall);
+            info.Ctntotal = ch.GetCtnTotalStr();
 
-                }
+            if (info.RentDirectId == CMRentDirectEnum.租入)
+            {
+                info.PickupCtntotal = ch.Get已提箱Str();
+                info.PickupRemainCtntotal = ch.Get未提箱Str();
+            }
+            if (info.RentDirectId == CMRentDirectEnum.租入退租)
+            {
+                info.DropoffCtntotal = ch.Get已还箱Str();
+                info.DropoffRemainCtntotal = ch.Get未还箱Str();
             }
-
-            info.Ctntotal = ch.GetStr();
 
             await tenantDb.Updateable(info).ExecuteCommandAsync();
 
@@ -347,47 +348,20 @@ public class CM_RentInService : CMServiceBase, ICM_RentInService
 
         var body = tenantDb.Queryable<CM_RentIn_Detail>().Where(a => a.Pid == data.Id).ToList();
 
-        //20240808 首先判断该箱号能否执行确认
+        var ch = new CtnTotalHelper2<List<CM_RentIn_Detail>>(body);
 
-        //if (!string.IsNullOrWhiteSpace(data.BillState)) 
-        //{
-        //    return DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed));
-        //}
+        data.Ctntotal = ch.GetCtnTotalStr();
 
-        var 已提箱 = new CtnTotalHelper();
-        var 未提箱 = new CtnTotalHelper();
-        //var 已还箱 = new CtnTotalHelper();
-        //var 未还箱 = new CtnTotalHelper();
-        if (body.Count > 0)
+        if (data.RentDirectId == CMRentDirectEnum.租入)
         {
-            //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-            foreach (var item in body) {
-
-                if (item.PickupDate == null) 
-                {
-                    未提箱.Add(item.Ctnall);
-                }
-                if (item.PickupDate != null)
-                {
-                    已提箱.Add(item.Ctnall);
-                }
-
-                //if (item.PickupDate != null && item.DropoffDate == null)
-                //{
-                //    未还箱.Add(item.Ctnall);
-                //}
-                //if (item.PickupDate != null && item.DropoffDate != null)
-                //{
-                //    已还箱.Add(item.Ctnall);
-                //}
-
-            }
+            data.PickupCtntotal = ch.Get已提箱Str();
+            data.PickupRemainCtntotal = ch.Get未提箱Str();
+        }
+        if (data.RentDirectId == CMRentDirectEnum.租入退租)
+        {
+            data.DropoffCtntotal = ch.Get已还箱Str();
+            data.DropoffRemainCtntotal = ch.Get未还箱Str();
         }
-
-        data.PickupCtntotal = 已提箱.GetStr();
-        data.PickupRemainCtntotal = 未提箱.GetStr();
-        //data.DropoffCtntotal = 已还箱.GetStr();
-        //data.DropoffRemainCtntotal = 未还箱.GetStr();
 
         data.BillState = "Confirm";
         //data.IsBusinessLocking = true;
@@ -547,6 +521,30 @@ public class CM_RentInService : CMServiceBase, ICM_RentInService
 
                 //20240826 向原租入明细中写入提箱相关信息
                 await tenantDb.Updateable(RentInDetailList.First(x => x.Id == detail.RentDetailId)).ExecuteCommandAsync();
+
+
+            }
+
+
+            //20240829 向原租入业务中 更新已还箱未还箱数据
+            var headids = RentInDetailList.Where(x => x.DropoffDate != null).Select(x => x.Pid).Distinct().ToList();
+            var 原租入业务 = await tenantDb.Queryable<CM_RentIn>().Where(x => headids.Contains(x.Id)).ToListAsync();
+
+            foreach (var item in 原租入业务)
+            {
+                var _body= await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.Pid == item.Id).ToListAsync();
+
+                var ch1 = new CtnTotalHelper2<List<CM_RentIn_Detail>>(_body);
+
+                item.Ctntotal = ch1.GetCtnTotalStr();
+
+                item.PickupCtntotal = ch1.Get已提箱Str();
+                item.PickupRemainCtntotal = ch1.Get未提箱Str();
+
+                item.DropoffCtntotal = ch1.Get已还箱Str();
+                item.DropoffRemainCtntotal = ch1.Get未还箱Str();
+                
+                await tenantDb.Updateable(item).ExecuteCommandAsync();
             }
         }
 
@@ -619,20 +617,7 @@ public class CM_RentInService : CMServiceBase, ICM_RentInService
             return await Task.FromResult(DataResult.Failed("添加失败!", MultiLanguageConst.CM_CanNotMakeFee));
         }
         else {
-            //var newFee = new FeeRecord();
-
-            //newFee.Id = 0;
-            //newFee.FeeType = FeeType.Payable;
-            //newFee.FeeName = "提箱费";
-            //newFee.TaxUnitPrice = 10;
-            //newFee.Amount = 10;
-            //newFee.TaxRate = 0;
-            //newFee.Quantity = 1;
-
-            //var feeDetail = new List<FeeRecord>();
-            //feeDetail.Add(newFee);
-
-            //return await _feeService.SaveAsync(feeDetail);
+            
 
             //租入生成提箱费
             //退租生成还箱费
@@ -866,6 +851,16 @@ public class CM_RentInService : CMServiceBase, ICM_RentInService
             if (addList != null && addList.Count > 0) {
                 await TenantDb.Insertable(addList).ExecuteCommandAsync();
 
+                var _body = await TenantDb.Queryable<CM_RentIn_Detail>().Where(a => a.Pid == id).ToListAsync();
+
+                var ch = new CtnTotalHelper2<List<CM_RentIn_Detail>>(_body);
+
+                head.Ctntotal = ch.GetCtnTotalStr();
+                head.DropoffCtntotal = ch.Get已还箱Str();
+                head.DropoffRemainCtntotal = ch.Get未还箱Str();
+
+                await TenantDb.Updateable(head).ExecuteCommandAsync();
+
                 return DataResult.Successed("添加成功!", id, MultiLanguageConst.DataCreateSuccess);
             }
             else {

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_RentIn_DetailService.cs

@@ -133,21 +133,16 @@ public class CM_RentIn_DetailService : CMServiceBase, ICM_RentIn_DetailService
 
         var body = TenantDb.Queryable<CM_RentIn_Detail>().Where(a => a.Pid == headid).ToList();
 
-        var ch = new CtnTotalHelper();
-
-        if (body.Count > 0)
-        {
-            //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-            foreach (var item in body)
-            {
-
-                ch.Add(item.Ctnall);
-            }
-        }
         var head = TenantDb.Queryable<CM_RentIn>()
             .Where(a => a.Id == headid)
             .First();
-        head.Ctntotal = ch.GetStr();
+
+        var ch = new CtnTotalHelper2<List<CM_RentIn_Detail>>(body);
+        head.Ctntotal = ch.GetCtnTotalStr();
+        head.PickupCtntotal = ch.Get已提箱Str();
+        head.PickupRemainCtntotal = ch.Get未提箱Str();
+        head.DropoffCtntotal = ch.Get已还箱Str();
+        head.DropoffRemainCtntotal = ch.Get未还箱Str();
 
         await TenantDb.Updateable<CM_RentIn>(head).ExecuteCommandAsync();
 

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_RentOneWayService.cs

@@ -87,7 +87,14 @@ public class CM_RentOneWayService : CMServiceBase, ICM_RentOneWayService
     {
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
-        var ch = new CtnTotalHelper();
+
+        var ch = new CtnTotalHelper2<List<CM_RentOneWay_DetailReq>>(req.BodyList);
+
+        req.Ctntotal = ch.GetCtnTotalStr();
+        req.PickupCtntotal = ch.Get已提箱Str();
+        req.RemainCtntotal = ch.Get未提箱Str();
+        req.DropoffCtntotal = ch.Get已还箱Str();
+        req.DropoffRemainCtntotal = ch.Get未还箱Str();
 
         if (req.Id == 0)
         {
@@ -103,18 +110,6 @@ public class CM_RentOneWayService : CMServiceBase, ICM_RentOneWayService
             data.RentDirectId = CMRentDirectEnum.租出;
             data.RentTypeId= CMRentTypeEnum.单程;
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            data.Ctntotal = ch.GetStr();
 
             //var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
             var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync();
@@ -142,19 +137,6 @@ public class CM_RentOneWayService : CMServiceBase, ICM_RentOneWayService
             info.RentDirectId = CMRentDirectEnum.租出;
             info.RentTypeId = CMRentTypeEnum.单程;
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            info.Ctntotal = ch.GetStr();
-
             await tenantDb.Updateable(info).ExecuteCommandAsync();
 
             if (req.BodyList.Count > 0)
@@ -492,6 +474,18 @@ public class CM_RentOneWayService : CMServiceBase, ICM_RentOneWayService
             {
                 await TenantDb.Insertable(addList).ExecuteCommandAsync();
 
+                var _body = await TenantDb.Queryable<CM_RentOneWay_Detail>().Where(a => a.Pid == id).ToListAsync();
+
+                var ch = new CtnTotalHelper2<List<CM_RentOneWay_Detail>>(_body);
+
+                head.Ctntotal = ch.GetCtnTotalStr();
+                head.PickupCtntotal = ch.Get已提箱Str();
+                head.PickupRemainCtntotal = ch.Get未提箱Str();
+                head.DropoffCtntotal = ch.Get已还箱Str();
+                head.DropoffRemainCtntotal = ch.Get未还箱Str();
+
+                await TenantDb.Updateable(head).ExecuteCommandAsync();
+
                 return DataResult.Successed("添加成功!", id, MultiLanguageConst.DataCreateSuccess);
             }
             else

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_RentOneWay_DetailService.cs

@@ -131,19 +131,17 @@ public class CM_RentOneWay_DetailService : CMServiceBase, ICM_RentOneWay_DetailS
 
         var body = TenantDb.Queryable<CM_RentOneWay_Detail>().Where(a => a.Pid == headid).ToList();
 
-        var ch = new CtnTotalHelper();
-
-        if (body.Count > 0)
-        {
-            foreach (var item in body)
-            {
-                ch.Add(item.Ctnall);
-            }
-        }
         var head = TenantDb.Queryable<CM_RentOneWay>()
             .Where(a => a.Id == headid)
             .First();
-        head.Ctntotal = ch.GetStr();
+
+        var ch = new CtnTotalHelper2<List<CM_RentOneWay_Detail>>(body);
+        head.Ctntotal = ch.GetCtnTotalStr();
+        head.PickupCtntotal = ch.Get已提箱Str();
+        head.PickupRemainCtntotal = ch.Get未提箱Str();
+        head.DropoffCtntotal = ch.Get已还箱Str();
+        head.DropoffRemainCtntotal = ch.Get未还箱Str();
+
 
         await TenantDb.Updateable<CM_RentOneWay>(head).ExecuteCommandAsync();
 

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_RentOutService.cs

@@ -26,6 +26,8 @@ using DS.WMS.Core.Sys.Interface;
 using DS.Module.Core.Enums;
 using DS.WMS.Core.Fee.Dtos;
 using System.ComponentModel;
+using NPOI.XWPF.UserModel;
+using Org.BouncyCastle.Ocsp;
 
 namespace DS.WMS.ContainerManagement.Info.Method;
 
@@ -127,8 +129,6 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
 
         填充明细空白字段(ref req);
 
-        var ch = new CtnTotalHelper();
-
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
         if (req.Id == 0)
         {
@@ -141,19 +141,6 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
             }
             data.Billno = sequence.Data;
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            data.Ctntotal = ch.GetStr();
-
             //var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
             var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync();
 
@@ -185,19 +172,6 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
 
             info = req.Adapt(info);
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            info.Ctntotal = ch.GetStr();
-
             await tenantDb.Updateable(info).ExecuteCommandAsync();
 
             if (req.BodyList.Count > 0)
@@ -288,6 +262,13 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
             }
         }
 
+        var ch = new CtnTotalHelper2<List<CM_RentOut_DetailReq>>(req.BodyList);
+
+        req.Ctntotal = ch.GetCtnTotalStr();
+        req.PickupCtntotal = ch.Get已提箱Str();
+        req.RemainCtntotal = ch.Get未提箱Str();
+        req.DropoffCtntotal = ch.Get已还箱Str();
+        req.DropoffRemainCtntotal = ch.Get未还箱Str();
     }
 
 
@@ -369,36 +350,13 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
 
         data.BillState = "Confirm";
 
-        var 已提箱 = new CtnTotalHelper();
-        var 未提箱 = new CtnTotalHelper();
-        //var 已还箱 = new CtnTotalHelper();
-        //var 未还箱 = new CtnTotalHelper();
-        if (body.Count > 0)
-        {
-            //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-            foreach (var item in body)
-            {
-
-                if (item.PickupDate == null)
-                {
-                    未提箱.Add(item.Ctnall);
-                }
-                if (item.PickupDate != null)
-                {
-                    已提箱.Add(item.Ctnall);
-                }
-
-                //if (item.PickupDate != null && item.DropoffDate == null)
-                //{
-                //    未还箱.Add(item.Ctnall);
-                //}
-                //if (item.PickupDate != null && item.DropoffDate != null)
-                //{
-                //    已还箱.Add(item.Ctnall);
-                //}
+        var ch = new CtnTotalHelper2<List<CM_RentOut_Detail>>(body);
 
-            }
-        }
+        data.Ctntotal = ch.GetCtnTotalStr();
+        data.PickupCtntotal = ch.Get已提箱Str();
+        data.PickupRemainCtntotal = ch.Get未提箱Str();
+        data.DropoffCtntotal = ch.Get已还箱Str();
+        data.DropoffRemainCtntotal = ch.Get未还箱Str();
 
         //data.IsBusinessLocking = true;
         var entity = await tenantDb.Updateable(data).ExecuteCommandAsync();
@@ -543,13 +501,36 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
 
                 }
 
-
                 //await TenantDb.Insertable(changerec).ExecuteReturnEntityAsync();
 
                 //await _Changeservice.UpdateCM_CurrentStateAsync(changerec);
+
                 await _Changeservice.AddCM_State_ChangeAsync(changerec);
 
                 await tenantDb.Updateable(RentOutDetailList.First(x => x.Id == detail.RentDetailId)).ExecuteCommandAsync();
+
+                //查询RentOutDetailList当中DropoffDate不为空的 重新计算其rentout中的已还箱 未还箱数量
+                //20240829 向原租入业务中 更新已还箱未还箱数据
+                var headids = RentOutDetailList.Where(x => x.DropoffDate != null).Select(x => x.Pid).Distinct().ToList();
+                var 原租出业务 = await tenantDb.Queryable<CM_RentOut>().Where(x => headids.Contains(x.Id)).ToListAsync();
+
+                foreach (var item in 原租出业务)
+                {
+                    var _body = await tenantDb.Queryable<CM_RentOut_Detail>().Where(x => x.Pid == item.Id).ToListAsync();
+
+                    var ch1 = new CtnTotalHelper2<List<CM_RentOut_Detail>>(_body);
+
+                    item.Ctntotal = ch1.GetCtnTotalStr();
+
+                    item.PickupCtntotal = ch1.Get已提箱Str();
+                    item.PickupRemainCtntotal = ch1.Get未提箱Str();
+
+                    item.DropoffCtntotal = ch1.Get已还箱Str();
+                    item.DropoffRemainCtntotal = ch1.Get未还箱Str();
+
+                    await tenantDb.Updateable(item).ExecuteCommandAsync();
+                }
+
             }
         }
 
@@ -923,6 +904,8 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
 
                 await TenantDb.Insertable(addList).ExecuteCommandAsync();
 
+                await TenantDb.Updateable(head).ExecuteCommandAsync();
+
                 return DataResult.Successed("添加成功!", id, MultiLanguageConst.DataCreateSuccess);
             }
             else
@@ -997,10 +980,17 @@ public class CM_RentOutService : CMServiceBase, ICM_RentOutService
 
             if (req.BodyList != null && req.BodyList.Count > 0)
             {
-
                 var addList = req.BodyList.Adapt<List<CM_RentOut_Detail>>();
 
-                await TenantDb.Insertable(addList).ExecuteCommandAsync();
+                var _body = await TenantDb.Queryable<CM_RentOut_Detail>().Where(a => a.Pid == id).ToListAsync();
+
+                var ch = new CtnTotalHelper2<List<CM_RentOut_Detail>>(_body);
+
+                head.Ctntotal = ch.GetCtnTotalStr();
+                head.DropoffCtntotal = ch.Get已还箱Str();
+                head.DropoffRemainCtntotal = ch.Get未还箱Str();
+
+                await TenantDb.Updateable(head).ExecuteCommandAsync();
 
                 return DataResult.Successed("添加成功!", id, MultiLanguageConst.DataCreateSuccess);
             }

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_RentOut_DetailService.cs

@@ -20,6 +20,7 @@ using Newtonsoft.Json;
 using SqlSugar;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Op.Entity;
+using Org.BouncyCastle.Ocsp;
 
 namespace DS.WMS.ContainerManagement.Info.Method;
 
@@ -128,19 +129,17 @@ public class CM_RentOut_DetailService : CMServiceBase, ICM_RentOut_DetailService
 
         var body = TenantDb.Queryable<CM_RentOut_Detail>().Where(a => a.Pid == headid).ToList();
 
-        var ch = new CtnTotalHelper();
-
-        if (body.Count > 0)
-        {
-            foreach (var item in body)
-            {
-                ch.Add(item.Ctnall);
-            }
-        }
         var head = TenantDb.Queryable<CM_RentOut>()
             .Where(a => a.Id == headid)
             .First();
-        head.Ctntotal = ch.GetStr();
+
+        var ch = new CtnTotalHelper2<List<CM_RentOut_Detail>>(body);
+
+        head.Ctntotal = ch.GetCtnTotalStr();
+        head.PickupCtntotal = ch.Get已提箱Str();
+        head.PickupRemainCtntotal = ch.Get未提箱Str();
+        head.DropoffCtntotal = ch.Get已还箱Str();
+        head.DropoffRemainCtntotal = ch.Get未还箱Str();
 
         await TenantDb.Updateable<CM_RentOut>(head).ExecuteCommandAsync();
 

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_SellCtnService.cs

@@ -126,10 +126,14 @@ public class CM_SellCtnService : CMServiceBase, ICM_SellCtnService
             }
         }
 
+        var ch = new CtnTotalHelper2<List<CM_SellCtn_DetailReq>>(req.BodyList);
+
+        req.Ctntotal = ch.GetCtnTotalStr();
+        req.PickupCtntotal = ch.Get已提箱Str();
+        req.RemainCtntotal = ch.Get未提箱Str();
 
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
-        var ch = new CtnTotalHelper();
 
         if (req.Id == 0)
         {
@@ -142,19 +146,6 @@ public class CM_SellCtnService : CMServiceBase, ICM_SellCtnService
             }
             data.Billno = sequence.Data;
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            data.Ctntotal = ch.GetStr();
-
             //var entity = tenantDb.Insertable(data).ExecuteReturnEntity();
             var entity = await tenantDb.Insertable(data).ExecuteReturnEntityAsync();
 
@@ -186,19 +177,6 @@ public class CM_SellCtnService : CMServiceBase, ICM_SellCtnService
 
             info = req.Adapt(info);
 
-            if (req.BodyList.Count > 0)
-            {
-                //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-                foreach (var item in req.BodyList)
-                {
-
-                    ch.Add(item.Ctnall);
-
-                }
-            }
-
-            info.Ctntotal = ch.GetStr();
-
             await tenantDb.Updateable(info).ExecuteCommandAsync();
 
             if (req.BodyList.Count > 0)
@@ -306,38 +284,16 @@ public class CM_SellCtnService : CMServiceBase, ICM_SellCtnService
 
         var body = tenantDb.Queryable<CM_SellCtn_Detail>().Where(a => a.Pid == data.Id).ToList();
 
-        //20240808 首先判断该箱号能否执行确认
+        var ch = new CtnTotalHelper2<List<CM_SellCtn_Detail>>(body);
 
-        //if (!string.IsNullOrWhiteSpace(data.BillState)) 
-        //{
-        //    return DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed));
-        //}
+        data.Ctntotal = ch.GetCtnTotalStr();
 
-        data.BillState = "Confirm";
-        //data.IsBusinessLocking = true;
+        data.PickupCtntotal = ch.Get已提箱Str();
+        data.RemainCtntotal = ch.Get未提箱Str();
 
-        var 已提箱 = new CtnTotalHelper();
-        var 未提箱 = new CtnTotalHelper();
-        if (body.Count > 0)
-        {
-            //var ctnList = await tenantDb.Queryable<CM_RentIn_Detail>().Where(x => x.pid == req.Id.ToString()).ToListAsync();
-            foreach (var item in body)
-            {
 
-                if (item.PickupDate == null)
-                {
-                    未提箱.Add(item.Ctnall);
-                }
-                if (item.PickupDate != null)
-                {
-                    已提箱.Add(item.Ctnall);
-                }
-
-            }
-        }
-
-        data.PickupCtntotal = 已提箱.GetStr();
-        data.RemainCtntotal = 未提箱.GetStr();
+        data.BillState = "Confirm";
+        //data.IsBusinessLocking = true;
 
         var entity = await tenantDb.Updateable(data).ExecuteCommandAsync();
 
@@ -646,6 +602,16 @@ public class CM_SellCtnService : CMServiceBase, ICM_SellCtnService
             {
                 await TenantDb.Insertable(addList).ExecuteCommandAsync();
 
+                var _body = await TenantDb.Queryable<CM_RentIn_Detail>().Where(a => a.Pid == id).ToListAsync();
+
+                var ch = new CtnTotalHelper2<List<CM_RentIn_Detail>>(_body);
+
+                head.Ctntotal = ch.GetCtnTotalStr();
+                head.PickupCtntotal = ch.Get已提箱Str();
+                head.RemainCtntotal = ch.Get未提箱Str();
+
+                await TenantDb.Updateable(head).ExecuteCommandAsync();
+
                 return DataResult.Successed("添加成功!", id, MultiLanguageConst.DataCreateSuccess);
             }
             else

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_SellCtn_DetailService.cs

@@ -20,6 +20,7 @@ using Newtonsoft.Json;
 using SqlSugar;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Op.Entity;
+using Org.BouncyCastle.Ocsp;
 
 namespace DS.WMS.ContainerManagement.Info.Method;
 
@@ -133,16 +134,13 @@ public class CM_SellCtn_DetailService : CMServiceBase, ICM_SellCtn_DetailService
 
         var body = TenantDb.Queryable<CM_SellCtn_Detail>().Where(a => a.Pid == headid).ToList();
 
-        var ch = new CtnTotalHelper();
 
-        if (body.Count > 0)
-        {
-            foreach (var item in body)
-            {
-                ch.Add(item.Ctnall);
-            }
-        }
-        data.Ctntotal = ch.GetStr();
+        var ch = new CtnTotalHelper2<List<CM_SellCtn_Detail>>(body);
+
+        data.Ctntotal = ch.GetCtnTotalStr();
+        data.PickupCtntotal = ch.Get已提箱Str();
+        data.RemainCtntotal = ch.Get未提箱Str();
+
         await TenantDb.Updateable<CM_SellCtn>(data).ExecuteCommandAsync();
 
         return result > 0 ? DataResult.Success : DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed));

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs

@@ -1605,23 +1605,34 @@ namespace DS.WMS.Core.Op.Method
                     return DataResult<string>.Failed($"箱型{conta.CtnAll}的映射数据代码未找到");
                 }
 
-                if (string.IsNullOrWhiteSpace(conta.KindPkgs))
+                //截单时箱的包装必填
+                if (string.IsNullOrWhiteSpace(conta.KindPkgs) && req.SendType.Equals("E",StringComparison.OrdinalIgnoreCase))
                     return DataResult<string>.Failed($"集装箱包装不能为空!");
 
-                long packageId = long.Parse(conta.KindPkgs);
+                if (!string.IsNullOrWhiteSpace(conta.KindPkgs))
+                {
+                    long packageId = long.Parse(conta.KindPkgs);
 
-                var mapRlt = GetPackageEDICode(packageId, codePackageList, mapPackageList, order.CarrierId, CONST_MAPPING_MODULE);
+                    var mapRlt = GetPackageEDICode(packageId, codePackageList, mapPackageList, order.CarrierId, CONST_MAPPING_MODULE);
 
-                if (codePackageList.Any(b => b.Id == packageId))
-                    contaModel.KINDPKGS = codePackageList.FirstOrDefault(b => b.Id == packageId).PackageName;
+                    if (codePackageList.Any(b => b.Id == packageId))
+                        contaModel.KINDPKGS = codePackageList.FirstOrDefault(b => b.Id == packageId).PackageName;
 
-                if (mapRlt.Succeeded)
-                {
-                    contaModel.KINDPKGS_EDI_CODE = mapRlt.Data;
+                    if (mapRlt.Succeeded)
+                    {
+                        contaModel.KINDPKGS_EDI_CODE = mapRlt.Data;
+                    }
+                    else
+                    {
+                        return DataResult<string>.Failed($"集装箱【{conta.CntrNo}】包装{conta.KindPkgs}的映射数据代码未找到");
+                    }
                 }
                 else
                 {
-                    return DataResult<string>.Failed($"包装{order.KindPkgs}的映射数据代码未找到");
+                    if(req.SendType.Equals("E", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return DataResult<string>.Failed($"集装箱【{conta.CntrNo}】包装{conta.KindPkgs} 不能为空");
+                    }
                 }
 
                 primaryModel.CTNLIST.Add(contaModel);
@@ -2606,11 +2617,16 @@ namespace DS.WMS.Core.Op.Method
                 if (!string.IsNullOrWhiteSpace(mapCtnInfo.MapCode))
                     return DataResult<string>.Success(mapCtnInfo.MapCode);
 
-                return DataResult<string>.FailedData(mapCtnInfo.MapCode);
+                throw new Exception($"集装箱型 {ctnName}的映射代码未找到");
             }
             else
             {
-                throw new Exception($"集装箱型 {ctnName}的映射代码未找到");
+                if (codeCtnInfo != null && !string.IsNullOrWhiteSpace(codeCtnInfo.EdiCode))
+                {
+                    return DataResult<string>.Success(codeCtnInfo.EdiCode);
+                }
+
+                throw new Exception($"集装箱型 {ctnName}基础代码EDI 错误");
             }
         }
         #endregion
@@ -2660,12 +2676,25 @@ namespace DS.WMS.Core.Op.Method
                 if (!string.IsNullOrWhiteSpace(mapPackageInfo.MapCode))
                     return DataResult<string>.Success(mapPackageInfo.MapCode);
 
-                return DataResult<string>.FailedData(mapPackageInfo.MapCode);
+                //return DataResult<string>.FailedData(mapPackageInfo.MapCode);
+                throw new Exception($"包装的映射代码未找到");
             }
             else
             {
-                throw new Exception($"包装的映射代码未找到");
+                var codePackage = codePackageList.FirstOrDefault(b => b.Id == packageCodeId);
+
+                if(codePackage != null && !string.IsNullOrWhiteSpace(codePackage.EdiCode))
+                {
+                    return DataResult<string>.Success(codePackage.EdiCode);
+                }
+
+                throw new Exception($"包装的基础信息EDI代码未找到");
             }
+
+            //else
+            //{
+            //    
+            //}
         }
         #endregion