From fbd1dae61bb8eeccd303341ff3b5290d805a8155 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期五, 19 十二月 2025 18:40:25 +0800
Subject: [PATCH] 111
---
StandardPda/MES.Service/Modes/MesInvItemStocks.cs | 54 +++++++++++++++++++-------
StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs | 17 ++++++--
2 files changed, 51 insertions(+), 20 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/MesInvItemStocks.cs b/StandardPda/MES.Service/Modes/MesInvItemStocks.cs
index 1156708..586721e 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemStocks.cs
+++ b/StandardPda/MES.Service/Modes/MesInvItemStocks.cs
@@ -136,22 +136,22 @@
public string? Fcar { get; set; }
/// <summary>
- /// 鍐荤粨鎻愪氦閲嶆锛�0锛氬喕缁撴湭鎻愪氦閲嶆锛�1锛氬喕缁撳苟鎻愪氦閲嶆
+ /// 鍐荤粨鎻愪氦閲嶆锛�0锛氭湭鎻愪氦锛�1锛氬凡鎻愪氦
/// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT")]
- public short? VisableSubmit { get; set; }
+ [SugarColumn(ColumnName = "VISIBLE_SUBMIT")]
+ public short? VisibleSubmit { get; set; }
/// <summary>
/// 鎻愪氦閲嶆浜�
/// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT_BY")]
- public string? VisableSubmitBy { get; set; }
+ [SugarColumn(ColumnName = "VISIBLE_SUBMIT_BY")]
+ public string? VisibleSubmitBy { get; set; }
/// <summary>
/// 鎻愪氦閲嶆鏃堕棿
/// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT_DATE")]
- public DateTime? VisableSubmitDate { get; set; }
+ [SugarColumn(ColumnName = "VISIBLE_SUBMIT_DATE")]
+ public DateTime? VisibleSubmitDate { get; set; }
/// <summary>
/// 浜у搧鍨嬪彿
@@ -184,7 +184,7 @@
public string? LineNo { get; set; }
/// <summary>
- /// 鍗婃垚鍝佸叆搴撳崟鍙�
+ /// 鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "BILL_NO")]
public string? BillNo { get; set; }
@@ -208,7 +208,7 @@
public decimal? ItemId { get; set; }
/// <summary>
- /// 鏄惁鍗犵敤
+ /// 鏄惁涓撶敤
/// </summary>
[SugarColumn(ColumnName = "IS_ZY")]
public decimal? IsZy { get; set; }
@@ -220,19 +220,19 @@
public string? SalesOrder { get; set; }
/// <summary>
- /// 鍙鎬�(0-鍙锛�1-涓嶅彲瑙�)
+ /// 鏄惁宸插喕缁�,1鍐荤粨
/// </summary>
- [SugarColumn(ColumnName = "VISABLE")]
- public short? Visable { get; set; }
+ [SugarColumn(ColumnName = "VISIBLE")]
+ public short? Visible { get; set; }
/// <summary>
- /// 鏄惁鍊熷嚭
+ /// 鏄惁瀵勫瓨
/// </summary>
[SugarColumn(ColumnName = "IS_JC")]
public decimal? IsJc { get; set; }
/// <summary>
- /// 鍊熷嚭鍗曞彿
+ /// 瀵勫瓨宸ュ崟
/// </summary>
[SugarColumn(ColumnName = "JC_BILL_NO")]
public string? JcBillNo { get; set; }
@@ -262,7 +262,7 @@
public decimal? DepotId { get; set; }
/// <summary>
- /// 鐗╂枡鏉＄爜D
+ /// 澶х鏉＄爜
/// </summary>
[SugarColumn(ColumnName = "ITEM_BARCODE_D")]
public string? ItemBarcodeD { get; set; }
@@ -278,4 +278,28 @@
/// </summary>
[SugarColumn(ColumnName = "IS_TS")]
public decimal? IsTs { get; set; }
+
+ /// <summary>
+ /// 鍐荤粨鏇存柊浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "VISIBLE_UPDATE_BY")]
+ public string? VisibleUpdateBy { get; set; }
+
+ /// <summary>
+ /// 鍐荤粨鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "VISIBLE_UPDATE_DATE")]
+ public DateTime? VisibleUpdateDate { get; set; }
+
+ /// <summary>
+ /// 鍐荤粨鏇存柊鐞嗙敱
+ /// </summary>
+ [SugarColumn(ColumnName = "VISIBLE_UPDATE_REASON")]
+ public string? VisibleUpdateReason { get; set; }
+
+ /// <summary>
+ /// 娉ㄩ噴
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+ public string? Remark { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs b/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
index aa3c577..ab4db63 100644
--- a/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
@@ -26,9 +26,9 @@
// 浼樺寲鐐�1: 浣跨敤鍘熺敓SQL ROW_NUMBER()鍦ㄦ暟鎹簱绔畬鎴愬幓閲嶅拰鎺掑簭
var rackingTaskSql = @"
- SELECT ITEM_BARCODE AS ItemBarcode, PALLETCODE AS PalletCode, CODE AS Code
+ SELECT ITEM_BARCODE AS ItemBarcode, PALLETCODE AS PalletCode, CODE AS Code, TASKTYPE AS TaskType
FROM (
- SELECT ITEM_BARCODE, PALLETCODE, CODE,
+ SELECT ITEM_BARCODE, PALLETCODE, CODE, TASKTYPE,
ROW_NUMBER() OVER (PARTITION BY ITEM_BARCODE ORDER BY ID DESC) AS RN
FROM XB_RACKING_TASK_SYXT_LOG
WHERE ITEM_BARCODE IS NOT NULL AND (CODE IS NULL OR CODE != '500')
@@ -230,10 +230,16 @@
rackingTaskDict.TryGetValue(barcodeToMatch, out var rackingTask);
- string stockStatus = "杩涘叆绔嬪簱鐨勮矾涓�";
- if (rackingTask?.Code != null)
+ string stockStatus;
+ if (rackingTask?.TaskType == "绔嬪簱鍑哄簱璇锋眰")
{
- stockStatus = rackingTask.Code == "200" ? "宸插湪绔嬪簱涓�" : "杩涘叆绔嬪簱鐨勮矾涓�";
+ // 鍑哄簱璇锋眰锛欳ode=200琛ㄧず宸插嚭搴擄紝Code=null琛ㄧず鍑哄簱璺笂
+ stockStatus = rackingTask.Code == "200" ? "宸插嚭绔嬪簱" : "鍑虹珛搴撹矾涓�";
+ }
+ else
+ {
+ // 鍥炲簱璇锋眰锛堥粯璁わ級锛欳ode=200琛ㄧず宸插湪绔嬪簱涓紝Code=null琛ㄧず杩涘叆绔嬪簱鐨勮矾涓�
+ stockStatus = rackingTask?.Code == "200" ? "宸插湪绔嬪簱涓�" : "杩涘叆绔嬪簱鐨勮矾涓�";
}
return new
@@ -443,6 +449,7 @@
public string ItemBarcode { get; set; }
public string PalletCode { get; set; }
public string Code { get; set; }
+ public string TaskType { get; set; }
}
/// <summary>
--
Gitblit v1.9.3