退料单接口BUG修复

zjh

4 天以前 cad9f911a2f0c7a14d62f1503aadd279423caccc

退料单接口BUG修复

 StandardPda/MES.Service/Modes/MesInvItemOutItems.cs

@@ -251,8 +251,8 @@
    // <summary>
    ///     申请行号
    /// </summary>
    //[SugarColumn(ColumnName = "SQ_NO")]
    //public string? SqNo { get; set; }
    [SugarColumn(ColumnName = "SQ_NO")]
    public string? SqNo { get; set; }
    
    //[SugarColumn(ColumnName = "ZZITEM_ID")]
    //public string? ZzitemId{ get; set; }

 StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs

@@ -14,12 +14,15 @@
        var itemOutFrom = oItemOut.from;
        var itemOutLists = oItemOut.items;

        return UseTransaction(db =>
        {
        // 根据AsnNo和MesNo对明细进行分组
        var groupedItems = itemOutLists
            .GroupBy(item => new {   item.MesNo, item.SqNo })
            .ToList();

        bool result = true;
            int result = 1;
            int count = 1;
        foreach (var group in groupedItems)
        {
            //if (group.Key.AsnNo == null)
@@ -40,18 +43,18 @@
            // 创建一个临时的itemOutFrom对象，使用分组的Key作为主要属性
            var tempItemOutFrom = new ItemOutFrom
            {
                
                    //AsnNo = group.Key.AsnNo,
                MesNo = group.Key.MesNo,
                SqNo = group.Key.SqNo,
                // 继承原始itemOutFrom的其他属性
                RtnNo = itemOutFrom.RtnNo,
                    RtnNo = itemOutFrom.RtnNo+ "-"+count.ToString(),
                Type = itemOutFrom.Type,
                CreateBy = itemOutFrom.CreateBy,
                FMRMODE = itemOutFrom.FMRMODE,
                DepotId = itemOutFrom.DepotId,
                SupperId = itemOutFrom.SupperId
            };

                count++;
            // 根据Type执行不同的逻辑
            switch (tempItemOutFrom.Type)
            {
@@ -61,7 +64,7 @@
                        .Where(s => s.BillTypeId == BILL_TYPE_ID
                                    && s.TransactionNo == TRANSACTION_NO
                                    && s.ItemOutNo == tempItemOutFrom.RtnNo
                                  
                                            && s.Sapno == tempItemOutFrom.SqNo
                        )
                        .Count();

@@ -76,7 +79,7 @@
                    var groupResult = Save(tempItemOutFrom, group.ToList());
                    if (!groupResult)
                    {
                        result = false;
                                result = 0;
                    }

                    break;
@@ -85,17 +88,20 @@
                    var removeResult = Remove(tempItemOutFrom);
                    if (!removeResult)
                    {
                        result = false;
                            result = 0;
                    }

                    break;
                default:
                    result = false;
                        result = 0;
                    break;
            }
        }

        return result;
        }) > 0;


    }

    private bool Save(ItemOutFrom from, List<ItemOutList> items)
@@ -286,7 +292,7 @@
                RkQty = mesInvItemInCItems.Quantity,
                TlQty = 0,
                ItemId = Decimal.Parse(itemIdLinkU9.MesId), // 确保ItemId有值
                //SqNo = itemOutList.SqNo, // 确保ItemId有值
                SqNo = itemOutList.SqNo, // 确保ItemId有值
                //ZzitemId = itemOutList.AsnLineNo, // 确保ItemId有值
                // Unit = item.Unit,
            });