From d04dcc145ffdc465c39f7199460aa441ec299667 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 23 五月 2025 13:25:59 +0800
Subject: [PATCH] 1.PDA获取扫码产品称重数据 2.仓库信息调整 3.采购入库优化
---
service/Wom/WomdaaManager.cs | 18 ++++++++++++++++++
Controllers/Wom/WomdaaController.cs | 25 +++++++++++++++++++++++++
entity/MesDepotSections.cs | 2 +-
entity/MesDepots.cs | 2 +-
service/Warehouse/MesInvItemInCDetailsManager.cs | 2 +-
5 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 133ab40..2d9aa02 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -481,5 +481,30 @@
}
}
+ //GetItemsXcsl
+ /// <summary>
+ /// 鏍规嵁绾夸綋鑾峰彇浠櫒閲嶉噺
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetWeightByXt")]
+ public ResponseResult GetWeightByXt(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetWeightByXt(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
#endregion
}
\ No newline at end of file
diff --git a/entity/MesDepotSections.cs b/entity/MesDepotSections.cs
index 99ce191..f722185 100644
--- a/entity/MesDepotSections.cs
+++ b/entity/MesDepotSections.cs
@@ -16,7 +16,7 @@
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "depot_guid")]
- public Guid? DepotGuid { get; set; }
+ public string? DepotGuid { get; set; }
/// <summary>
/// ID(SEQ_INV_ID)锛圗RPID锛�
diff --git a/entity/MesDepots.cs b/entity/MesDepots.cs
index 2e12ab3..2057ac3 100644
--- a/entity/MesDepots.cs
+++ b/entity/MesDepots.cs
@@ -11,7 +11,7 @@
/// 榛樿鍊�: (newid())
/// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
- public Guid Guid { get; set; }
+ public string Guid { get; set; }
/// <summary>
/// ID(SEQ_INV_ID)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index d26a2e7..198f4e4 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -40,7 +40,7 @@
throw new Exception("姝ゆ潯鐮佷笉灞炰簬鍒拌揣鏉＄爜锛屾棤娉曠敤閲囪喘鍏ュ簱锛�");
var inventory = Db.Queryable<MesInvItemArn>()
- .Where(it => it.BillNo == itemBarcodeDetails.BillNo && it.Status == 1 )
+ .Where(it => it.BillNo == itemBarcodeDetails.BillNo && it.Fstatus == true )
.First();
if (inventory == null)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index b105469..78c156e 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -824,4 +824,22 @@
}
}
}
+
+
+ public dynamic GetWeightByXt(dynamic unity)
+ {
+
+ //// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter> { new("@LINEID", unity.shdh) };
+
+ var sql2 = @"SELECT TOP 1 realWeight FROM WORK_WEIGHT WHERE lineId = '' ORDER BY createDate DESC";
+
+ var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);
+
+ if (XcslItem.Count < 1)
+ throw new Exception($"閫佽揣鍗曞彿銆恵unity.shdh}銆戞潯鐮佹槑缁嗕笉瀛樺湪鎴栨湭鍚屾!");
+
+ return XcslItem; // 杩斿洖绗竴琛屾暟鎹紝濡傛灉娌℃湁鍒欒繑鍥� null
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3