From 367979de838ec3655d37dc618d98924c6b43b324 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期三, 24 十二月 2025 09:46:05 +0800
Subject: [PATCH] 111
---
StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs b/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
index 337b325..b14bd2d 100644
--- a/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
@@ -243,13 +243,15 @@
stockStatus = rackingTask?.Code == "200" ? "宸插湪绔嬪簱涓�" : "杩涘叆绔嬪簱鐨勮矾涓�";
}
- // 鍐荤粨鏍囪瘑涓�1鏃讹紝IqcStatus涓�0锛涘惁鍒欐牴鎹甀qcStatus鍒ゆ柇
- var iqcStatusValue = x.Visible == 1 ? "0" :
- (x.IqcStatus == "鐗归噰鐩存帴浣跨敤" || x.IqcStatus == "宸叉" || x.IqcStatus == "鍏嶆" ? "1" : "0");
+ // 鍐荤粨鏍囪瘑锛歏isible涓�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++;
}
--
Gitblit v1.9.3