From f5f720f3dbd2e40d97e0fba51004976aad53d858 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 13 三月 2025 15:42:12 +0800
Subject: [PATCH] 1.生产退料页面优化
---
service/Warehouse/MesItemTblManager.cs | 32 +++++++++++++++++++++-----------
Dto/service/ProductionPickDto.cs | 3 ++-
Controllers/Warehouse/MesItemTblController.cs | 18 +++++++++---------
3 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/Controllers/Warehouse/MesItemTblController.cs b/Controllers/Warehouse/MesItemTblController.cs
index 393dbbb..09be511 100644
--- a/Controllers/Warehouse/MesItemTblController.cs
+++ b/Controllers/Warehouse/MesItemTblController.cs
@@ -202,15 +202,15 @@
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.GetMesItemTblDetailByBillNo(query);
- if(resultInfos.tbBillList.Count < 1)
- {
- return new ResponseResult
- {
- status = 1,
- message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
- data = ""
- };
- }
+ //if(resultInfos.tbBillList.Count < 1)
+ //{
+ // return new ResponseResult
+ // {
+ // status = 1,
+ // message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
+ // data = ""
+ // };
+ //}
return new ResponseResult
{
diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
index 14390dc..cbfe51f 100644
--- a/Dto/service/ProductionPickDto.cs
+++ b/Dto/service/ProductionPickDto.cs
@@ -20,8 +20,9 @@
//杩斿洖鍙傛暟绫诲瀷 -1锛氬け璐� 1锛氭垚鍔�
public string? result { get; set; }
+ //寰呮壂
public List<ItemDetailModel>? items { get; set; }
-
+ //宸叉壂
public List<ItemDetailModel>? Ysitems { get; set; }
public List<Womdab>? totals { get; set; }
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 18cd8c6..0bd989f 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -1,4 +1,5 @@
锘縰sing Masuit.Tools;
+using MES.Service.Modes;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
@@ -33,7 +34,7 @@
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>鐗╂枡鏄庣粏鍒楄〃</returns>
- public List<MesItemTblDetail> GetMesItemTblDetailByBillNo(
+ public ProductionPickDto GetMesItemTblDetailByBillNo(
WarehouseQuery query)
{
// 鍏宠仈鏌ヨ鐗╂枡琛ㄣ�佺墿鏂欐槑缁嗚〃鍜岀墿鏂欏熀纭�淇℃伅琛�
@@ -45,22 +46,31 @@
JoinType.Left,
b.Tld009 == c.Id)
).Where((a, b, c) => a.BillNo == query.billNo && (a.Tbl013 ?? 0) == 1)
- .Select<MesItemTblDetail>((a, b, c) => new MesItemTblDetail
+ .Select<ItemDetailModel>((a, b, c) => new ItemDetailModel
{
- BillNo = a.BillNo,
- Tlid = b.Tlid,
- Tlmid = b.Tlmid,
- Tld005 = b.Tld005 ?? 0, // 寰呴��鏁伴噺
- Tld006 = b.Tld006 ?? 0, // 宸查��鏁伴噺
- Tld009 = b.Tld009,
+ FQty = b.Tld005 ?? 0, // 寰呴��鏁伴噺
+ SQty = b.Tld006 ?? 0, // 宸查��鏁伴噺
+ DSQty = (b.Tld005 ?? 0) - (b.Tld006 ?? 0),
ItemNo = c.ItemNo, // 鐗╂枡缂栧彿
ItemName = c.ItemName, // 鐗╂枡鍚嶇О
ItemModel = c.ItemModel // 鐗╂枡鍨嬪彿
}).ToList();
- // 绛涢�夊嚭寰呴��鏁伴噺澶т簬宸查��鏁伴噺鐨勮褰�
- var itemTblDetails = mesItemTblDetails
- .Where(s => (s.Tld005 ?? 0) - (s.Tld006 ?? 0) > 0).ToList();
+
+ if (mesItemTblDetails.Count<1)
+ throw new Exception("璇ョ敵璇峰崟銆�" + query.billNo + "銆� 鏄庣粏涓嶅瓨鍦紝璇风‘璁わ紒");
+
+ var DS_list = mesItemTblDetails.Where(s => s.DSQty > 0).ToList();
+
+ var YS_list = mesItemTblDetails.Where(s => s.SQty > 0).ToList();
+
+ var itemTblDetails = new ProductionPickDto
+ {
+ items = DS_list,
+ Ysitems = YS_list
+ // yisao = mesInvItemOutCDetailsList
+ };
+
return itemTblDetails;
}
--
Gitblit v1.9.3