ZhongRui/ALDbanyunxiangmu.git

heshaofeng

2025-12-04 587f0335544a6a0be00de5f56cb31af81169121e

提交

已修改3个文件

	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs	426 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -869,237 +869,237 @@
             .WhereIF(whereExpression != null, whereExpression).ToListAsync();
        }

        //public bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType)
        //{
        //    Type type = entity.GetType();
        //    Assembly assembly = type.Assembly;
        //    Type? htyType = assembly.GetType(type.FullName + "_Hty");
        //    if (htyType != null)
        //    {
        //        object? obj = Activator.CreateInstance(htyType);
        //        PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
        //        PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType));
        //        PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId));
        //        if (obj != null && keyPro != null && operateTypePro != null && sourceIdPro != null)
        //        {
        //            operateTypePro.SetValue(obj, operateType.ToString());
        //            sourceIdPro.SetValue(obj, keyPro.GetValue(entity));

        //            List<PropertyInfo> propertyInfos = htyType.GetProperties().Where(x => x.Name != operateTypePro.Name && x.Name != sourceIdPro.Name && x.Name != keyPro.Name).ToList();

        //            for (int i = 0; i < propertyInfos.Count; i++)
        //            {
        //                PropertyInfo propertyInfo = propertyInfos[i];
        //                PropertyInfo? property = type.GetProperty(propertyInfo.Name);

        //                if (property != null)
        //                {
        //                    if (propertyInfo.Name == nameof(BaseEntity.Modifier))
        //                    {
        //                        propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
        //                    }
        //                    else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
        //                    {
        //                        propertyInfo.SetValue(obj, DateTime.Now);
        //                    }                            
        //                    else
        //                    {
        //                        propertyInfo.SetValue(obj, property.GetValue(entity));
        //                    }
        //                }
        //            }
        //            if (obj != null)
        //                _db.InsertableByObject(obj).AS(type.Name + "_Hty").ExecuteCommand();
        //        }
        //    }
        //    return DeleteData(entity);

        //}

        public bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType)
        {
            // æ ¸å¿é»è¾ï¼ç¨äºå¡ä¿è¯ååæ§ï¼å¼å¸¸æè·é¿åæµç¨ä¸æï¼æ¥å¿è¾å©ææ¥
            bool isSuccess = false;
            string entityTypeName = entity?.GetType().Name ?? "æªç¥å®ä½";

            try
            Type type = entity.GetType();
            Assembly assembly = type.Assembly;
            Type? htyType = assembly.GetType(type.FullName + "_Hty");
            if (htyType != null)
            {
                // åç½®æ ¡éªï¼å®ä½ä¸è½ä¸ºç©º
                if (entity == null)
                object? obj = Activator.CreateInstance(htyType);
                PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
                PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType));
                PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId));
                if (obj != null && keyPro != null && operateTypePro != null && sourceIdPro != null)
                {
                    return false;
                }
                    operateTypePro.SetValue(obj, operateType.ToString());
                    sourceIdPro.SetValue(obj, keyPro.GetValue(entity));

                Type entityType = entity.GetType();
                Assembly assembly = entityType.Assembly;
                string htyTypeName = $"{entityType.FullName}_Hty";
                Type? htyType = assembly.GetType(htyTypeName);
                    List<PropertyInfo> propertyInfos = htyType.GetProperties().Where(x => x.Name != operateTypePro.Name && x.Name != sourceIdPro.Name && x.Name != keyPro.Name).ToList();

                // 1. æ£æ¥åå²è¡¨ç±»åæ¯å¦åå¨
                if (htyType == null)
                {
                 
                    return false;
                }

                // 2. åå»ºåå²è¡¨å®ä¾ï¼å¤çæ åæé å½æ°ä¸åå¨çæåµï¼
                object? htyObj;
                try
                {
                    htyObj = Activator.CreateInstance(htyType);
                }
                catch (Exception ex)
                {
                    // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå»ºåå²è¡¨å®ä¾ {HtyTypeName} å¤±è´¥", htyTypeName);
                    return false;
                }
                if (htyObj == null)
                {
                    // _logger.LogWarning("DeleteAndMoveIntoHtyï¼åå²è¡¨å®ä¾ {HtyTypeName} åå»ºç»æä¸ºnull", htyTypeName);
                    return false;
                }

                // 3. è·åæ ¸å¿å±æ§ï¼æå®BindingFlagsç¡®ä¿è·åå¬å±å®ä¾å±æ§ï¼
                BindingFlags propFlags = BindingFlags.Public | BindingFlags.Instance;
                PropertyInfo? keyPro = typeof(TEntity).GetKeyProperty(); // èªå®ä¹æ¹æ³éç¡®ä¿è¿åéç©ºï¼æ¤å¤å¢å å¤ç©º
                PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType), propFlags);
                PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId), propFlags);

                // æ ¡éªæ ¸å¿å±æ§æ¯å¦åå¨
                if (keyPro == null)
                {
                    //_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} æªæ¾å°ä¸»é®å±æ§", entityType.FullName);
                    return false;
                }
                if (operateTypePro == null)
                {
                    //_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°OperateTypeå±æ§", htyTypeName);
                    return false;
                }
                if (sourceIdPro == null)
                {
                    // _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°SourceIdå±æ§", htyTypeName);
                    return false;
                }

                // 4. èµå¼æ ¸å¿å±æ§ï¼æ ¡éªç±»åå¹éï¼é¿åSetValueæå¼å¸¸ï¼
                try
                {
                    // å¤çOperateTypeç±»åå¹éï¼è¥åå²è¡¨å±æ§æ¯æä¸¾ç±»åï¼ç´æ¥ä¼ æä¸¾èéåç¬¦ä¸²
                    if (operateTypePro.PropertyType == typeof(OperateTypeEnum))
                    for (int i = 0; i < propertyInfos.Count; i++)
                    {
                        operateTypePro.SetValue(htyObj, operateType);
                    }
                    else if (operateTypePro.PropertyType == typeof(string))
                    {
                        operateTypePro.SetValue(htyObj, operateType.ToString());
                    }
                    else
                    {
                        //_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} çOperateTypeå±æ§ç±»å {PropType} ä¸å¹éï¼ä»æ¯ææä¸¾/åç¬¦ä¸²ï¼", htyTypeName, operateTypePro.PropertyType.FullName);
                        return false;
                    }
                        PropertyInfo propertyInfo = propertyInfos[i];
                        PropertyInfo? property = type.GetProperty(propertyInfo.Name);

                    // èµå¼SourceIdï¼æ ¡éªç±»åå¹éï¼
                    object sourceIdValue = keyPro.GetValue(entity)!;
                    if (sourceIdPro.PropertyType != sourceIdValue.GetType())
                    {
                        sourceIdValue = Convert.ChangeType(sourceIdValue, sourceIdPro.PropertyType); // ç±»åè½¬æ¢
                    }
                    sourceIdPro.SetValue(htyObj, sourceIdValue);
                }
                catch (Exception ex)
                {
                    // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æ ¸å¿å±æ§èµå¼å¤±è´¥", htyTypeName);
                    return false;
                }

                // 5. èµå¼å¶ä»å±æ§ï¼æé¤æ ¸å¿å±æ§ï¼
                List<PropertyInfo> htyProperties = htyType.GetProperties(propFlags)
                    .Where(x => x.Name != operateTypePro.Name
                             && x.Name != sourceIdPro.Name
                             && x.Name != keyPro.Name)
                    .ToList();

                foreach (PropertyInfo htyProp in htyProperties)
                {
                    PropertyInfo? entityProp = entityType.GetProperty(htyProp.Name, propFlags);
                    if (entityProp == null) continue; // å®ä½æ è¯¥å±æ§åè·³è¿

                    try
                    {
                        object propValue;
                        // å¤çä¿®æ¹äººï¼é¿åApp.Userç©ºå¼ç¨
                        if (htyProp.Name == nameof(BaseEntity.Modifier))
                        if (property != null)
                        {
                            propValue = App.User?.UserId > 0 ? App.User?.UserName : "System";
                            if (propertyInfo.Name == nameof(BaseEntity.Modifier))
                            {
                                propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
                            }
                            else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
                            {
                                propertyInfo.SetValue(obj, DateTime.Now);
                            }
                            else
                            {
                                propertyInfo.SetValue(obj, property.GetValue(entity));
                            }
                        }
                        // å¤çä¿®æ¹æ¶é´
                        else if (htyProp.Name == nameof(BaseEntity.ModifyDate))
                        {
                            propValue = DateTime.Now;
                        }
                        // å¶ä»å±æ§ä»åå®ä½åå¼
                        else
                        {
                            propValue = entityProp.GetValue(entity) ?? DBNull.Value; // å¤çnullå¼
                        }

                        // ç±»åè½¬æ¢åèµå¼ï¼é¿åç±»åä¸å¹éï¼
                        if (propValue != DBNull.Value && propValue != null)
                        {
                            propValue = Convert.ChangeType(propValue, htyProp.PropertyType);
                        }
                        htyProp.SetValue(htyObj, propValue);
                    }
                    catch (Exception ex)
                    {
                        // _logger.LogWarning(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} å±æ§ {PropName} èµå¼å¤±è´¥ï¼è·³è¿è¯¥å±æ§", htyTypeName, htyProp.Name);
                    }
                    if (obj != null)
                        _db.InsertableByObject(obj).AS(type.Name + "_Hty").ExecuteCommand();
                }
                try
                {                   
                    // æ§è¡æå¥åå²è¡¨
                    int insertRows = _db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();

                    if (insertRows <= 0)
                    {
                        // _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æå¥å¤±è´¥ï¼å½±åè¡æ°0ï¼", htyTypeName);
                        _db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();
                        return false;
                    }
                    // æå¥æååæ§è¡å é¤
                    bool deleteSuccess = DeleteData(entity);
                    if (!deleteSuccess)
                    {
                        //_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å é¤å¤±è´¥", entityType.FullName);
                        DeleteData(entity);
                        return false;
                    }
                    // æäº¤äºå¡
                 
                    isSuccess = true;
                    //_logger.LogInformation("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å·²æåç§»å¥åå²è¡¨å¹¶å é¤åæ°æ®", entityType.FullName);
                }
                catch (Exception ex)
                {
                   
                    // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼äºå¡æ§è¡å¤±è´¥ï¼æå¥åå²è¡¨/å é¤åæ°æ®ï¼", entityType.FullName);
                    return false;
                }         
            }
            catch (Exception ex)
            {
                //  _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼å¤çå®ä½ {EntityTypeName} æ¶åçæªæè·å¼å¸¸", entityTypeName);
                return false;
            }
            return DeleteData(entity);

            return isSuccess;
        }

        //public bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType)
        //{
        //    // æ ¸å¿é»è¾ï¼ç¨äºå¡ä¿è¯ååæ§ï¼å¼å¸¸æè·é¿åæµç¨ä¸æï¼æ¥å¿è¾å©ææ¥
        //    bool isSuccess = false;
        //    string entityTypeName = entity?.GetType().Name ?? "æªç¥å®ä½";

        //    try
        //    {
        //        // åç½®æ ¡éªï¼å®ä½ä¸è½ä¸ºç©º
        //        if (entity == null)
        //        {
        //            return false;
        //        }

        //        Type entityType = entity.GetType();
        //        Assembly assembly = entityType.Assembly;
        //        string htyTypeName = $"{entityType.FullName}_Hty";
        //        Type? htyType = assembly.GetType(htyTypeName);

        //        // 1. æ£æ¥åå²è¡¨ç±»åæ¯å¦åå¨
        //        if (htyType == null)
        //        {

        //            return false;
        //        }

        //        // 2. åå»ºåå²è¡¨å®ä¾ï¼å¤çæ åæé å½æ°ä¸åå¨çæåµï¼
        //        object? htyObj;
        //        try
        //        {
        //            htyObj = Activator.CreateInstance(htyType);
        //        }
        //        catch (Exception ex)
        //        {
        //            // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå»ºåå²è¡¨å®ä¾ {HtyTypeName} å¤±è´¥", htyTypeName);
        //            return false;
        //        }
        //        if (htyObj == null)
        //        {
        //            // _logger.LogWarning("DeleteAndMoveIntoHtyï¼åå²è¡¨å®ä¾ {HtyTypeName} åå»ºç»æä¸ºnull", htyTypeName);
        //            return false;
        //        }

        //        // 3. è·åæ ¸å¿å±æ§ï¼æå®BindingFlagsç¡®ä¿è·åå¬å±å®ä¾å±æ§ï¼
        //        BindingFlags propFlags = BindingFlags.Public | BindingFlags.Instance;
        //        PropertyInfo? keyPro = typeof(TEntity).GetKeyProperty(); // èªå®ä¹æ¹æ³éç¡®ä¿è¿åéç©ºï¼æ¤å¤å¢å å¤ç©º
        //        PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType), propFlags);
        //        PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId), propFlags);

        //        // æ ¡éªæ ¸å¿å±æ§æ¯å¦åå¨
        //        if (keyPro == null)
        //        {
        //            //_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} æªæ¾å°ä¸»é®å±æ§", entityType.FullName);
        //            return false;
        //        }
        //        if (operateTypePro == null)
        //        {
        //            //_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°OperateTypeå±æ§", htyTypeName);
        //            return false;
        //        }
        //        if (sourceIdPro == null)
        //        {
        //            // _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°SourceIdå±æ§", htyTypeName);
        //            return false;
        //        }

        //        // 4. èµå¼æ ¸å¿å±æ§ï¼æ ¡éªç±»åå¹éï¼é¿åSetValueæå¼å¸¸ï¼
        //        try
        //        {
        //            // å¤çOperateTypeç±»åå¹éï¼è¥åå²è¡¨å±æ§æ¯æä¸¾ç±»åï¼ç´æ¥ä¼ æä¸¾èéåç¬¦ä¸²
        //            if (operateTypePro.PropertyType == typeof(OperateTypeEnum))
        //            {
        //                operateTypePro.SetValue(htyObj, operateType);
        //            }
        //            else if (operateTypePro.PropertyType == typeof(string))
        //            {
        //                operateTypePro.SetValue(htyObj, operateType.ToString());
        //            }
        //            else
        //            {
        //                //_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} çOperateTypeå±æ§ç±»å {PropType} ä¸å¹éï¼ä»æ¯ææä¸¾/åç¬¦ä¸²ï¼", htyTypeName, operateTypePro.PropertyType.FullName);
        //                return false;
        //            }

        //            // èµå¼SourceIdï¼æ ¡éªç±»åå¹éï¼
        //            object sourceIdValue = keyPro.GetValue(entity)!;
        //            if (sourceIdPro.PropertyType != sourceIdValue.GetType())
        //            {
        //                sourceIdValue = Convert.ChangeType(sourceIdValue, sourceIdPro.PropertyType); // ç±»åè½¬æ¢
        //            }
        //            sourceIdPro.SetValue(htyObj, sourceIdValue);
        //        }
        //        catch (Exception ex)
        //        {
        //            // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æ ¸å¿å±æ§èµå¼å¤±è´¥", htyTypeName);
        //            return false;
        //        }

        //        // 5. èµå¼å¶ä»å±æ§ï¼æé¤æ ¸å¿å±æ§ï¼
        //        List<PropertyInfo> htyProperties = htyType.GetProperties(propFlags)
        //            .Where(x => x.Name != operateTypePro.Name
        //                     && x.Name != sourceIdPro.Name
        //                     && x.Name != keyPro.Name)
        //            .ToList();

        //        foreach (PropertyInfo htyProp in htyProperties)
        //        {
        //            PropertyInfo? entityProp = entityType.GetProperty(htyProp.Name, propFlags);
        //            if (entityProp == null) continue; // å®ä½æ è¯¥å±æ§åè·³è¿

        //            try
        //            {
        //                object propValue;
        //                // å¤çä¿®æ¹äººï¼é¿åApp.Userç©ºå¼ç¨
        //                if (htyProp.Name == nameof(BaseEntity.Modifier))
        //                {
        //                    propValue = App.User?.UserId > 0 ? App.User?.UserName : "System";
        //                }
        //                // å¤çä¿®æ¹æ¶é´
        //                else if (htyProp.Name == nameof(BaseEntity.ModifyDate))
        //                {
        //                    propValue = DateTime.Now;
        //                }
        //                // å¶ä»å±æ§ä»åå®ä½åå¼
        //                else
        //                {
        //                    propValue = entityProp.GetValue(entity) ?? DBNull.Value; // å¤çnullå¼
        //                }

        //                // ç±»åè½¬æ¢åèµå¼ï¼é¿åç±»åä¸å¹éï¼
        //                if (propValue != DBNull.Value && propValue != null)
        //                {
        //                    propValue = Convert.ChangeType(propValue, htyProp.PropertyType);
        //                }
        //                htyProp.SetValue(htyObj, propValue);
        //            }
        //            catch (Exception ex)
        //            {
        //                // _logger.LogWarning(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} å±æ§ {PropName} èµå¼å¤±è´¥ï¼è·³è¿è¯¥å±æ§", htyTypeName, htyProp.Name);
        //            }
        //        }
        //        try
        //        {                   
        //            // æ§è¡æå¥åå²è¡¨
        //            int insertRows = _db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();

        //            if (insertRows <= 0)
        //            {
        //                // _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æå¥å¤±è´¥ï¼å½±åè¡æ°0ï¼", htyTypeName);
        //                _db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();
        //                return false;
        //            }
        //            // æå¥æååæ§è¡å é¤
        //            bool deleteSuccess = DeleteData(entity);
        //            if (!deleteSuccess)
        //            {
        //                //_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å é¤å¤±è´¥", entityType.FullName);
        //                DeleteData(entity);
        //                return false;
        //            }
        //            // æäº¤äºå¡

        //            isSuccess = true;
        //            //_logger.LogInformation("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å·²æåç§»å¥åå²è¡¨å¹¶å é¤åæ°æ®", entityType.FullName);
        //        }
        //        catch (Exception ex)
        //        {

        //            // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼äºå¡æ§è¡å¤±è´¥ï¼æå¥åå²è¡¨/å é¤åæ°æ®ï¼", entityType.FullName);
        //            return false;
        //        }         
        //    }
        //    catch (Exception ex)
        //    {
        //        //  _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼å¤çå®ä½ {EntityTypeName} æ¶åçæªæè·å¼å¸¸", entityTypeName);
        //        return false;
        //    }

        //    return isSuccess;
        //}


public bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateTypeEnum operateType)

        public bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateTypeEnum operateType)
{
    Type type = typeof(TEntity);
    Assembly assembly = type.Assembly;

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

@@ -1124,7 +1124,7 @@
        {
            // è·åææ°çè®¢åæç»æ°æ®ï¼å¸¦éï¼
            var currentOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                .With(SqlWith.RowLock)
                //.With(SqlWith.RowLock)
                .FirstAsync(x => x.Id == orderDetailId);

            decimal newOverOutQuantity = currentOrderDetail.OverOutQuantity - cancelQty;
@@ -3004,7 +3004,8 @@
                    stockInfo.Details = new List<Dt_StockInfoDetail>();
                }
                var inboindId = 0; Dt_InboundOrder dt_InboundOrder = null;
                var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == dbinboundOrderDetails.First().OrderNo).First();
                var orderno = dbinboundOrderDetails.First().OrderNo;
                var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == orderno).FirstOrDefault();
                if (dbinbound == null)
                {
                    dt_InboundOrder = new Dt_InboundOrder

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

@@ -159,7 +159,7 @@
                    foreach (var key in keys)
                    {
                        var detail = _outboundOrderDetailService.Db.Ado.SqlQuerySingle<Dt_OutboundOrderDetail>(
                            "SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK, ROWLOCK) WHERE Id = @Id",
                            "SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK) WHERE Id = @Id",
                            new { Id = key });

                        if (detail != null)
@@ -387,7 +387,6 @@
                            // TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                            PalletType = stockInfo.PalletType,
                            WarehouseId = stockInfo.WarehouseId,

                        };
                        //if (taskType != TaskTypeEnum.OutEmpty)
                        //{
@@ -403,51 +402,7 @@
            return tasks;
        }

        public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType)
        {
            List<Dt_Task> tasks = new List<Dt_Task>();
            List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
            for (int i = 0; i < stockInfos.Count; i++)
            {
                Dt_StockInfo stockInfo = stockInfos[i];

                if (stockInfo != null)
                {
                    Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == stockInfo.LocationCode);
                    if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
                    {
                        Dt_Task task = new()
                        {
                            CurrentAddress = stockInfo.LocationCode,
                            Grade = 0,
                            PalletCode = stockInfo.PalletCode,
                            NextAddress = "",
                            Roadway = locationInfo.RoadwayNo,
                            SourceAddress = stockInfo.LocationCode,
                            TargetAddress = "",
                            TaskStatus = TaskStatusEnum.New.ObjToInt(),
                            TaskType = taskType.ObjToInt(),
                            //TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                            PalletType = stockInfo.PalletType,
                            WarehouseId = stockInfo.WarehouseId,

                        };
                        //if (taskType != TaskTypeEnum.OutEmpty)
                        //{
                        //    task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                        //    task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                        //    task.BatchNo = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
                        //}
                        //if (stockInfo.StockLength > 0)
                        //{
                        //    task.TaskLength = stockInfo.StockLength;
                        //}
                        tasks.Add(task);
                    }
                }
            }
            return tasks;
        }

        #region ååéç®¡çå¨
        private static readonly ConcurrentDictionary<string, SemaphoreSlim> _normalmaterialLocks =
