tjx
2 天以前 637d269fd640fbc43dbeab9c96663430db415525
1111
已修改1个文件
已添加1个文件
95 ■■■■■ 文件已修改
StandardPda/MES.Service/Modes/MesPalletBindingLog.cs 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesPalletBinding1Manager.cs 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesPalletBindingLog.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
using SqlSugar;
namespace MES.Service.Modes;
/// <summary>
///     æ ˆæ¿ç»‘定记录表
/// </summary>
[SugarTable("MES_PALLET_BINDING_LOG")]
public class MesPalletBindingLog
{
    /// <summary>
    ///     ä¸»é”®ID
    /// </summary>
    [SugarColumn(ColumnName = "ID",
        OracleSequenceName = "MES_PALLET_BINDING_LOG_ID",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
    ///     æ ˆæ¿ç 
    /// </summary>
    [SugarColumn(ColumnName = "STACKCODE")]
    public string? StackCode { get; set; }
    /// <summary>
    ///     ç™»å½•号
    /// </summary>
    [SugarColumn(ColumnName = "LOGIN_ID")]
    public string? LoginId { get; set; }
    /// <summary>
    ///     SN号
    /// </summary>
    [SugarColumn(ColumnName = "SN_NO")]
    public string? SnNo { get; set; }
    /// <summary>
    ///     å·¥å•单号
    /// </summary>
    [SugarColumn(ColumnName = "TICKET_NO")]
    public string? TicketNo { get; set; }
    /// <summary>
    ///     ä¸­ç®±ç 
    /// </summary>
    [SugarColumn(ColumnName = "MEDIUMBOXCODE")]
    public string? MediumBoxCode { get; set; }
    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATED_BY")]
    public string? CreatedBy { get; set; }
    /// <summary>
    ///     æ“ä½œç±»åž‹ï¼ˆ0:绑定,1:解绑)
    /// </summary>
    [SugarColumn(ColumnName = "OPERATION_TYPE")]
    public string? OperationType { get; set; }
}
StandardPda/MES.Service/service/Warehouse/MesPalletBinding1Manager.cs
@@ -57,7 +57,8 @@
        {
            var response = GetTransferListByStackCodeAsync(palletBinding).Result;
            if (response?.Data?.SnList == null || string.IsNullOrEmpty(response.Data.StackCode))
        if (response?.Data?.SnList == null ||
            string.IsNullOrEmpty(response.Data.StackCode))
            {
                return 0;
            }
@@ -68,6 +69,7 @@
            {
                // å‡†å¤‡è¦æ’入的数据列表
                var bindingList = new List<MesPalletBinding1>();
            var bindingLogList = new List<MesPalletBindingLog>();
                
                foreach (var snItem in response.Data.SnList)
                {
@@ -82,6 +84,18 @@
                    };
                    
                    bindingList.Add(binding);
                var bindingLog = new MesPalletBindingLog
                {
                    StackCode = response.Data.StackCode,
                    SnNo = snItem.SnNo,
                    TicketNo = snItem.TickeNo,
                    MediumBoxCode = snItem.MediumBoxCode,
                    CreateDate = DateTime.Now,
                    OperationType = "0" // é»˜è®¤æœªå…¥åº“
                };
                bindingLogList.Add(bindingLog);
                }
                
                // æ‰¹é‡æ’入数据到数据库
@@ -91,7 +105,11 @@
                    var insertedIds = Db.Insertable(bindingList).PageSize(1)
                        .IgnoreColumnsNull()
                        .ExecuteCommand();
                    insertedCount = insertedIds;
                var insertedIds1 = Db.Insertable(bindingLogList).PageSize(1)
                    .IgnoreColumnsNull()
                    .ExecuteCommand();
                insertedCount = insertedIds + insertedIds1;
                }
            }
            catch (Exception ex)
@@ -133,11 +151,14 @@
        /// </summary>
        /// <param name="palletBinding">栈板绑定信息</param>
        /// <returns>操作结果</returns>
        public async Task<int> InsertPalletBindingDataWithCheckAsync(MesPalletBinding palletBinding)
    public async Task<int> InsertPalletBindingDataWithCheckAsync(
        MesPalletBinding palletBinding)
        {
            // å…ˆæ£€æŸ¥æ ˆæ¿ç æ˜¯å¦å­˜åœ¨
            bool exists = CheckStackCodeExists(palletBinding.StackCode);
            return exists ? 1 :
        return exists
            ? 1
            :
                // è°ƒç”¨åŽŸæ¥çš„æ’å…¥æ–¹æ³•
                InsertPalletBindingData(palletBinding);
        }