From b9da5837aa515adfa4f0452a7566df89b9e81ed4 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期四, 15 八月 2024 15:10:52 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/Modes/MesInvItemMovesCDetails.cs | 5 +
MES.Service/Dto/service/OutItemDto.cs | 3
MES.Service/Modes/MesInvItemOutItems.cs | 7 ++
MES.Service/Dto/service/MovesDto.cs | 11 +++
MES.Service/service/Warehouse/MesInvItemMovesManager.cs | 60 +++++++++++++++++++
MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs | 42 ++++++++++++++
6 files changed, 125 insertions(+), 3 deletions(-)
diff --git a/MES.Service/Dto/service/MovesDto.cs b/MES.Service/Dto/service/MovesDto.cs
new file mode 100644
index 0000000..1c1c9b6
--- /dev/null
+++ b/MES.Service/Dto/service/MovesDto.cs
@@ -0,0 +1,11 @@
+锘縰sing MES.Service.Modes;
+
+namespace MES.Service.Dto.service;
+
+public class MovesDto
+{
+ public List<MesInvItemMoves>? FromList { get; set; }
+ public List<MesInvItemOutItems>? OutItems { get; set; }
+ public List<MesInvItemMovesCDetails>? BarcodeList { get; set; }
+
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/OutItemDto.cs b/MES.Service/Dto/service/OutItemDto.cs
index 804bb9c..53f1187 100644
--- a/MES.Service/Dto/service/OutItemDto.cs
+++ b/MES.Service/Dto/service/OutItemDto.cs
@@ -7,8 +7,7 @@
public MesInvItemOuts? Form { get; set; }
public List<MesInvItemOutItems>? SaveItems { get; set; }
public List<MESInvItemOutItems>? SelectItems { get; set; }
-
-
+
public string? ItemNo { get; set; }
public decimal? Quantity { get; set; }
diff --git a/MES.Service/Modes/MesInvItemMovesCDetails.cs b/MES.Service/Modes/MesInvItemMovesCDetails.cs
index 0a6d2cf..1fc798b 100644
--- a/MES.Service/Modes/MesInvItemMovesCDetails.cs
+++ b/MES.Service/Modes/MesInvItemMovesCDetails.cs
@@ -229,4 +229,9 @@
/// </summary>
[SugarColumn(ColumnName = "MOVE_OK")]
public decimal? MoveOk { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? ItemUnit { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? SuppName { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemOutItems.cs b/MES.Service/Modes/MesInvItemOutItems.cs
index 1e640a8..51098b2 100644
--- a/MES.Service/Modes/MesInvItemOutItems.cs
+++ b/MES.Service/Modes/MesInvItemOutItems.cs
@@ -207,4 +207,11 @@
/// </summary>
[SugarColumn(ColumnName = "TL_QTY")]
public decimal? TlQty { get; set; }
+
+ [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? ItemUnit { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? QuantityOk { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
index a529385..0da91c7 100644
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -26,6 +26,64 @@
.OrderBy(it => it.Id, OrderByType.Desc).ToList();
}
+ public List<MesInvItemMoves> GetPage(WarehouseQuery query)
+ {
+ return Db.Queryable<MesInvItemMoves>()
+ .WhereIF(!string.IsNullOrEmpty(query.billNo),
+ s => s.BillNo == query.billNo)
+ .OrderByDescending(s => s.Id)
+ .ToPageList(query.PageIndex, query.Limit);
+ }
+
+ public MovesDto GetItems(WarehouseQuery query)
+ {
+ MovesDto dto = new MovesDto();
+
+ dto.BarcodeList = GetItemMovesCDetails(query);
+ dto.OutItems = GetItemOutItems(query);
+
+ return dto;
+ }
+
+ private List<MesInvItemOutItems> GetItemOutItems(WarehouseQuery query)
+ {
+ var sql = string.Format(
+ "SELECT C.ITEM_NO, C.QUANTITY, C.REMARK, C.REMARK, S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID LEFT JOIN MES_UNIT U ON U.ID = S.ITEM_UNIT LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK FROM MES_INV_ITEM_MOVES_C_DETAILS GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO where C.ITEM_OUT_ID= {0}",
+ query.id);
+
+ return Db.Ado.SqlQuery<MesInvItemOutItems>(sql);
+ }
+
+ private List<MesInvItemMovesCDetails> GetItemMovesCDetails(
+ WarehouseQuery query)
+ {
+ return Db.Queryable<MesInvItemMovesCDetails, MesItems, MesSupplier>(
+ (b, c, f) => new JoinQueryInfos(
+ JoinType.Left,
+ b.ItemNo == c.ItemNo && b.Company == c.Company &&
+ b.Factory == c.Factory,
+ JoinType.Left, b.SuppNo == f.SuppNo
+ ))
+ .Where((b, c, f) => b.ItemMoveId == query.id)
+ .Select((b, c, f) => new MesInvItemMovesCDetails
+ {
+ FromDepotSectionsCode = b.FromDepotSectionsCode,
+ BoardStyle = b.BoardStyle,
+ FromDepotsCode = b.FromDepotsCode,
+ InvDepotSectionsCode = b.InvDepotSectionsCode,
+ InvDepotsCode = b.InvDepotsCode,
+ Quantity = b.Quantity,
+ LotNo = b.LotNo,
+ ItemNo = b.ItemNo,
+ ItemBarcode = b.ItemBarcode,
+ ItemName = c.ItemName,
+ ItemModel = c.ItemModel,
+ ItemUnit = c.ItemUnit,
+ SuppName = f.SuppName,
+ MoveOk =
+ SqlFunc.IsNull(b.MoveOk, 0) // 浣跨敤 SqlFunc.IsNull 瀹炵幇 NVL 鐨勬晥鏋�
+ }).ToList();
+ }
public OutItemDto ScanMoveBarcode(WarehouseQuery query)
{
@@ -214,7 +272,7 @@
}
//scan_out_show_DB
- public List<InventoryItem> ScanOutShowDb(WarehouseQuery query)
+ private List<InventoryItem> ScanOutShowDb(WarehouseQuery query)
{
var BillTypeId = 300;
var TransctionNo = 301;
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
index 8a5d626..2ff4d38 100644
--- a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
+++ b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
@@ -13,6 +13,48 @@
{
private readonly MesInvItemMovesManager m = new();
+ //GetPage
+ [HttpPost("GetPage")]
+ public ResponseResult GetPage(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetPage(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //GetItems
+ [HttpPost("GetItems")]
+ public ResponseResult GetItems(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItems(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
//ScanMoveBarcode
[HttpPost("ScanMoveBarcode")]
public ResponseResult ScanMoveBarcode(WarehouseQuery query)
--
Gitblit v1.9.3