From c1ba92e2326bb76e248acc0f86a97e271efecc5f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 九月 2025 15:20:42 +0800
Subject: [PATCH] 其他入库修改为存储过程
---
service/Warehouse/MesItemBlManager.cs | 315 ++++++++++++++++++++++++++++-----------------------
1 files changed, 173 insertions(+), 142 deletions(-)
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index 0f0b52d..8c7ffaf 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -5,6 +5,7 @@
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Text;
namespace NewPdaSqlServer.service.Warehouse;
@@ -16,15 +17,22 @@
/// 鑾峰彇鐢熶骇琛ユ枡鍗曞彿鍒楄〃
/// </summary>
/// <returns>琛ユ枡鍗曞彿鍒楄〃</returns>
- public List<string> GetSCBLBillNo(WarehouseQuery query)
+ public List<string> GetSCBLBillNo(dynamic query, dynamic RequestInfo)
{
- var list = Db.Queryable<MesItemBl>()
- .Where(s => (s.Bl018 ?? false) == true
- //&& (s.Bl019 ?? false) == false
- && s.Bl008 == query.Type)
- .OrderByDescending(s => s.Bl006)
- .Select(s => s.BlNo)
- .ToList();
+ var orgId = RequestInfo.OrgId;
+ var sqlParams = new List<SugarParameter>
+ {
+ new("@orgId", orgId),
+ new("@type", query.type),
+ new("@dateTime", query.dateTime == "" ? null : query.dateTime),
+ new("@lineNo", query.lineNo)
+
+ };
+ var sql2 = new StringBuilder("exec prc_pda_itemBl_billNoList @type,@orgId,@dateTime,@lineNo");
+
+ var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+ var list = LineInfo.Select(s => (string)s.bl_no).ToList();
return list;
}
@@ -68,7 +76,7 @@
// .ToList();
//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,
+ var sql = string.Format(@"SELECT c.id as ItemId,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
@@ -150,7 +158,7 @@
.First();
if (mesItemBl == null)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸叉挙鍥烇紒");
+ throw new Exception($"鐢宠鍗� {query.blNo} 涓嶅瓨鍦紒");
if (mesItemBl.Bl018 != true)
throw new Exception($"鐢宠鍗� {query.blNo} 鏈鏍革紒");
@@ -288,7 +296,7 @@
// 妫�鏌ュ苟鏇存柊鍑哄簱鍗曠墿鏂欐槑缁�
var itemCount = db.Queryable<MesInvItemOutItems>()
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId && i.ItemDabid == blDetail.Id && i.ItemId == stockBarcode.ItemId && i.DepotId == stockBarcode.DepotId.ToString())
.Count();
if (itemCount > 0)
@@ -297,7 +305,7 @@
.SetColumns(i =>
i.TlQty == i.TlQty + stockBarcode.Quantity)
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId && i.ItemDabid == blDetail.Id && i.ItemId == stockBarcode.ItemId && i.DepotId == stockBarcode.DepotId.ToString())
.ExecuteCommand();
else
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
@@ -306,7 +314,7 @@
Guid = Guid.NewGuid(),
ItemOutId = outId,
ItemNo = blDetail.Bld002,
- Quantity = stockBarcode.Quantity,
+ Quantity = blDetail.Bld007,
TlQty = stockBarcode.Quantity,
CreateBy = query.userName,
CreateDate = DateTime.Now,
@@ -487,7 +495,7 @@
/// - Num: 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
+ public ProductionPickDto SplitBarcode(
WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.userName))
@@ -543,134 +551,135 @@
// 鎷嗗垎鏉＄爜
if (totalQty > query.Num)
{
- var mesItems = db.Queryable<MesItems>()
- .Where(s => s.Id == stockBarcode.ItemId).First();
+ newBarcode = BillNo.ExecuteBarcodeSplit(query.userName, query.barcode, query.Num);
+ //var mesItems = db.Queryable<MesItems>()
+ // .Where(s => s.Id == stockBarcode.ItemId).First();
- // 鐢熸垚鏂版潯鐮佸彿
- newBarcode = BillNo.GetBillNo("TM(鏉＄爜)", mesItems.ItemNo);
+ //// 鐢熸垚鏂版潯鐮佸彿
+ //newBarcode = BillNo.GetBillNo("TM(鏉＄爜)", mesItems.ItemNo);
- // 鍐欏叆鏂版潯鐮�
- executeCommand += db.Insertable(new MesInvItemBarcodes
- {
- Guid = Guid.NewGuid(),
- ItemBarcode = newBarcode,
- CustNo = stockBarcode.CustomerNo,
- // ProductCode = stockBarcode.ProductCode,
- // ItemBarcode2 = stockBarcode.ItemBarcode2,
- // ItemCode = stockBarcode.ItemCode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = query.Num,
- EpFlag = true,
- TaskNo = stockBarcode.TaskNo,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- OldItemBarcode = query.barcode,
- // Mblnr = stockBarcode.Mblnr,
- // Zeile = stockBarcode.Zeile,
- // RohInId = stockBarcode.RohInId,
- Barcodestatus = false,
- Oldqty = query.Num as long?,
- // Unit = stockBarcode.Unit,
- // WeightUnit = stockBarcode.WeightUnit,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- BillNo = stockBarcode.BillNo,
- BoardStyle = stockBarcode.BoardStyle,
- // ColorName = stockBarcode.ColorName,
- WorkNo = stockBarcode.WorkNo,
- WorkLine = stockBarcode.WorkLine,
- // MemoBad = stockBarcode.MemoBad,
- ComeFlg = 5,
- // Memo = stockBarcode.Memo,
- SuppId = stockBarcode.SuppId,
- SuppNo = stockBarcode.SuppNo,
- InsDate = stockBarcode.IndepDate, // Added InsDate
- ItemId = stockBarcode.ItemId
- // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
- }).IgnoreColumns(true).ExecuteCommand();
+ //// 鍐欏叆鏂版潯鐮�
+ //executeCommand += db.Insertable(new MesInvItemBarcodes
+ //{
+ // Guid = Guid.NewGuid(),
+ // ItemBarcode = newBarcode,
+ // CustNo = stockBarcode.CustomerNo,
+ // // ProductCode = stockBarcode.ProductCode,
+ // // ItemBarcode2 = stockBarcode.ItemBarcode2,
+ // // ItemCode = stockBarcode.ItemCode,
+ // ItemNo = stockBarcode.ItemNo,
+ // LotNo = stockBarcode.LotNo,
+ // Quantity = query.Num,
+ // EpFlag = true,
+ // TaskNo = stockBarcode.TaskNo,
+ // CreateBy = query.userName,
+ // CreateDate = DateTime.Now,
+ // LastupdateBy = query.userName,
+ // LastupdateDate = DateTime.Now,
+ // OldItemBarcode = query.barcode,
+ // // Mblnr = stockBarcode.Mblnr,
+ // // Zeile = stockBarcode.Zeile,
+ // // RohInId = stockBarcode.RohInId,
+ // Barcodestatus = false,
+ // Oldqty = query.Num as long?,
+ // // Unit = stockBarcode.Unit,
+ // // WeightUnit = stockBarcode.WeightUnit,
+ // Factory = stockBarcode.Factory,
+ // Company = stockBarcode.Company,
+ // BillNo = stockBarcode.BillNo,
+ // BoardStyle = stockBarcode.BoardStyle,
+ // // ColorName = stockBarcode.ColorName,
+ // WorkNo = stockBarcode.WorkNo,
+ // WorkLine = stockBarcode.WorkLine,
+ // // MemoBad = stockBarcode.MemoBad,
+ // ComeFlg = 5,
+ // // Memo = stockBarcode.Memo,
+ // SuppId = stockBarcode.SuppId,
+ // SuppNo = stockBarcode.SuppNo,
+ // InsDate = stockBarcode.IndepDate, // Added InsDate
+ // ItemId = stockBarcode.ItemId
+ // // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
+ //}).IgnoreColumns(true).ExecuteCommand();
- // 鏇存柊鍘熸潯鐮佹暟閲�
- executeCommand += db.Updateable<MesInvItemBarcodes>()
- .SetColumns(it => it.Quantity == it.Quantity - query.Num)
- .Where(it => it.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- // 鏇存柊鍘熸潯鐮佹暟閲�
- executeCommand += db.Updateable<MesInvItemStocks>()
- .SetColumns(it => it.Quantity == it.Quantity - query.Num)
- .Where(it => it.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- //// 鍒犻櫎鍘熸潯鐮佸簱瀛樿褰�
- //executeCommand += db.Deleteable<MesInvItemStocks>()
+ //// 鏇存柊鍘熸潯鐮佹暟閲�
+ //executeCommand += db.Updateable<MesInvItemBarcodes>()
+ // .SetColumns(it => it.Quantity == it.Quantity - query.Num)
// .Where(it => it.ItemBarcode == query.barcode)
// .ExecuteCommand();
- // 鎻掑叆鍓╀綑鏉＄爜鏁伴噺鐨勬柊搴撳瓨璁板綍
- executeCommand += db.Insertable(new MesInvItemStocks
- {
- Guid = Guid.NewGuid(),
- TaskNo = stockBarcode.TaskNo,
- ItemBarcode = newBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = query.Num,
- EpFlag = stockBarcode.EpFlag,
- CustomerNo = stockBarcode.CustomerNo,
- ItemWt = stockBarcode.ItemWt,
- DepotsCode = stockBarcode.DepotsCode,
- DepotsId = stockBarcode.DepotsId,
- DepotSectionsCode = stockBarcode.DepotSectionsCode,
- CheckDate = stockBarcode.CheckDate,
- ItemType = stockBarcode.ItemType,
- IndepDate = stockBarcode.IndepDate,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- IqcStatus = stockBarcode.IqcStatus,
- BoardStyle = stockBarcode.BoardStyle,
- WorkNo = stockBarcode.WorkNo,
- WorkLine = stockBarcode.WorkLine,
- SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId
- // UnitId = stockBarcode.ItemUnit
- }).IgnoreColumns(true).ExecuteCommand();
+ //// 鏇存柊鍘熸潯鐮佹暟閲�
+ //executeCommand += db.Updateable<MesInvItemStocks>()
+ // .SetColumns(it => it.Quantity == it.Quantity - query.Num)
+ // .Where(it => it.ItemBarcode == query.barcode)
+ // .ExecuteCommand();
- // 鍐欏叆鏂版潯鐮佺殑浜ゆ槗璁板綍
- executeCommand += db.Insertable(new MesInvBusiness2
- {
- Guid = Guid.NewGuid(),
- Status = 1,
- BillTypeId = 200, // p_bill_type_id
- TransactionCode = "209", // p_transaction_no
- BusinessType = 0,
- ItemBarcode = newBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- EpFlag = true,
- Quantity = query.Num,
- FromInvDepotsCode = null,
- FromInvDepotSectionsCode = null,
- ToInvDepotsCode = stockBarcode.DepotsCode,
- ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- Description = query.Type + "鎷嗗垎鐢熸垚",
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNo = stockBarcode.TaskNo,
- BillNo = stockBarcode.BillNo,
- WorkNo = stockBarcode.WorkNo,
- WorkLine = stockBarcode.WorkLine,
- SuppNo = stockBarcode.SuppNo,
- SuppId = stockBarcode.SuppId,
- ItemId = stockBarcode.ItemId
- // CkDepot = stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
+ ////// 鍒犻櫎鍘熸潯鐮佸簱瀛樿褰�
+ ////executeCommand += db.Deleteable<MesInvItemStocks>()
+ //// .Where(it => it.ItemBarcode == query.barcode)
+ //// .ExecuteCommand();
+
+ //// 鎻掑叆鍓╀綑鏉＄爜鏁伴噺鐨勬柊搴撳瓨璁板綍
+ //executeCommand += db.Insertable(new MesInvItemStocks
+ //{
+ // Guid = Guid.NewGuid(),
+ // TaskNo = stockBarcode.TaskNo,
+ // ItemBarcode = newBarcode,
+ // ItemNo = stockBarcode.ItemNo,
+ // LotNo = stockBarcode.LotNo,
+ // Quantity = query.Num,
+ // EpFlag = stockBarcode.EpFlag,
+ // CustomerNo = stockBarcode.CustomerNo,
+ // ItemWt = stockBarcode.ItemWt,
+ // DepotsCode = stockBarcode.DepotsCode,
+ // DepotsId = stockBarcode.DepotsId,
+ // DepotSectionsCode = stockBarcode.DepotSectionsCode,
+ // CheckDate = stockBarcode.CheckDate,
+ // ItemType = stockBarcode.ItemType,
+ // IndepDate = stockBarcode.IndepDate,
+ // Factory = stockBarcode.Factory,
+ // Company = stockBarcode.Company,
+ // IqcStatus = stockBarcode.IqcStatus,
+ // BoardStyle = stockBarcode.BoardStyle,
+ // WorkNo = stockBarcode.WorkNo,
+ // WorkLine = stockBarcode.WorkLine,
+ // SuppNo = stockBarcode.SuppNo,
+ // ItemId = stockBarcode.ItemId
+ // // UnitId = stockBarcode.ItemUnit
+ //}).IgnoreColumns(true).ExecuteCommand();
+
+ //// 鍐欏叆鏂版潯鐮佺殑浜ゆ槗璁板綍
+ //executeCommand += db.Insertable(new MesInvBusiness2
+ //{
+ // Guid = Guid.NewGuid(),
+ // Status = 1,
+ // BillTypeId = 200, // p_bill_type_id
+ // TransactionCode = "209", // p_transaction_no
+ // BusinessType = 0,
+ // ItemBarcode = newBarcode,
+ // ItemNo = stockBarcode.ItemNo,
+ // LotNo = stockBarcode.LotNo,
+ // EpFlag = true,
+ // Quantity = query.Num,
+ // FromInvDepotsCode = null,
+ // FromInvDepotSectionsCode = null,
+ // ToInvDepotsCode = stockBarcode.DepotsCode,
+ // ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
+ // Description = query.Type + "鎷嗗垎鐢熸垚",
+ // CreateBy = query.userName,
+ // CreateDate = DateTime.Now,
+ // LastupdateBy = query.userName,
+ // LastupdateDate = DateTime.Now,
+ // Factory = stockBarcode.Factory,
+ // Company = stockBarcode.Company,
+ // TaskNo = stockBarcode.TaskNo,
+ // BillNo = stockBarcode.BillNo,
+ // WorkNo = stockBarcode.WorkNo,
+ // WorkLine = stockBarcode.WorkLine,
+ // SuppNo = stockBarcode.SuppNo,
+ // SuppId = stockBarcode.SuppId,
+ // ItemId = stockBarcode.ItemId
+ // // CkDepot = stockBarcode.DepotsId
+ //}).IgnoreColumns(true).ExecuteCommand();
}
else if (totalQty < query.Num)
{
@@ -847,7 +856,7 @@
{
Guid = Guid.NewGuid(),
ItemOutId = outId,
- ItemBarcode = newBarcode ?? query.barcode,
+ ItemBarcode = newBarcode ,
ItemNo = stockBarcode.ItemNo,
LotNo = stockBarcode.LotNo,
Quantity = query.Num,
@@ -882,7 +891,7 @@
BillTypeId = 200, // p_bill_type_id
TransactionCode = "209", // p_transaction_no
BusinessType = 1,
- ItemBarcode = newBarcode ?? query.barcode,
+ ItemBarcode = newBarcode ,
ItemNo = stockBarcode.ItemNo,
LotNo = stockBarcode.LotNo,
EpFlag = true,
@@ -961,7 +970,7 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "[PDA]" + query.Type + "銆傛潯鐮併��" + query.barcode + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
+ var LogMsg = "[PDA]" + query.Type + "銆傛潯鐮併��" + newBarcode + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
logService.CreateLog(db, query.userName, womdaa.Guid.ToString(), "WOMDAA", LogMsg, womdaa.Daa001);
@@ -984,9 +993,31 @@
})
.ToList();
- return (success, pendingList);
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.billNo,
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = newBarcode//鎷嗗垎鍚庢潯鐮�
+ };
+
+ return dto;
}
+ // 鑾峰彇浜х嚎鍒楄〃
+ public dynamic GetLineInfo(dynamic unity, dynamic RequestInfo)
+ {
+ var orgId = RequestInfo.OrgId;
+ var sqlParams = new List<SugarParameter>
+ {
+ new("@orgId", orgId)
+ };
+
+ var sql2 = new StringBuilder("exec prc_pda_itemBl_lineInfo @orgId");
+
+ var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+ return LineInfo;
+ }
#endregion
#region 鐢熶骇瓒呴
@@ -1309,7 +1340,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
+ DepotId = (int)stockBarcode.DepotId,
Dabid = womdab.Guid,
}).IgnoreColumns(true).ExecuteCommand();
@@ -1500,7 +1531,7 @@
EpFlag = stockBarcode.EpFlag,
CustomerNo = stockBarcode.CustomerNo,
DepotsCode = stockBarcode.DepotsCode,
- DepotsId = stockBarcode.DepotsId,
+ DepotsId = stockBarcode.DepotId,
DepotSectionsCode = stockBarcode.DepotSectionsCode,
CheckDate = stockBarcode.CheckDate,
ItemType = stockBarcode.ItemType,
@@ -1712,7 +1743,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
+ DepotId = (int)stockBarcode.DepotId,
LineK3id = workOrderDetail.Erpid,
EbelnK3id = workOrderDetail.Eid
}).IgnoreColumns(true).ExecuteCommand();
--
Gitblit v1.9.3