From 075c8cfecc517dbb80a184933a79498ce2fcc617 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期五, 16 八月 2024 08:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/Warehouse/MesInvItemMovesManager.cs | 8 +++-----
MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
index 5e1cb86..eeb48e6 100644
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -287,9 +287,7 @@
if (sumqty > quantity)
throw new Exception(
"宸叉壂鏉＄爜鏁伴噺鎴栨湰娆℃壂鐮佹暟閲忥細" + sumqty + " 澶т簬鐢宠鏁伴噺锛�" + quantity + "锛岃鏍稿锛�");
-
- List<InventoryItem> scanOutShowDb = null;
-
+
UseTransaction(db =>
{
SaveMesInvItemMovesCDetails(db, query, mesInvItemMoves,
@@ -314,7 +312,7 @@
.Where(s => s.Id == mesInvItemStocks.Id)
.ExecuteCommand();
- scanOutShowDb = ScanOutShowDb(query);
+ var scanOutShowDb = ScanOutShowDb(query);
if (CollectionUtil.IsNullOrEmpty(scanOutShowDb))
db.Updateable<MesInvItemMoves>()
.SetColumns(s => s.Status == 1)
@@ -326,7 +324,7 @@
});
var itemDto = new OutItemDto();
- itemDto.SumItem = scanOutShowDb;
+ //itemDto.SumItem = scanOutShowDb;
if (TransctionNo == 201) itemDto.Quantity = mesInvItemStocks.Quantity;
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
index c071eb6..f93f0f5 100644
--- a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
+++ b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
@@ -13,6 +13,27 @@
{
private readonly MesInvItemMovesManager m = new();
+ //ScanInBarcode
+ [HttpPost("ScanInBarcode")]
+ public ResponseResult ScanInBarcode(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.ScanInBarcode(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
[HttpPost("Audit")]
public ResponseResult Audit(WarehouseQuery query)
{
--
Gitblit v1.9.3