From 02b26bfaca24386f7b4f4a5e9f336812370ed49b Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 09:45:46 +0800
Subject: [PATCH] 获取BOM参数调整
---
service/Warehouse/MesItemBlManager.cs | 1063 ++++++++++++++++-------------------------------------------
1 files changed, 289 insertions(+), 774 deletions(-)
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index a5480b9..5d749cb 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -1,8 +1,13 @@
-锘縰sing NewPdaSqlServer.DB;
+锘縰sing Masuit.Tools;
+using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Data;
+using System.Text;
+using System.Data.SqlClient;
namespace NewPdaSqlServer.service.Warehouse;
@@ -14,14 +19,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)
- .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;
}
@@ -30,7 +43,7 @@
/// </summary>
/// <param name="billNo">琛ユ枡鍗曞彿</param>
/// <returns>琛ユ枡鍗曟槑缁嗗垪琛�</returns>
- public (string bl001, List<MesItemBlDetail> item)
+ public ProductionPickDto
GetMesItemBlDetailByBillNo(
WarehouseQuery query)
{
@@ -39,36 +52,60 @@
// 妫�鏌ヨˉ鏂欏崟鏄惁瀛樺湪涓斾负鐢熶骇琛ユ枡绫诲瀷
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
+ .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type && a.Bl018 == true)
.First();
if (mesItemBl == null)
- throw new Exception("鍗曟嵁鍙蜂笉姝ｇ‘锛�");
+ 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.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
+ 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>
- /// 鐢熶骇宸ュ崟閫�鏂欐壂鐮�
+ /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -81,12 +118,9 @@
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
- SctlScanBarcode(
+ ScblScanBarcode(
WarehouseQuery query)
{
- if (string.IsNullOrEmpty(query.billNo))
- throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
-
if (string.IsNullOrEmpty(query.barcode))
throw new Exception("璇锋壂鎻忔潯鐮侊紒");
@@ -94,329 +128,109 @@
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
if (string.IsNullOrEmpty(query.blNo))
- throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
+ throw new Exception("鐢宠鍗曞彿涓嶈兘涓虹┖锛�");
+ // 鍑嗗璋冪敤瀛樺偍杩囩▼鐨勫弬鏁�
+ string outMsg = "";
+ int outSum = -1;
+ decimal barcodeNum = 0;
+ decimal splitNum = 0;
- // 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
- var exists = Db.Queryable<MesInvItemOutCDetails>()
- .Where(b => b.ItemBarcode == query.barcode)
- .Any();
-
- if (exists)
- throw new Exception("姝ゆ潯鐮佸凡鎵弿,鍕块噸澶嶆壂鐮侊紒");
-
- // 鏌ヨ鏉＄爜搴撳瓨淇℃伅
- var stockBarcode = Db.Queryable<MesInvItemStocks>()
- .Where(t => t.ItemBarcode == query.barcode && t.Quantity > 0)
- .First();
-
- if (stockBarcode == null)
- throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮�,璇锋牳瀵癸紒{query.barcode}");
-
- // 妫�鏌ヨˉ鏂欏崟鐘舵��
- var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo)
- .First();
-
- if (mesItemBl == null)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸叉挙鍥烇紒");
-
- if (mesItemBl.Bl018 != true)
- throw new Exception($"鐢宠鍗� {query.blNo} 鏈鏍革紒");
-
- if (mesItemBl.Bl019 == true)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸插畬缁擄紒");
-
- // 鑾峰彇琛ユ枡鍗曟槑缁嗗苟鏍￠獙
- var blDetail = Db.Queryable<MesItemBlDetail>()
- .Where(b =>
- b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
- .First();
-
- if (blDetail == null)
- throw new Exception($"鐢宠鍗曚笉瀛樺湪姝ょ墿鏂� {stockBarcode.ItemNo} 璇风‘璁わ紒");
-
- // 妫�鏌ュ緟琛ユ暟閲�
- var quantity = (blDetail.Bld007 ?? 0) - (blDetail.Bld008 ?? 0);
- if (quantity == 0)
- throw new Exception("鐗╂枡宸叉壂鐮佸畬鎴愶紝璇锋牳瀵癸紒");
-
- // 妫�鏌ュ伐鍗曚俊鎭�
- var womdaa = Db.Queryable<Womdaa>()
- .Where(a => a.Daa001 == query.billNo)
- .First();
-
- if (womdaa == null)
- throw new Exception($"宸ュ崟 {query.billNo} 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- // 妫�鏌ュ鏂欐槑缁�
- var womdab = Db.Queryable<Womdab>()
- .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
- .First();
-
- if (womdab == null)
- throw new Exception($"澶囨枡鏄庣粏涓嶅瓨鍦ㄦ鐗╂枡 {stockBarcode.ItemNo} 璇风‘璁わ紒");
-
- if (stockBarcode.Quantity > quantity)
+ try
{
- // 鑾峰彇寰呭彂鏂欐槑缁嗗垪琛�
- var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
- .Where((a, b) => a.BlNo == query.blNo
- && (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();
-
-
- query.Num = stockBarcode.Quantity;
- query.Fum = quantity;
-
- return (query, pendingList);
- }
-
- // 寮�鍚簨鍔″鐞�
- var success = UseTransaction(db =>
- {
- // 鑾峰彇鎴栧垱寤哄嚭搴撳崟
- var outId = Guid.NewGuid();
- var outNo = BillNo.GetBillNo("BL(宸ュ崟琛ユ枡)");
-
- var existingOut = db.Queryable<MesInvItemOuts>()
- .Where(a => a.BbillNo == query.blNo
- && a.DepotCode == womdab.Dab017
- && a.OutDate.Value.Date.ToString("yyyy-MM-dd") ==
- DateTime.Now.Date.ToString("yyyy-MM-dd")
- && a.BillTypeId == 200
- && a.TransactionNo == 209
- && a.Status == 0)
- .First();
-
- if (existingOut != null)
+ // 璋冪敤瀛樺偍杩囩▼
+ var parameters = new SqlParameter[]
{
- outId = existingOut.Guid;
- outNo = existingOut.ItemOutNo;
- }
- else
+ new SqlParameter("@C_USER", SqlDbType.NVarChar, 100) { Value = query.userName ?? string.Empty },
+ new SqlParameter("@P_BILL_NO", SqlDbType.NVarChar, 50) { Value = query.billNo ?? string.Empty },
+ new SqlParameter("@P_ITEM_BARCODE", SqlDbType.NVarChar, 100) { Value = query.barcode ?? string.Empty },
+ new SqlParameter("@P_BL_NO", SqlDbType.NVarChar, 100) { Value = query.blNo ?? string.Empty },
+ new SqlParameter("@P_TYPE", SqlDbType.NVarChar, 20) { Value = query.Type ?? string.Empty },
+ new SqlParameter("@OUT_MSG", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new SqlParameter("@OUT_SUM", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new SqlParameter("@BARCODE_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ },
+ new SqlParameter("@SPLIT_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ }
+ };
+
+ // 鎵ц瀛樺偍杩囩▼
+ string procedureName = "PRC_PDA_SCBLCL";
+ int res = DbHelperSQL.RunProcedure_NonQuery(procedureName, parameters);
+
+ // 鑾峰彇杈撳嚭鍙傛暟
+ outMsg = parameters[5].Value?.ToString() ?? "";
+ outSum = parameters[6].Value as int? ?? 0; // 榛樿鍊兼牴鎹渶姹傝皟鏁�
+ barcodeNum = parameters[7].Value as decimal? ?? 0m;
+ splitNum = parameters[8].Value as decimal? ?? 0m;
+
+ // 澶勭悊瀛樺偍杩囩▼杩斿洖鐨勭粨鏋�
+ if (outSum == 2) // 闇�瑕佹媶鍒�
{
- // 鎻掑叆鍑哄簱鍗曚富琛�
- db.Insertable(new MesInvItemOuts
- {
- Guid = outId,
- ItemOutNo = outNo,
- TaskNo = query.blNo,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- BillTypeId = 200,
- TransactionNo = 209,
- Remark = mesItemBl.Bl007,
- DepotCode = womdab.Dab017,
- OutPart = womdaa.Daa013,
- FType = 0,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- WorkNo = womdaa.Daa021,
- BoardItem = womdaa.Daa002,
- PbillNo = womdaa.Daa001,
- OutDate = DateTime.Now,
- Status = 0,
- BbillNo = query.blNo
- }).IgnoreColumns(true).ExecuteCommand();
- }
+ query.status = 2;
+ query.message = outMsg;
+ query.CfNum = splitNum;
+ query.Num = barcodeNum;
- // 妫�鏌ュ苟鏇存柊鍑哄簱鍗曠墿鏂欐槑缁�
- var itemCount = db.Queryable<MesInvItemOutItems>()
- .Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
- .Count();
-
- if (itemCount > 0)
- // 鏇存柊宸插瓨鍦ㄧ殑鐗╂枡鏄庣粏鏁伴噺
- db.Updateable<MesInvItemOutItems>()
- .SetColumns(i =>
- i.Quantity == i.Quantity + stockBarcode.Quantity)
- .Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
- .ExecuteCommand();
- else
- // 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
- db.Insertable(new MesInvItemOutItems
- {
- Guid = Guid.NewGuid(),
- ItemOutId = outId,
- ItemNo = blDetail.Bld002,
- Quantity = stockBarcode.Quantity,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- DepotCode = womdab.Dab017,
- TaskNo = query.blNo,
- WorkNo = womdaa.Daa021,
- WorkLine = blDetail.Bld013,
- ErpItemNo = womdab.Dab003,
- ErpId = womdab.Eid,
- ErpAutoid = womdab.Erpid,
- PbillNo = query.billNo,
- ItemId = blDetail.Bld012
- // Unit = blDetail.Bld009,
- // DepotId = (int)stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鎻掑叆鍑哄簱鍗曟潯鐮佹槑缁�
- db.Insertable(new MesInvItemOutCDetails
- {
- Guid = Guid.NewGuid(),
- ItemOutId = outId,
- ItemBarcode = stockBarcode.ItemBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = stockBarcode.Quantity,
- ForceOutFlag = 0,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- DepotCode = stockBarcode.DepotsCode,
- DepotSectionCode = stockBarcode.DepotSectionsCode,
- Remark = blDetail.Bld010,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNoy = mesItemBl.Bl013,
- BoardStyle = mesItemBl.Bl002,
- TaskNo = query.blNo,
- WorkNo = blDetail.Bld001,
- WorkLine = blDetail.Bld013,
- SuppNo = stockBarcode.SuppNo,
- PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
- Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
- EbelnK3id = womdab.Eid,
- LineK3id = womdab.Erpid
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鎻掑叆涓氬姟浜ゆ槗璁板綍
- db.Insertable(new MesInvBusiness2
- {
- Guid = Guid.NewGuid(),
- Status = 1,
- BillTypeId = 200, // p_bill_type_id
- TransactionCode = "210", // p_transaction_no
- BusinessType = -1,
- ItemBarcode = stockBarcode.ItemBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- EpFlag = true,
- Quantity = stockBarcode.Quantity,
- FromInvDepotsCode = stockBarcode.DepotsCode,
- FromInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNo = mesItemBl.Bl012, // Matches C_QTCK.Bl012
- BillNo = query.blNo,
- WorkNo = blDetail.Bld001, // Matches C_QTCK_D.Bld001
- WorkLine = blDetail.Bld013, // Matches C_QTCK_D.Bld013
- SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId
- // CkDepot = stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
-
-
- // 鏇存柊宸ュ崟琛ㄦ暟閲�
- db.Updateable<Womdab>()
- .SetColumns(it => new Womdab
- {
- Dab007 = (it.Dab007 ?? 0) + stockBarcode.Quantity,
- Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
- Dab021 = (it.Dab021 ?? 0) + stockBarcode.Quantity
- })
- .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
- .ExecuteCommand();
-
- // 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
- db.Updateable<MesItemBlDetail>()
- .SetColumns(it => new MesItemBlDetail
- {
- Bld008 = (it.Bld008 ?? 0) + (int)stockBarcode.Quantity
- })
- .Where(it => it.Id == blDetail.Id)
- .ExecuteCommand();
-
- // 妫�鏌ヨˉ鏂欏崟鏄庣粏鏄惁瀹屾垚
- var blDetail1 = db.Queryable<MesItemBlDetail>()
- .Where(it => it.Id == blDetail.Id)
- .First();
-
- if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
- // 鏇存柊鏄庣粏瀹屾垚鐘舵��
- db.Updateable<MesItemBlDetail>()
- .SetColumns(it => it.Bld011 == 1)
- .Where(it => it.Id == blDetail1.Id)
- .ExecuteCommand();
-
- // 鏇存柊搴撳瓨鏁伴噺涓�0
- db.Updateable<MesInvItemStocks>()
- .SetColumns(it => it.Quantity == 0)
- .Where(it => it.Guid == stockBarcode.Guid)
- .ExecuteCommand();
-
-
- // 妫�鏌ユ槸鍚︽墍鏈夋槑缁嗛兘宸插畬鎴�
- var unfinishedDetail = db.Queryable<MesItemBlDetail>()
- .LeftJoin<MesItemBl>((b, a) => a.Id == b.Mid)
- .Where((b, a) => a.BlNo == query.blNo && (b.Bld011 ?? 0) == 0)
- .Select((b, a) => b)
- .First();
-
- if (unfinishedDetail == null)
- // 濡傛灉娌℃湁鏈畬鎴愮殑鏄庣粏锛屾洿鏂拌ˉ鏂欏崟鐘舵�佷负宸插畬鎴�
- db.Updateable<MesItemBl>()
- .SetColumns(it => new MesItemBl
+ // 鑾峰彇寰呭彂鏂欐槑缁嗗垪琛�
+ var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
+ .Where((a, b) => a.BlNo == query.blNo
+ && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
+ .Select((a, b) => new MesItemBlDetail
{
- Bl019 = true,
- WcUser = query.userName,
- WcTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
- .Where(it => it.Id == mesItemBl.Id)
- .ExecuteCommand();
+ .ToList();
- return 1;
- });
-
- // 鑾峰彇鏈�缁堢殑寰呭彂鏂欐槑缁嗗垪琛�
- var finalPendingList = Db.Queryable<MesItemBl, MesItemBlDetail>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
- .Where((a, b) => a.BlNo == query.blNo
- && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new MesItemBlDetail
+ return (query, pendingList);
+ }
+ else if (outSum == -1) // 澶勭悊澶辫触
{
- Bld012 = b.Bld012,
- Bld002 = b.Bld002,
- Bld003 = b.Bld003,
- Bld004 = b.Bld004,
- Bld007 = b.Bld007,
- Bld008 = b.Bld008
- })
- .ToList();
+ throw new Exception(outMsg);
+ }
+ else if (outSum == 1) // 澶勭悊鎴愬姛
+ {
+ // 鑾峰彇鏈�缁堢殑寰呭彂鏂欐槑缁嗗垪琛�
+ var finalPendingList = Db.Queryable<MesItemBl, MesItemBlDetail>(
+ (a, b) => new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
+ .Where((a, b) => a.BlNo == query.blNo
+ && (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 (query, finalPendingList);
+ query.status = 1;
+ query.message = outMsg;
+ return (query, finalPendingList);
+ }
+ else
+ {
+ throw new Exception("鏈煡鐨勫鐞嗙粨鏋滅姸鎬�");
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"璋冪敤瀛樺偍杩囩▼PRC_PDA_SCBLCL澶辫触: {ex.Message}");
+ }
}
/// <summary>
@@ -432,9 +246,11 @@
/// - Num: 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
+ public ProductionPickDto SplitBarcode(
WarehouseQuery query)
{
+
+ // Validate input parameters
if (string.IsNullOrEmpty(query.userName))
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
@@ -444,433 +260,41 @@
if (string.IsNullOrEmpty(query.barcode))
throw new Exception("璇锋壂鎻忔潯鐮侊紒");
- if (query.Num <= 0)
+ if ((query.Num ?? 0) <= 0)
throw new Exception("璇疯緭鍏ユ纭殑鍙戞枡鏁伴噺锛�");
if (string.IsNullOrEmpty(query.blNo))
throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
+ // Prepare parameters for the stored procedure
+ var parameters = new List<SugarParameter>
+{
+ new SugarParameter("@C_USER", query.userName),
+ new SugarParameter("@P_BILL_NO", query.billNo),
+ new SugarParameter("@P_ITEM_BARCODE", query.barcode),
+ new SugarParameter("@P_BL_NO", query.blNo),
+ new SugarParameter("@P_TYPE", query.Type),
+ new SugarParameter("@NUM", query.Num),
+ new SugarParameter("@OUT_MSG", "", System.Data.DbType.String, ParameterDirection.Output),
+ new SugarParameter("@OUT_SUM", 0, System.Data.DbType.Int32, ParameterDirection.Output),
+ new SugarParameter("@OUT_CF_BAR", "", System.Data.DbType.String, ParameterDirection.Output)
+};
- // 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
- var exists = Db.Queryable<MesInvItemOutCDetails>()
- .Where(b => b.ItemBarcode == query.barcode)
- .Any();
+ // Execute the stored procedure
+ Db.Ado.UseStoredProcedure().ExecuteCommand("PRC_PDA_SCBLCL_CF", parameters);
- if (exists)
- throw new Exception("姝ゆ潯鐮佸凡鎵弿,鍕块噸澶嶆壂鐮侊紒");
+ // Get output parameters
+ var outMsg = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_MSG")?.Value?.ToString();
+ var outSum = Convert.ToInt32(parameters.FirstOrDefault(p => p.ParameterName == "@OUT_SUM")?.Value ?? -1);
+ var outCfBar = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_CF_BAR")?.Value?.ToString();
- // 鏌ヨ鏉＄爜搴撳瓨淇℃伅
- var stockBarcode = Db.Queryable<MesInvItemStocks>()
- .Where(t => t.ItemBarcode == query.barcode && t.Quantity > 0)
- .First();
-
- if (stockBarcode == null)
- throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮�,璇锋牳瀵癸紒{query.barcode}");
-
- var totalQty = stockBarcode.Quantity;
- string newBarcode = null;
-
- // 寮�鍚簨鍔″鐞�
- var success = UseTransaction(db =>
+ // Handle the result
+ if (outSum == -1)
{
- var executeCommand = 0;
+ throw new Exception(outMsg ?? "鎿嶄綔澶辫触");
+ }
- // 鎷嗗垎鏉＄爜
- if (totalQty > query.Num)
- {
- var mesItems = db.Queryable<MesItems>()
- .Where(s => s.Id == stockBarcode.ItemId).First();
-
- // 鐢熸垚鏂版潯鐮佸彿
- newBarcode = BillNo.GetBillNo("TMBH(鏉＄爜缂栧彿)", 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.Updateable<MesInvItemBarcodes>()
- .SetColumns(it => it.Quantity == totalQty - query.Num)
- .Where(it => it.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- // 鍒犻櫎鍘熸潯鐮佸簱瀛樿褰�
- executeCommand += db.Deleteable<MesInvItemStocks>()
- .Where(it => it.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- // 鎻掑叆鍓╀綑鏉＄爜鏁伴噺鐨勬柊搴撳瓨璁板綍
- executeCommand += db.Insertable(new MesInvItemStocks
- {
- Guid = Guid.NewGuid(),
- TaskNo = stockBarcode.TaskNo,
- ItemBarcode = stockBarcode.ItemBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = totalQty - 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 = -1,
- ItemBarcode = newBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- EpFlag = true,
- Quantity = query.Num,
- FromInvDepotsCode = null,
- FromInvDepotSectionsCode = null,
- ToInvDepotsCode = stockBarcode.DepotsCode,
- ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- Description = null,
- 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)
- {
- throw new Exception("鍙戞枡鏁伴噺澶т簬鏉＄爜鏁�,璇锋牳瀵癸紒");
- }
-
- if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode;
-
- // 妫�鏌ヨˉ鏂欏崟鐘舵��
- var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
- .First();
-
- if (mesItemBl == null)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸叉挙鍥烇紒");
-
- if (mesItemBl.Bl018 != true)
- throw new Exception($"鐢宠鍗� {query.blNo} 鏈鏍革紒");
-
- if (mesItemBl.Bl019 == true)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸插畬缁擄紒");
-
- // 鑾峰彇琛ユ枡鍗曟槑缁嗗苟鏍￠獙
- var blDetail = Db.Queryable<MesItemBlDetail>()
- .Where(b =>
- b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
- .First();
-
- if (blDetail == null)
- throw new Exception($"鐢宠鍗曚笉瀛樺湪姝ょ墿鏂� {stockBarcode.ItemNo} 璇风‘璁わ紒");
-
- var remainingQty = (blDetail.Bld007 ?? 0) - (blDetail.Bld008 ?? 0);
- if (remainingQty == 0)
- throw new Exception("鐗╂枡宸叉壂鐮佸畬鎴愶紝璇锋牳瀵癸紒");
-
- if (query.Num > remainingQty)
- throw new Exception(
- $"鎷嗗垎鏁伴噺锛歿query.Num} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
-
- // 妫�鏌ュ伐鍗曚俊鎭�
- var womdaa = Db.Queryable<Womdaa>()
- .Where(a => a.Daa001 == query.billNo)
- .First();
-
- if (womdaa == null)
- throw new Exception($"宸ュ崟 {query.billNo} 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- var womdab = Db.Queryable<Womdab>()
- .Where(b =>
- b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
- .First();
-
- if (womdab == null)
- throw new Exception($"澶囨枡鏄庣粏涓嶅瓨鍦ㄦ鐗╂枡 {stockBarcode.ItemNo} 璇风‘璁わ紒");
-
- // 妫�鏌ュ凡鍙戞枡鏁伴噺鏄惁瓒呰繃寰呭彂鏂欐暟閲�
- var sumQty = db.Queryable<MesInvItemOutCDetails>()
- .Where(it =>
- it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
- .Sum(it => it.Quantity);
-
- if (sumQty > remainingQty)
- throw new Exception(
- $"鎷嗗垎鏁伴噺锛歿sumQty} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
-
- // 鑾峰彇鎴栧垱寤哄嚭搴撳崟
- var itemOut = db.Queryable<MesInvItemOuts>()
- .Where(a => a.BbillNo == query.blNo
- && a.DepotCode == womdab.Dab017
- && a.OutDate.Value.Date.ToString("yyyy-MM-dd") ==
- DateTime.Now.Date.ToString("yyyy-MM-dd")
- && a.BillTypeId == 200
- && a.TransactionNo == 209
- && a.Status == 0)
- .First();
-
- if (itemOut == null)
- {
- // 鍒涘缓鏂扮殑鍑哄簱鍗�
- var outId = Guid.NewGuid();
- var outNo = BillNo.GetBillNo("BL(宸ュ崟琛ユ枡)");
-
- // 鎻掑叆鍑哄簱鍗曚富琛�
- executeCommand += db.Insertable(new MesInvItemOuts
- {
- Guid = outId,
- ItemOutNo = outNo,
- TaskNo = query.blNo,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- BillTypeId = 200,
- TransactionNo = 209,
- Remark = mesItemBl.Bl007,
- DepotCode = womdab.Dab017,
- OutPart = womdaa.Daa013,
- FType = 0,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- WorkNo = womdaa.Daa021,
- BoardItem = womdaa.Daa002,
- PbillNo = womdaa.Daa001,
- OutDate = DateTime.Now,
- Status = 0,
- BbillNo = query.blNo
- }).IgnoreColumns(true).ExecuteCommand();
- }
-
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪鍑哄簱鍗曟槑缁�
- var itemOutItemCount = db.Queryable<MesInvItemOutItems>()
- .Where(it =>
- it.ItemOutId == itemOut.Guid &&
- it.ItemId == stockBarcode.ItemId)
- .Count();
-
- if (itemOutItemCount == 0)
- // 鎻掑叆鏂扮殑鍑哄簱鍗曟槑缁�
- executeCommand += db.Insertable(new MesInvItemOutItems
- {
- Guid = Guid.NewGuid(),
- ItemOutId = itemOut.Guid,
- ItemNo = blDetail.Bld002,
- Quantity = query.Num,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- DepotCode = womdab.Dab017,
- TaskNo = query.blNo,
- WorkNo = womdaa.Daa021,
- WorkLine = blDetail.Bld013,
- ErpItemNo = womdab.Dab003,
- ErpId = womdab.Eid,
- ErpAutoid = womdab.Erpid,
- PbillNo = query.billNo,
- ItemId = blDetail.Bld012
- // Unit = blDetail.Bld009,
- // DepotId = (int)stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
- else
- // 鏇存柊宸叉湁鍑哄簱鍗曟槑缁嗘暟閲�
- executeCommand += db.Updateable<MesInvItemOutItems>()
- .SetColumns(it => it.Quantity == it.Quantity + query.Num)
- .Where(it =>
- it.ItemOutId == itemOut.Guid &&
- it.ItemId == stockBarcode.ItemId)
- .ExecuteCommand();
-
- // 鎻掑叆鍑哄簱鏉＄爜鏄庣粏
- executeCommand += db.Insertable(new MesInvItemOutCDetails
- {
- Guid = Guid.NewGuid(),
- ItemOutId = itemOut.Guid,
- ItemBarcode = newBarcode ?? query.barcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = query.Num,
- ForceOutFlag = 0,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- DepotCode = stockBarcode.DepotsCode,
- DepotSectionCode = stockBarcode.DepotSectionsCode,
- Remark = blDetail.Bld010,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNoy = mesItemBl.Bl013,
- BoardStyle = mesItemBl.Bl002,
- TaskNo = query.blNo,
- WorkNo = blDetail.Bld001,
- WorkLine = blDetail.Bld013,
- SuppNo = stockBarcode.SuppNo,
- PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
- Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鎻掑叆涓氬姟娴佹按
- executeCommand += db.Insertable(new MesInvBusiness2
- {
- Guid = Guid.NewGuid(),
- Status = 1,
- BillTypeId = 200, // p_bill_type_id
- TransactionCode = "210", // p_transaction_no
- BusinessType = 1,
- ItemBarcode = newBarcode ?? query.barcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- EpFlag = true,
- Quantity = query.Num,
- FromInvDepotsCode = stockBarcode.DepotsCode,
- FromInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- Description = null,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNo = mesItemBl.Bl012,
- BillNo = query.blNo,
- WorkNo = blDetail.Bld001,
- WorkLine = blDetail.Bld013,
- SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId
- // CkDepot = stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鏇存柊宸ュ崟琛ㄦ暟閲�
- executeCommand += db.Updateable<Womdab>()
- .SetColumns(it => new Womdab
- {
- Dab007 = (it.Dab007 ?? 0) + query.Num, // 宸ュ崟鏁伴噺
- Dab020 = (it.Dab020 ?? 0) + query.Num, // 宸插彂鏂欐暟閲�
- Dab021 = (it.Dab021 ?? 0) + query.Num // 宸插彂鏂欐暟閲�
- })
- .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
- .IgnoreColumns(true)
- .ExecuteCommand();
-
- // 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
- executeCommand += db.Updateable<MesItemBlDetail>()
- .SetColumns(it => new MesItemBlDetail
- {
- Bld008 = (it.Bld008 ?? 0) + (int)query.Num
- })
- .Where(it => it.Id == blDetail.Id)
- .ExecuteCommand();
-
- // 鑾峰彇鏇存柊鍚庣殑琛ユ枡鍗曟槑缁嗘暟閲�
- var updatedDetail = db.Queryable<MesItemBlDetail>()
- .Where(it => it.Id == blDetail.Id)
- .Select(it => new { it.Bld007, it.Bld008 })
- .First();
-
- if ((updatedDetail.Bld007 ?? 0) <= (updatedDetail.Bld008 ?? 0))
- // 鏇存柊鏄庣粏瀹屾垚鐘舵��
- executeCommand += db.Updateable<MesItemBlDetail>()
- .SetColumns(it => new MesItemBlDetail { Bld011 = 1 })
- .Where(it => it.Id == blDetail.Id)
- .ExecuteCommand();
-
- // 妫�鏌ユ槸鍚﹁繕鏈夋湭瀹屾垚鐨勬槑缁�
-
- var unfinishedDetail = db.Queryable<MesItemBlDetail>()
- .Where(it => it.Mid == mesItemBl.Id && (it.Bld011 ?? 0) == 0)
- .First();
-
- if (unfinishedDetail == null)
- // 濡傛灉娌℃湁鎵惧埌鏈畬鎴愭槑缁嗭紝鍒欐洿鏂拌ˉ鏂欏崟鐘舵�佷负宸插畬鎴�
- executeCommand += db.Updateable<MesItemBl>()
- .SetColumns(it => new MesItemBl
- {
- Bl019 = true,
- WcUser = query.userName,
- WcTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
- })
- .Where(it => it.Id == mesItemBl.Id)
- .ExecuteCommand();
-
- if (executeCommand <= 1) throw new Exception("鏇存柊澶辫触");
-
- return executeCommand;
- }) > 0;
-
- // 鑾峰彇鏈�缁堢殑寰呭彂鏂欐槑缁嗗垪琛�
+ // Get pending list for the supplement order
var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
@@ -886,9 +310,31 @@
})
.ToList();
- return (success, pendingList);
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.billNo,
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = outCfBar//鎷嗗垎鍚庢潯鐮�
+ };
+
+ 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 鐢熶骇瓒呴
@@ -1101,8 +547,8 @@
var outId = Guid.Empty;
var outNo = "";
var outRecord = db.Queryable<MesInvItemOuts>()
- .Where(a => a.BbillNo == query.blNo
- && a.DepotCode == womdab.Dab017
+ .Where(a => a.TaskNo == query.blNo
+ && a.DepotId == stockBarcode.DepotId
&& a.OutDate.Value.Date == DateTime.Now.Date
&& a.BillTypeId == 200
&& a.TransactionNo == 210
@@ -1131,7 +577,7 @@
OutPart = womdaa.Daa013,
FType = 0,
WorkNo = womdaa.Daa021,
- OutType = "鐢熶骇瓒呴鍗�",
+ OutType = query.Type,
BoardItem = womdaa.Daa002,
PbillNo = womdaa.Daa001,
OutDate = DateTime.Now,
@@ -1171,7 +617,8 @@
ErpId = womdab.Eid,
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
- ItemId = blDetail.Bld012
+ ItemId = blDetail.Bld012,
+ DepotId = stockBarcode.DepotId.ToString(),
// Unit = blDetail.Bld009,
// DepotId = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -1210,7 +657,8 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId
+ DepotId = (int)stockBarcode.DepotId,
+ Dabid = womdab.Guid,
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆涓氬姟娴佹按
@@ -1249,7 +697,7 @@
Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
})
- .Where(it => it.Id == womdab.Id)
+ .Where(it => it.Guid == womdab.Guid)
.ExecuteCommand();
// 鏇存柊瓒呴鍗曟槑缁�
@@ -1400,7 +848,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,
@@ -1612,7 +1060,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();
@@ -1653,7 +1101,7 @@
Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
Dab023 = (it.Dab023 ?? 0) + stockBarcode.Quantity
})
- .Where(it => it.Id == workOrderDetail.Id)
+ .Where(it => it.Guid == workOrderDetail.Guid)
.ExecuteCommand();
// 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
@@ -1715,5 +1163,72 @@
return (true, pendingList);
}
+
+ /// <summary>
+ /// 鏍规嵁鍗曞彿鑾峰彇鐢熶骇琛ユ枡鍗曟槑缁� prc_rf_pda_scan_zout_showbl
+ /// </summary>
+ /// <param name="billNo">琛ユ枡鍗曞彿</param>
+ /// <returns>琛ユ枡鍗曟槑缁嗗垪琛�</returns>
+ public ProductionPickDto
+ GetMesItemWWBlDetailByBillNo(
+ WarehouseQuery query)
+ {
+ if (string.IsNullOrEmpty(query.billNo))
+ throw new Exception("璇烽�夊崟鎹彿锛�");
+
+ // 妫�鏌ヨˉ鏂欏崟鏄惁瀛樺湪涓斾负鐢熶骇琛ユ枡绫诲瀷
+ var mesItemBl = Db.Queryable<MesItemBl>()
+ .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type && a.Bl018 == true)
+ .First();
+
+ if (mesItemBl == null)
+ 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();
+
+ //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 WW_GD D ON B.about_guid = D.ID
+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;
+ }
+
#endregion
}
\ No newline at end of file
--
Gitblit v1.9.3