111

tjx

20 小时以前 367979de838ec3655d37dc618d98924c6b43b324

111

 StandardPda/MES.Service/Dto/webApi/ReturnableStockDto.cs

@@ -11,6 +11,11 @@
    public string? IqcStatus { get; set; }

    /// <summary>
    ///     冻结标识 (0=未冻结, 1=已冻结)
    /// </summary>
    public string? Frozen { get; set; }

    /// <summary>
    ///     是否成品 (0=非成品, 1=成品)
    /// </summary>
    public string? ItemType { get; set; }

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

@@ -243,13 +243,15 @@
                stockStatus = rackingTask?.Code == "200" ? "已在立库中" : "进入立库的路上";
            }

            // 冻结标识为1时，IqcStatus为0；否则根据IqcStatus判断
            var iqcStatusValue = x.Visible == 1 ? "0" :
                (x.IqcStatus == "特采直接使用" || x.IqcStatus == "已检" || x.IqcStatus == "免检" ? "1" : "0");
            // 冻结标识：Visible为1表示已冻结
            var frozenValue = x.Visible == 1 ? "1" : "0";
            // 良品状态：根据IqcStatus判断（独立于冻结标识）
            var iqcStatusValue = x.IqcStatus == "特采直接使用" || x.IqcStatus == "已检" || x.IqcStatus == "免检" ? "1" : "0";

            return new
            {
                IqcStatus = iqcStatusValue,
                Frozen = frozenValue,
                ItemType = x.DepotName == "原材料仓" ? "0" : "1",
                StackCode = rackingTask?.PalletCode,
                x.DepotCode,
@@ -289,6 +291,7 @@
            .GroupBy(x => new
            {
                x.IqcStatus,
                x.Frozen,
                x.ItemType,
                x.StackCode,
                x.DepotCode,
@@ -307,6 +310,7 @@
            .Select(g => new ReturnableStockDto
            {
                IqcStatus = g.Key.IqcStatus,
                Frozen = g.Key.Frozen,
                ItemType = g.Key.ItemType,
                StackCode = g.Key.StackCode,
                DepotCode = g.Key.DepotCode,
@@ -630,6 +634,7 @@
        var headers = new[]
        {
            "良品状态",
            "冻结标识",
            "是否成品",
            "母托盘编号",
            "仓库编码",
@@ -666,22 +671,23 @@
        {
            worksheet.Cells[row, 1].Value =
                item.IqcStatus == "1" ? "良品" : "不良品";
            worksheet.Cells[row, 2].Value = item.ItemType == "1" ? "成品" : "非成品";
            worksheet.Cells[row, 3].Value = item.StackCode;
            worksheet.Cells[row, 4].Value = item.DepotCode;
            worksheet.Cells[row, 5].Value = item.DepotName;
            worksheet.Cells[row, 6].Value = item.DepotSectionsCode;
            worksheet.Cells[row, 7].Value = item.ItemNo;
            worksheet.Cells[row, 8].Value = item.ItemName;
            worksheet.Cells[row, 9].Value = item.ItemModel;
            worksheet.Cells[row, 10].Value = item.Quantity;
            worksheet.Cells[row, 11].Value = item.ItemUnitName;
            worksheet.Cells[row, 12].Value =
            worksheet.Cells[row, 2].Value = item.Frozen == "1" ? "已冻结" : "未冻结";
            worksheet.Cells[row, 3].Value = item.ItemType == "1" ? "成品" : "非成品";
            worksheet.Cells[row, 4].Value = item.StackCode;
            worksheet.Cells[row, 5].Value = item.DepotCode;
            worksheet.Cells[row, 6].Value = item.DepotName;
            worksheet.Cells[row, 7].Value = item.DepotSectionsCode;
            worksheet.Cells[row, 8].Value = item.ItemNo;
            worksheet.Cells[row, 9].Value = item.ItemName;
            worksheet.Cells[row, 10].Value = item.ItemModel;
            worksheet.Cells[row, 11].Value = item.Quantity;
            worksheet.Cells[row, 12].Value = item.ItemUnitName;
            worksheet.Cells[row, 13].Value =
                item.IndepDate?.ToString("yyyy-MM-dd HH:mm:ss");
            worksheet.Cells[row, 13].Value = item.OrgCode;
            worksheet.Cells[row, 14].Value = item.OrgName;
            worksheet.Cells[row, 15].Value = item.ItemBarcode;
            worksheet.Cells[row, 16].Value = item.StockStatus;
            worksheet.Cells[row, 14].Value = item.OrgCode;
            worksheet.Cells[row, 15].Value = item.OrgName;
            worksheet.Cells[row, 16].Value = item.ItemBarcode;
            worksheet.Cells[row, 17].Value = item.StockStatus;
            row++;
        }