From ce9702d2e5699c4c9acbed52da1fb6052ec68c6c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 15 四月 2025 16:45:39 +0800
Subject: [PATCH] 1.生产补料优化 2.登录图标查询优化 3.采购退货优化
---
service/Warehouse/MesItemBlManager.cs | 68 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index a85bd93..1dcfb9a 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -2,6 +2,7 @@
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
@@ -19,8 +20,9 @@
{
var list = Db.Queryable<MesItemBl>()
.Where(s => (s.Bl018 ?? false) == true
- && (s.Bl019 ?? false) == false
+ //&& (s.Bl019 ?? false) == false
&& s.Bl008 == query.Type)
+ .OrderByDescending(s => s.Bl006)
.Select(s => s.BlNo)
.ToList();
return list;
@@ -31,7 +33,7 @@
/// </summary>
/// <param name="billNo">琛ユ枡鍗曞彿</param>
/// <returns>琛ユ枡鍗曟槑缁嗗垪琛�</returns>
- public (string bl001, List<MesItemBlDetail> item)
+ public ProductionPickDto
GetMesItemBlDetailByBillNo(
WarehouseQuery query)
{
@@ -46,26 +48,50 @@
if (mesItemBl == null)
throw new Exception("鍗曟嵁鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛�");
- if (mesItemBl.Bl019 == true)
- throw new Exception("鍗曟嵁鍙峰凡瀹屾垚锛�");
+ //if (mesItemBl.Bl019 == true)
+ // throw new Exception("鍗曟嵁鍙峰凡瀹屾垚锛�");
- // 鑾峰彇鏈畬鎴愮殑琛ユ枡鍗曟槑缁�
- var blDetails = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
- .Where((a, b) => a.BlNo == query.billNo
- && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new MesItemBlDetail
- {
- Bld012 = b.Bld012,
- Bld002 = b.Bld002,
- Bld003 = b.Bld003,
- Bld004 = b.Bld004,
- Bld007 = b.Bld007,
- Bld008 = b.Bld008
- })
- .ToList();
+ //// 鑾峰彇鏈畬鎴愮殑琛ユ枡鍗曟槑缁�
+ //var blDetails = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
+ // new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
+ // .Where((a, b) => a.BlNo == query.billNo
+ // && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
+ // .Select((a, b) => new MesItemBlDetail
+ // {
+ // Bld012 = b.Bld012,
+ // Bld002 = b.Bld002,
+ // Bld003 = b.Bld003,
+ // Bld004 = b.Bld004,
+ // Bld007 = b.Bld007,
+ // Bld008 = b.Bld008
+ // })
+ // .ToList();
- return (mesItemBl.Bl001, blDetails);
+ //return (mesItemBl.Bl001, blDetails);
+ var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
+ dbo.F_QX_GETRECODEPOTSE(A.bld012) as RecoKw,D.daa001
+fROM MES_ITEM_BL_DETAIL A
+ LEFT JOIN MES_ITEM_BL B ON A.MID = B.ID
+ LEFT JOIN MES_ITEMS C ON A.bld012 = CAST(C.item_id AS VARCHAR(50))
+ LEFT JOIN WOMDAA D ON B.about_guid = D.guid
+WHERE B.bl_no = '{0}'", query.billNo);
+
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
+
+
+ var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
+
+ var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = womdabs[0].DAA001,
+ //PlanNo = womcaa.Caa020,
+ items = DS_list,
+ Ysitems = YS_list
+ };
+
+ return dto;
}
/// <summary>
@@ -331,7 +357,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
+ DepotId = (int)stockBarcode.DepotId,
EbelnK3id = womdab.Eid,
LineK3id = womdab.Erpid
}).IgnoreColumns(true).ExecuteCommand();
--
Gitblit v1.9.3