@@ -713,7 +668,8 @@
            Dt_OutboundOrderDetail? orderDetail = null;
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
            List<Dt_LocationInfo>? locationInfos = null;
            if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
            if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt() ||
                outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Outbound.ObjToInt())
            {
                (List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
                if (result.Item1 != null && result.Item1.Count > 0)
@@ -749,7 +705,7 @@
                if (stockLockInfos != null && stockLockInfos.Count > 0)
                {
                    List<Dt_StockInfo> stocks = _stockService.StockInfoService.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
                    tasks = GetTasks(stocks, TaskTypeEnum.Outbound);
                    tasks = GetTasks(stocks, TaskTypeEnum.Outbound,station);
                }
            }

@@ -1001,7 +957,7 @@
            List<Dt_Task> tasks = new List<Dt_Task>();

            // è·åè®¢åæç»
            var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK, ROWLOCK")
            var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK")
                .FirstAsync(x => x.Id == orderDetailId);

            if (outboundOrderDetail == null)

			@@ -869,237 +869,237 @@
			.WhereIF(whereExpression != null, whereExpression).ToListAsync();
			}

			//public bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType)
			//{
			// Type type = entity.GetType();
			// Assembly assembly = type.Assembly;
			// Type? htyType = assembly.GetType(type.FullName + "_Hty");
			// if (htyType != null)
			// {
			// object? obj = Activator.CreateInstance(htyType);
			// PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
			// PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType));
			// PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId));
			// if (obj != null && keyPro != null && operateTypePro != null && sourceIdPro != null)
			// {
			// operateTypePro.SetValue(obj, operateType.ToString());
			// sourceIdPro.SetValue(obj, keyPro.GetValue(entity));

			// List<PropertyInfo> propertyInfos = htyType.GetProperties().Where(x => x.Name != operateTypePro.Name && x.Name != sourceIdPro.Name && x.Name != keyPro.Name).ToList();

			// for (int i = 0; i < propertyInfos.Count; i++)
			// {
			// PropertyInfo propertyInfo = propertyInfos[i];
			// PropertyInfo? property = type.GetProperty(propertyInfo.Name);

			// if (property != null)
			// {
			// if (propertyInfo.Name == nameof(BaseEntity.Modifier))
			// {
			// propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
			// }
			// else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
			// {
			// propertyInfo.SetValue(obj, DateTime.Now);
			// }
			// else
			// {
			// propertyInfo.SetValue(obj, property.GetValue(entity));
			// }
			// }
			// }
			// if (obj != null)
			// _db.InsertableByObject(obj).AS(type.Name + "_Hty").ExecuteCommand();
			// }
			// }
			// return DeleteData(entity);

			//}

			public bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType)
			{
			// æ ¸å¿é»è¾ï¼ç¨äºå¡ä¿è¯ååæ§ï¼å¼å¸¸æè·é¿åæµç¨ä¸æï¼æ¥å¿è¾å©ææ¥
			bool isSuccess = false;
			string entityTypeName = entity?.GetType().Name ?? "æªç¥å®ä½";

			try
			Type type = entity.GetType();
			Assembly assembly = type.Assembly;
			Type? htyType = assembly.GetType(type.FullName + "_Hty");
			if (htyType != null)
			{
			// åç½®æ ¡éªï¼å®ä½ä¸è½ä¸ºç©º
			if (entity == null)
			object? obj = Activator.CreateInstance(htyType);
			PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
			PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType));
			PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId));
			if (obj != null && keyPro != null && operateTypePro != null && sourceIdPro != null)
			{
			return false;
			}
			operateTypePro.SetValue(obj, operateType.ToString());
			sourceIdPro.SetValue(obj, keyPro.GetValue(entity));

			Type entityType = entity.GetType();
			Assembly assembly = entityType.Assembly;
			string htyTypeName = $"{entityType.FullName}_Hty";
			Type? htyType = assembly.GetType(htyTypeName);
			List<PropertyInfo> propertyInfos = htyType.GetProperties().Where(x => x.Name != operateTypePro.Name && x.Name != sourceIdPro.Name && x.Name != keyPro.Name).ToList();

			// 1. æ£æ¥åå²è¡¨ç±»åæ¯å¦åå¨
			if (htyType == null)
			{

			return false;
			}

			// 2. åå»ºåå²è¡¨å®ä¾ï¼å¤çæ åæé å½æ°ä¸åå¨çæåµï¼
			object? htyObj;
			try
			{
			htyObj = Activator.CreateInstance(htyType);
			}
			catch (Exception ex)
			{
			// _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå»ºåå²è¡¨å®ä¾ {HtyTypeName} å¤±è´¥", htyTypeName);
			return false;
			}
			if (htyObj == null)
			{
			// _logger.LogWarning("DeleteAndMoveIntoHtyï¼åå²è¡¨å®ä¾ {HtyTypeName} åå»ºç»æä¸ºnull", htyTypeName);
			return false;
			}

			// 3. è·åæ ¸å¿å±æ§ï¼æå®BindingFlagsç¡®ä¿è·åå¬å±å®ä¾å±æ§ï¼
			BindingFlags propFlags = BindingFlags.Public \| BindingFlags.Instance;
			PropertyInfo? keyPro = typeof(TEntity).GetKeyProperty(); // èªå®ä¹æ¹æ³éç¡®ä¿è¿åéç©ºï¼æ¤å¤å¢å å¤ç©º
			PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType), propFlags);
			PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId), propFlags);

			// æ ¡éªæ ¸å¿å±æ§æ¯å¦åå¨
			if (keyPro == null)
			{
			//_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} æªæ¾å°ä¸»é®å±æ§", entityType.FullName);
			return false;
			}
			if (operateTypePro == null)
			{
			//_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°OperateTypeå±æ§", htyTypeName);
			return false;
			}
			if (sourceIdPro == null)
			{
			// _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°SourceIdå±æ§", htyTypeName);
			return false;
			}

			// 4. èµå¼æ ¸å¿å±æ§ï¼æ ¡éªç±»åå¹éï¼é¿åSetValueæå¼å¸¸ï¼
			try
			{
			// å¤çOperateTypeç±»åå¹éï¼è¥åå²è¡¨å±æ§æ¯æä¸¾ç±»åï¼ç´æ¥ä¼ æä¸¾èéåç¬¦ä¸²
			if (operateTypePro.PropertyType == typeof(OperateTypeEnum))
			for (int i = 0; i < propertyInfos.Count; i++)
			{
			operateTypePro.SetValue(htyObj, operateType);
			}
			else if (operateTypePro.PropertyType == typeof(string))
			{
			operateTypePro.SetValue(htyObj, operateType.ToString());
			}
			else
			{
			//_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} çOperateTypeå±æ§ç±»å {PropType} ä¸å¹éï¼ä»æ¯ææä¸¾/åç¬¦ä¸²ï¼", htyTypeName, operateTypePro.PropertyType.FullName);
			return false;
			}
			PropertyInfo propertyInfo = propertyInfos[i];
			PropertyInfo? property = type.GetProperty(propertyInfo.Name);

			// èµå¼SourceIdï¼æ ¡éªç±»åå¹éï¼
			object sourceIdValue = keyPro.GetValue(entity)!;
			if (sourceIdPro.PropertyType != sourceIdValue.GetType())
			{
			sourceIdValue = Convert.ChangeType(sourceIdValue, sourceIdPro.PropertyType); // ç±»åè½¬æ¢
			}
			sourceIdPro.SetValue(htyObj, sourceIdValue);
			}
			catch (Exception ex)
			{
			// _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æ ¸å¿å±æ§èµå¼å¤±è´¥", htyTypeName);
			return false;
			}

			// 5. èµå¼å¶ä»å±æ§ï¼æé¤æ ¸å¿å±æ§ï¼
			List<PropertyInfo> htyProperties = htyType.GetProperties(propFlags)
			.Where(x => x.Name != operateTypePro.Name
			&& x.Name != sourceIdPro.Name
			&& x.Name != keyPro.Name)
			.ToList();

			foreach (PropertyInfo htyProp in htyProperties)
			{
			PropertyInfo? entityProp = entityType.GetProperty(htyProp.Name, propFlags);
			if (entityProp == null) continue; // å®ä½æ è¯¥å±æ§åè·³è¿

			try
			{
			object propValue;
			// å¤çä¿®æ¹äººï¼é¿åApp.Userç©ºå¼ç¨
			if (htyProp.Name == nameof(BaseEntity.Modifier))
			if (property != null)
			{
			propValue = App.User?.UserId > 0 ? App.User?.UserName : "System";
			if (propertyInfo.Name == nameof(BaseEntity.Modifier))
			{
			propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
			}
			else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
			{
			propertyInfo.SetValue(obj, DateTime.Now);
			}
			else
			{
			propertyInfo.SetValue(obj, property.GetValue(entity));
			}
			}
			// å¤çä¿®æ¹æ¶é´
			else if (htyProp.Name == nameof(BaseEntity.ModifyDate))
			{
			propValue = DateTime.Now;
			}
			// å¶ä»å±æ§ä»åå®ä½åå¼
			else
			{
			propValue = entityProp.GetValue(entity) ?? DBNull.Value; // å¤çnullå¼
			}

			// ç±»åè½¬æ¢åèµå¼ï¼é¿åç±»åä¸å¹éï¼
			if (propValue != DBNull.Value && propValue != null)
			{
			propValue = Convert.ChangeType(propValue, htyProp.PropertyType);
			}
			htyProp.SetValue(htyObj, propValue);
			}
			catch (Exception ex)
			{
			// _logger.LogWarning(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} å±æ§ {PropName} èµå¼å¤±è´¥ï¼è·³è¿è¯¥å±æ§", htyTypeName, htyProp.Name);
			}
			if (obj != null)
			_db.InsertableByObject(obj).AS(type.Name + "_Hty").ExecuteCommand();
			}
			try
			{
			// æ§è¡æå¥åå²è¡¨
			int insertRows = _db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();

			if (insertRows <= 0)
			{
			// _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æå¥å¤±è´¥ï¼å½±åè¡æ°0ï¼", htyTypeName);
			_db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();
			return false;
			}
			// æå¥æååæ§è¡å é¤
			bool deleteSuccess = DeleteData(entity);
			if (!deleteSuccess)
			{
			//_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å é¤å¤±è´¥", entityType.FullName);
			DeleteData(entity);
			return false;
			}
			// æäº¤äºå¡

			isSuccess = true;
			//_logger.LogInformation("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å·²æåç§»å¥åå²è¡¨å¹¶å é¤åæ°æ®", entityType.FullName);
			}
			catch (Exception ex)
			{

			// _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼äºå¡æ§è¡å¤±è´¥ï¼æå¥åå²è¡¨/å é¤åæ°æ®ï¼", entityType.FullName);
			return false;
			}
			}
			catch (Exception ex)
			{
			// _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼å¤çå®ä½ {EntityTypeName} æ¶åçæªæè·å¼å¸¸", entityTypeName);
			return false;
			}
			return DeleteData(entity);

			return isSuccess;
			}

			//public bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType)
			//{
			// // æ ¸å¿é»è¾ï¼ç¨äºå¡ä¿è¯ååæ§ï¼å¼å¸¸æè·é¿åæµç¨ä¸æï¼æ¥å¿è¾å©ææ¥
			// bool isSuccess = false;
			// string entityTypeName = entity?.GetType().Name ?? "æªç¥å®ä½";

			// try
			// {
			// // åç½®æ ¡éªï¼å®ä½ä¸è½ä¸ºç©º
			// if (entity == null)
			// {
			// return false;
			// }

			// Type entityType = entity.GetType();
			// Assembly assembly = entityType.Assembly;
			// string htyTypeName = $"{entityType.FullName}_Hty";
			// Type? htyType = assembly.GetType(htyTypeName);

			// // 1. æ£æ¥åå²è¡¨ç±»åæ¯å¦åå¨
			// if (htyType == null)
			// {

			// return false;
			// }

			// // 2. åå»ºåå²è¡¨å®ä¾ï¼å¤çæ åæé å½æ°ä¸åå¨çæåµï¼
			// object? htyObj;
			// try
			// {
			// htyObj = Activator.CreateInstance(htyType);
			// }
			// catch (Exception ex)
			// {
			// // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå»ºåå²è¡¨å®ä¾ {HtyTypeName} å¤±è´¥", htyTypeName);
			// return false;
			// }
			// if (htyObj == null)
			// {
			// // _logger.LogWarning("DeleteAndMoveIntoHtyï¼åå²è¡¨å®ä¾ {HtyTypeName} åå»ºç»æä¸ºnull", htyTypeName);
			// return false;
			// }

			// // 3. è·åæ ¸å¿å±æ§ï¼æå®BindingFlagsç¡®ä¿è·åå¬å±å®ä¾å±æ§ï¼
			// BindingFlags propFlags = BindingFlags.Public \| BindingFlags.Instance;
			// PropertyInfo? keyPro = typeof(TEntity).GetKeyProperty(); // èªå®ä¹æ¹æ³éç¡®ä¿è¿åéç©ºï¼æ¤å¤å¢å å¤ç©º
			// PropertyInfo? operateTypePro = htyType.GetProperty(nameof(IBaseHistoryEntity.OperateType), propFlags);
			// PropertyInfo? sourceIdPro = htyType.GetProperty(nameof(IBaseHistoryEntity.SourceId), propFlags);

			// // æ ¡éªæ ¸å¿å±æ§æ¯å¦åå¨
			// if (keyPro == null)
			// {
			// //_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} æªæ¾å°ä¸»é®å±æ§", entityType.FullName);
			// return false;
			// }
			// if (operateTypePro == null)
			// {
			// //_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°OperateTypeå±æ§", htyTypeName);
			// return false;
			// }
			// if (sourceIdPro == null)
			// {
			// // _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æªæ¾å°SourceIdå±æ§", htyTypeName);
			// return false;
			// }

			// // 4. èµå¼æ ¸å¿å±æ§ï¼æ ¡éªç±»åå¹éï¼é¿åSetValueæå¼å¸¸ï¼
			// try
			// {
			// // å¤çOperateTypeç±»åå¹éï¼è¥åå²è¡¨å±æ§æ¯æä¸¾ç±»åï¼ç´æ¥ä¼ æä¸¾èéåç¬¦ä¸²
			// if (operateTypePro.PropertyType == typeof(OperateTypeEnum))
			// {
			// operateTypePro.SetValue(htyObj, operateType);
			// }
			// else if (operateTypePro.PropertyType == typeof(string))
			// {
			// operateTypePro.SetValue(htyObj, operateType.ToString());
			// }
			// else
			// {
			// //_logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} çOperateTypeå±æ§ç±»å {PropType} ä¸å¹éï¼ä»æ¯ææä¸¾/åç¬¦ä¸²ï¼", htyTypeName, operateTypePro.PropertyType.FullName);
			// return false;
			// }

			// // èµå¼SourceIdï¼æ ¡éªç±»åå¹éï¼
			// object sourceIdValue = keyPro.GetValue(entity)!;
			// if (sourceIdPro.PropertyType != sourceIdValue.GetType())
			// {
			// sourceIdValue = Convert.ChangeType(sourceIdValue, sourceIdPro.PropertyType); // ç±»åè½¬æ¢
			// }
			// sourceIdPro.SetValue(htyObj, sourceIdValue);
			// }
			// catch (Exception ex)
			// {
			// // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æ ¸å¿å±æ§èµå¼å¤±è´¥", htyTypeName);
			// return false;
			// }

			// // 5. èµå¼å¶ä»å±æ§ï¼æé¤æ ¸å¿å±æ§ï¼
			// List<PropertyInfo> htyProperties = htyType.GetProperties(propFlags)
			// .Where(x => x.Name != operateTypePro.Name
			// && x.Name != sourceIdPro.Name
			// && x.Name != keyPro.Name)
			// .ToList();

			// foreach (PropertyInfo htyProp in htyProperties)
			// {
			// PropertyInfo? entityProp = entityType.GetProperty(htyProp.Name, propFlags);
			// if (entityProp == null) continue; // å®ä½æ è¯¥å±æ§åè·³è¿

			// try
			// {
			// object propValue;
			// // å¤çä¿®æ¹äººï¼é¿åApp.Userç©ºå¼ç¨
			// if (htyProp.Name == nameof(BaseEntity.Modifier))
			// {
			// propValue = App.User?.UserId > 0 ? App.User?.UserName : "System";
			// }
			// // å¤çä¿®æ¹æ¶é´
			// else if (htyProp.Name == nameof(BaseEntity.ModifyDate))
			// {
			// propValue = DateTime.Now;
			// }
			// // å¶ä»å±æ§ä»åå®ä½åå¼
			// else
			// {
			// propValue = entityProp.GetValue(entity) ?? DBNull.Value; // å¤çnullå¼
			// }

			// // ç±»åè½¬æ¢åèµå¼ï¼é¿åç±»åä¸å¹éï¼
			// if (propValue != DBNull.Value && propValue != null)
			// {
			// propValue = Convert.ChangeType(propValue, htyProp.PropertyType);
			// }
			// htyProp.SetValue(htyObj, propValue);
			// }
			// catch (Exception ex)
			// {
			// // _logger.LogWarning(ex, "DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} å±æ§ {PropName} èµå¼å¤±è´¥ï¼è·³è¿è¯¥å±æ§", htyTypeName, htyProp.Name);
			// }
			// }
			// try
			// {
			// // æ§è¡æå¥åå²è¡¨
			// int insertRows = _db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();

			// if (insertRows <= 0)
			// {
			// // _logger.LogError("DeleteAndMoveIntoHtyï¼åå²è¡¨ {HtyTypeName} æå¥å¤±è´¥ï¼å½±åè¡æ°0ï¼", htyTypeName);
			// _db.InsertableByObject(htyObj).AS(entityType.Name + "_Hty").ExecuteCommand();
			// return false;
			// }
			// // æå¥æååæ§è¡å é¤
			// bool deleteSuccess = DeleteData(entity);
			// if (!deleteSuccess)
			// {
			// //_logger.LogError("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å é¤å¤±è´¥", entityType.FullName);
			// DeleteData(entity);
			// return false;
			// }
			// // æäº¤äºå¡

			// isSuccess = true;
			// //_logger.LogInformation("DeleteAndMoveIntoHtyï¼å®ä½ {EntityType} å·²æåç§»å¥åå²è¡¨å¹¶å é¤åæ°æ®", entityType.FullName);
			// }
			// catch (Exception ex)
			// {

			// // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼äºå¡æ§è¡å¤±è´¥ï¼æå¥åå²è¡¨/å é¤åæ°æ®ï¼", entityType.FullName);
			// return false;
			// }
			// }
			// catch (Exception ex)
			// {
			// // _logger.LogError(ex, "DeleteAndMoveIntoHtyï¼å¤çå®ä½ {EntityTypeName} æ¶åçæªæè·å¼å¸¸", entityTypeName);
			// return false;
			// }

			// return isSuccess;
			//}


			public bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateTypeEnum operateType)

			public bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateTypeEnum operateType)
			{
			Type type = typeof(TEntity);
			Assembly assembly = type.Assembly;

			@@ -1124,7 +1124,7 @@
			{
			// è·åææ°çè®¢åæç»æ°æ®ï¼å¸¦éï¼
			var currentOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
			.With(SqlWith.RowLock)
			//.With(SqlWith.RowLock)
			.FirstAsync(x => x.Id == orderDetailId);

			decimal newOverOutQuantity = currentOrderDetail.OverOutQuantity - cancelQty;
			@@ -3004,7 +3004,8 @@
			stockInfo.Details = new List<Dt_StockInfoDetail>();
			}
			var inboindId = 0; Dt_InboundOrder dt_InboundOrder = null;
			var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == dbinboundOrderDetails.First().OrderNo).First();
			var orderno = dbinboundOrderDetails.First().OrderNo;
			var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == orderno).FirstOrDefault();
			if (dbinbound == null)
			{
			dt_InboundOrder = new Dt_InboundOrder

			@@ -159,7 +159,7 @@
			foreach (var key in keys)
			{
			var detail = _outboundOrderDetailService.Db.Ado.SqlQuerySingle<Dt_OutboundOrderDetail>(
			"SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK, ROWLOCK) WHERE Id = @Id",
			"SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK) WHERE Id = @Id",
			new { Id = key });

			if (detail != null)
			@@ -387,7 +387,6 @@
			// TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,

			};
			//if (taskType != TaskTypeEnum.OutEmpty)
			//{
			@@ -403,51 +402,7 @@
			return tasks;
			}

			public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
			for (int i = 0; i < stockInfos.Count; i++)
			{
			Dt_StockInfo stockInfo = stockInfos[i];

			if (stockInfo != null)
			{
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == stockInfo.LocationCode);
			if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
			{
			Dt_Task task = new()
			{
			CurrentAddress = stockInfo.LocationCode,
			Grade = 0,
			PalletCode = stockInfo.PalletCode,
			NextAddress = "",
			Roadway = locationInfo.RoadwayNo,
			SourceAddress = stockInfo.LocationCode,
			TargetAddress = "",
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			TaskType = taskType.ObjToInt(),
			//TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,

			};
			//if (taskType != TaskTypeEnum.OutEmpty)
			//{
			// task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			// task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			// task.BatchNo = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			//}
			//if (stockInfo.StockLength > 0)
			//{
			// task.TaskLength = stockInfo.StockLength;
			//}
			tasks.Add(task);
			}
			}
			}
			return tasks;
			}

			#region ååéç®¡çå¨
			private static readonly ConcurrentDictionary<string, SemaphoreSlim> _normalmaterialLocks =
			@@ -713,7 +668,8 @@
			Dt_OutboundOrderDetail? orderDetail = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt() \|\|
			outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Outbound.ObjToInt())
			{
			(List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
			if (result.Item1 != null && result.Item1.Count > 0)
			@@ -749,7 +705,7 @@
			if (stockLockInfos != null && stockLockInfos.Count > 0)
			{
			List<Dt_StockInfo> stocks = _stockService.StockInfoService.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
			tasks = GetTasks(stocks, TaskTypeEnum.Outbound);
			tasks = GetTasks(stocks, TaskTypeEnum.Outbound,station);
			}
			}

			@@ -1001,7 +957,7 @@
			List<Dt_Task> tasks = new List<Dt_Task>();

			// è·åè®¢åæç»
			var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK, ROWLOCK")
			var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK")
			.FirstAsync(x => x.Id == orderDetailId);

			if (outboundOrderDetail == null)