Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

heshaofeng

6 天以前 ba30538b12f66d8483b925e44f38b9ec486b4999

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -1,6 +1,7 @@
using AutoMapper;
using SqlSugar;
using System.Dynamic;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
@@ -681,8 +682,10 @@
                        return WebResponseContent.Instance.Error($"托盘{palletCode}下未找到条码{barcode}的明细记录");
                    }

                    ResetInboundOrderStatus(new List<string> { targetDetail.OrderNo},new List<string> { targetDetail.Barcode});
                    // åˆ é™¤æŒ‡å®šæ˜Žç»†
                    _stockDetailRepository.DeleteData(targetDetail);


                    // é‡æ–°æŸ¥è¯¢å‰©ä½™æ˜Žç»†ï¼ˆä¿è¯æ•°æ®å‡†ç¡®æ€§ï¼‰
                    var remainingDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>()
@@ -748,8 +751,13 @@

                if (inboundOrder == null) continue;

                inboundOrder.OrderStatus = 0;
                _inboundOrderRepository.UpdateData(inboundOrder);
                bool isSingleBarcode = barcodes != null && barcodes.Count == 1;
                if (!isSingleBarcode)
                {
                    // éžå•ä¸ªæ¡ç ï¼ˆæ•´å•/多个条码）：重置主表状态为0
                    inboundOrder.OrderStatus = 0;
                    _inboundOrderRepository.UpdateData(inboundOrder);
                }

                // é‡ç½®å…¥åº“单明细状态
                if (inboundOrder.Details == null || !inboundOrder.Details.Any()) continue;
@@ -770,6 +778,10 @@
        public override PageGridData<Dt_InboundOrder> GetPageData(PageDataOptions options)
        {
            string wheres = ValidatePageOptions(options);

            string pattern = @"inboundOrderNo like '[^']+'\s*and\s*";
            wheres = Regex.Replace(wheres, pattern, "", RegexOptions.IgnoreCase);

            //获取排序字段
            Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
            List<OrderByModel> orderByModels = new List<OrderByModel>();
@@ -789,7 +801,7 @@
            if (!string.IsNullOrEmpty(options.Wheres))
            {
                try
                {
                {                  
                    searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                    if (searchParametersList.Count > 0)
                    {