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/MesItemBlManager.cs | 406 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 233 insertions(+), 173 deletions(-)
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index a89cb7e..9b4729b 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -1,4 +1,5 @@
-锘縰sing NewPdaSqlServer.DB;
+锘縰sing Masuit.Tools;
+using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
@@ -14,12 +15,12 @@
/// 鑾峰彇鐢熶骇琛ユ枡鍗曞彿鍒楄〃
/// </summary>
/// <returns>琛ユ枡鍗曞彿鍒楄〃</returns>
- public List<string> GetSCBLBillNo()
+ public List<string> GetSCBLBillNo(WarehouseQuery query)
{
var list = Db.Queryable<MesItemBl>()
.Where(s => (s.Bl018 ?? false) == true
&& (s.Bl019 ?? false) == false
- && s.Bl008 == "鐢熶骇琛ユ枡")
+ && s.Bl008 == query.Type)
.Select(s => s.BlNo)
.ToList();
return list;
@@ -30,19 +31,20 @@
/// </summary>
/// <param name="billNo">琛ユ枡鍗曞彿</param>
/// <returns>琛ユ枡鍗曟槑缁嗗垪琛�</returns>
- public List<MesItemBlDetail> GetMesItemBlDetailByBillNo(
- WarehouseQuery query)
+ public (string bl001, List<MesItemBlDetail> item)
+ GetMesItemBlDetailByBillNo(
+ WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
// 妫�鏌ヨˉ鏂欏崟鏄惁瀛樺湪涓斾负鐢熶骇琛ユ枡绫诲瀷
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.billNo && a.Bl008 == "鐢熶骇琛ユ枡")
+ .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("鍗曟嵁鍙峰凡瀹屾垚锛�");
@@ -63,10 +65,11 @@
})
.ToList();
- return blDetails;
+ return (mesItemBl.Bl001, blDetails);
}
/// <summary>
+ /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -78,13 +81,12 @@
/// - userName: 鐢ㄦ埛鍚�
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList) SctlScanBarcode(
- WarehouseQuery query)
+ public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
+ ScblScanBarcode(
+ WarehouseQuery query)
{
- #region 鍙傛暟鏍￠獙
-
- if (string.IsNullOrEmpty(query.billNo))
- throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
+ //if (string.IsNullOrEmpty(query.billNo))
+ // throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
if (string.IsNullOrEmpty(query.barcode))
throw new Exception("璇锋壂鎻忔潯鐮侊紒");
@@ -93,9 +95,8 @@
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
if (string.IsNullOrEmpty(query.blNo))
- throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
+ throw new Exception("鐢宠鍗曞彿涓嶈兘涓虹┖锛�");
- #endregion
// 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -113,9 +114,13 @@
if (stockBarcode == null)
throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮�,璇锋牳瀵癸紒{query.barcode}");
+ var depots = Db.Queryable<MesDepots>()
+ .Where(t => t.DepotId == stockBarcode.DepotId)
+ .First();
+
// 妫�鏌ヨˉ鏂欏崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
+ .Where(a => a.BlNo == query.blNo)
.First();
if (mesItemBl == null)
@@ -141,6 +146,16 @@
if (quantity == 0)
throw new Exception("鐗╂枡宸叉壂鐮佸畬鎴愶紝璇锋牳瀵癸紒");
+
+ if(stockBarcode.Quantity > quantity)
+ {
+ query.status = 2;
+ query.message = "鏉＄爜搴撳瓨澶т簬闇�棰嗭紝璇锋媶鍒嗭紒";
+ query.CfNum = quantity;
+ query.Num = stockBarcode.Quantity;
+ return (query, []);
+ }
+
// 妫�鏌ュ伐鍗曚俊鎭�
var womdaa = Db.Queryable<Womdaa>()
.Where(a => a.Daa001 == query.billNo)
@@ -164,29 +179,42 @@
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 PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (false, pendingList);
+
+ query.Num = stockBarcode.Quantity;
+ query.Fum = quantity;
+
+ return (query, pendingList);
}
// 寮�鍚簨鍔″鐞�
var success = UseTransaction(db =>
{
+ var outNoType = "";
+ if(query.Type == "鐢熶骇琛ユ枡")
+ {
+ outNoType = "SCBL(鐢熶骇琛ユ枡)";
+ }else
+ {
+ outNoType = "SCCL(鐢熶骇瓒呴)";
+ }
// 鑾峰彇鎴栧垱寤哄嚭搴撳崟
var outId = Guid.NewGuid();
- var outNo = BillNo.GetBillNo("SCBL");
+ var outNo = BillNo.GetBillNo(outNoType);
var existingOut = 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.ToString("yyyy-MM-dd") ==
DateTime.Now.Date.ToString("yyyy-MM-dd")
&& a.BillTypeId == 200
@@ -214,8 +242,9 @@
BillTypeId = 200,
TransactionNo = 209,
Remark = mesItemBl.Bl007,
- DepotCode = womdab.Dab017,
+ DepotCode = depots.DepotCode,
OutPart = womdaa.Daa013,
+ OutType = query.Type,
FType = 0,
Factory = stockBarcode.Factory,
Company = stockBarcode.Company,
@@ -224,28 +253,27 @@
PbillNo = womdaa.Daa001,
OutDate = DateTime.Now,
Status = 0,
- BbillNo = query.blNo
+ DepotId = stockBarcode.DepotId,
+ THORGID = stockBarcode.StockOrgId,
+ //BbillNo = query.billNo
}).IgnoreColumns(true).ExecuteCommand();
}
// 妫�鏌ュ苟鏇存柊鍑哄簱鍗曠墿鏂欐槑缁�
var itemCount = db.Queryable<MesInvItemOutItems>()
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
+ i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
.Count();
if (itemCount > 0)
- {
// 鏇存柊宸插瓨鍦ㄧ殑鐗╂枡鏄庣粏鏁伴噺
db.Updateable<MesInvItemOutItems>()
.SetColumns(i =>
- i.Quantity == i.Quantity + stockBarcode.Quantity)
+ i.TlQty == i.TlQty + stockBarcode.Quantity)
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
+ i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
.ExecuteCommand();
- }
else
- {
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
db.Insertable(new MesInvItemOutItems
{
@@ -253,13 +281,14 @@
ItemOutId = outId,
ItemNo = blDetail.Bld002,
Quantity = stockBarcode.Quantity,
+ TlQty = stockBarcode.Quantity,
CreateBy = query.userName,
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
LastupdateDate = DateTime.Now,
Factory = stockBarcode.Factory,
Company = stockBarcode.Company,
- DepotCode = womdab.Dab017,
+ DepotCode = depots.DepotCode,
TaskNo = query.blNo,
WorkNo = womdaa.Daa021,
WorkLine = blDetail.Bld013,
@@ -268,10 +297,11 @@
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
+ DepotId = stockBarcode.DepotsId.ToString(),
+ ItemDabid = blDetail.Id,
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
- }
// 鎻掑叆鍑哄簱鍗曟潯鐮佹槑缁�
db.Insertable(new MesInvItemOutCDetails
@@ -287,7 +317,7 @@
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
LastupdateDate = DateTime.Now,
- DepotCode = stockBarcode.DepotsCode,
+ DepotCode = depots.DepotCode,
DepotSectionCode = stockBarcode.DepotSectionsCode,
Remark = blDetail.Bld010,
Factory = stockBarcode.Factory,
@@ -312,7 +342,7 @@
Guid = Guid.NewGuid(),
Status = 1,
BillTypeId = 200, // p_bill_type_id
- TransactionCode = "210", // p_transaction_no
+ TransactionCode = "209", // p_transaction_no
BusinessType = -1,
ItemBarcode = stockBarcode.ItemBarcode,
ItemNo = stockBarcode.ItemNo,
@@ -332,7 +362,7 @@
WorkNo = blDetail.Bld001, // Matches C_QTCK_D.Bld001
WorkLine = blDetail.Bld013, // Matches C_QTCK_D.Bld013
SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -345,7 +375,7 @@
Dab020 = (it.Dab020 ?? 0) + stockBarcode.Quantity,
Dab021 = (it.Dab021 ?? 0) + stockBarcode.Quantity
})
- .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
+ .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
.ExecuteCommand();
// 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
@@ -363,13 +393,11 @@
.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>()
@@ -386,7 +414,6 @@
.First();
if (unfinishedDetail == null)
- {
// 濡傛灉娌℃湁鏈畬鎴愮殑鏄庣粏锛屾洿鏂拌ˉ鏂欏崟鐘舵�佷负宸插畬鎴�
db.Updateable<MesItemBl>()
.SetColumns(it => new MesItemBl
@@ -397,7 +424,6 @@
})
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
return 1;
});
@@ -408,17 +434,18 @@
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 PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (true, finalPendingList);
+ return (query, finalPendingList);
}
/// <summary>
@@ -434,11 +461,9 @@
/// - Num: 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList) SplitBarcode(
+ public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
WarehouseQuery query)
{
- #region 鍙傛暟鏍￠獙
-
if (string.IsNullOrEmpty(query.userName))
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
@@ -448,13 +473,12 @@
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("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
- #endregion
// 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -471,9 +495,19 @@
if (stockBarcode == null)
throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮�,璇锋牳瀵癸紒{query.barcode}");
-
+
var totalQty = stockBarcode.Quantity;
string newBarcode = null;
+
+ var outNoType = "";
+ if (query.Type == "鐢熶骇琛ユ枡")
+ {
+ outNoType = "SCBL(鐢熶骇琛ユ枡)";
+ }
+ else
+ {
+ outNoType = "SCCL(鐢熶骇瓒呴)";
+ }
// 寮�鍚簨鍔″鐞�
var success = UseTransaction(db =>
@@ -487,7 +521,7 @@
.Where(s => s.Id == stockBarcode.ItemId).First();
// 鐢熸垚鏂版潯鐮佸彿
- newBarcode = BillNo.GetBillNo("TMBH(鏉＄爜缂栧彿)", mesItems.ItemNo);
+ newBarcode = BillNo.GetBillNo("TM(鏉＄爜)", mesItems.ItemNo);
// 鍐欏叆鏂版潯鐮�
executeCommand += db.Insertable(new MesInvItemBarcodes
@@ -511,8 +545,8 @@
// Mblnr = stockBarcode.Mblnr,
// Zeile = stockBarcode.Zeile,
// RohInId = stockBarcode.RohInId,
- // BarcodeStatus = 0,
- // OldQty = query.Num,
+ Barcodestatus = false,
+ Oldqty = query.Num as long?,
// Unit = stockBarcode.Unit,
// WeightUnit = stockBarcode.WeightUnit,
Factory = stockBarcode.Factory,
@@ -525,32 +559,39 @@
// MemoBad = stockBarcode.MemoBad,
ComeFlg = 5,
// Memo = stockBarcode.Memo,
+ SuppId = stockBarcode.SuppId,
SuppNo = stockBarcode.SuppNo,
- // InsDate = stockBarcode.InsDate, // Added InsDate
- ItemId = stockBarcode.ItemId,
+ 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)
+ .SetColumns(it => it.Quantity == it.Quantity - query.Num)
.Where(it => it.ItemBarcode == query.barcode)
.ExecuteCommand();
- // 鍒犻櫎鍘熸潯鐮佸簱瀛樿褰�
- executeCommand += db.Deleteable<MesInvItemStocks>()
+ // 鏇存柊鍘熸潯鐮佹暟閲�
+ executeCommand += db.Updateable<MesInvItemStocks>()
+ .SetColumns(it => it.Quantity == it.Quantity - 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,
+ ItemBarcode = newBarcode,
ItemNo = stockBarcode.ItemNo,
LotNo = stockBarcode.LotNo,
- Quantity = totalQty - query.Num,
+ Quantity = query.Num,
EpFlag = stockBarcode.EpFlag,
CustomerNo = stockBarcode.CustomerNo,
ItemWt = stockBarcode.ItemWt,
@@ -567,7 +608,7 @@
WorkNo = stockBarcode.WorkNo,
WorkLine = stockBarcode.WorkLine,
SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// UnitId = stockBarcode.ItemUnit
}).IgnoreColumns(true).ExecuteCommand();
@@ -578,7 +619,7 @@
Status = 1,
BillTypeId = 200, // p_bill_type_id
TransactionCode = "209", // p_transaction_no
- BusinessType = -1,
+ BusinessType = 0,
ItemBarcode = newBarcode,
ItemNo = stockBarcode.ItemNo,
LotNo = stockBarcode.LotNo,
@@ -588,7 +629,7 @@
FromInvDepotSectionsCode = null,
ToInvDepotsCode = stockBarcode.DepotsCode,
ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- Description = null,
+ Description = query.Type + "鎷嗗垎鐢熸垚",
CreateBy = query.userName,
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
@@ -601,7 +642,7 @@
WorkLine = stockBarcode.WorkLine,
SuppNo = stockBarcode.SuppNo,
SuppId = stockBarcode.SuppId,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
}
@@ -610,11 +651,11 @@
throw new Exception("鍙戞枡鏁伴噺澶т簬鏉＄爜鏁�,璇锋牳瀵癸紒");
}
- if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode;
-
+ //if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode;
+
// 妫�鏌ヨˉ鏂欏崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
+ .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == true)
.First();
if (mesItemBl == null)
@@ -652,7 +693,8 @@
throw new Exception($"宸ュ崟 {query.billNo} 涓嶅瓨鍦紝璇风‘璁わ紒");
var womdab = Db.Queryable<Womdab>()
- .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
+ .Where(b =>
+ b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
.First();
if (womdab == null)
@@ -660,18 +702,23 @@
// 妫�鏌ュ凡鍙戞枡鏁伴噺鏄惁瓒呰繃寰呭彂鏂欐暟閲�
var sumQty = db.Queryable<MesInvItemOutCDetails>()
- .Where(it => it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
+ .Where(it =>
+ it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
.Sum(it => it.Quantity);
- if (sumQty > remainingQty)
- {
- throw new Exception($"鎷嗗垎鏁伴噺锛歿sumQty} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
- }
+ //if (sumQty > remainingQty)
+ // throw new Exception(
+ // $"鎷嗗垎鏁伴噺锛歿sumQty} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
+
+
+ var depots = Db.Queryable<MesDepots>()
+ .Where(t => t.DepotId == stockBarcode.DepotId)
+ .First();
// 鑾峰彇鎴栧垱寤哄嚭搴撳崟
var itemOut = 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.ToString("yyyy-MM-dd") ==
DateTime.Now.Date.ToString("yyyy-MM-dd")
&& a.BillTypeId == 200
@@ -679,11 +726,13 @@
&& a.Status == 0)
.First();
+ var outId = new Guid();
+ var outNo = "";
if (itemOut == null)
{
// 鍒涘缓鏂扮殑鍑哄簱鍗�
- var outId = Guid.NewGuid();
- var outNo = BillNo.GetBillNo("SCBL");
+ outId = Guid.NewGuid();
+ outNo = BillNo.GetBillNo(outNoType);
// 鎻掑叆鍑哄簱鍗曚富琛�
executeCommand += db.Insertable(new MesInvItemOuts
@@ -698,7 +747,7 @@
BillTypeId = 200,
TransactionNo = 209,
Remark = mesItemBl.Bl007,
- DepotCode = womdab.Dab017,
+ DepotCode = depots.DepotCode,
OutPart = womdaa.Daa013,
FType = 0,
Factory = stockBarcode.Factory,
@@ -708,33 +757,42 @@
PbillNo = womdaa.Daa001,
OutDate = DateTime.Now,
Status = 0,
- BbillNo = query.blNo
+ DepotId = stockBarcode.DepotId,
+ THORGID = stockBarcode.StockOrgId,
+ OutType = query.Type,
+ //BbillNo = query.blNo
}).IgnoreColumns(true).ExecuteCommand();
+ }
+ else
+ {
+ outId = itemOut.Guid;
+ outNo = itemOut.ItemOutNo;
}
// 妫�鏌ユ槸鍚﹀凡瀛樺湪鍑哄簱鍗曟槑缁�
var itemOutItemCount = db.Queryable<MesInvItemOutItems>()
.Where(it =>
- it.ItemOutId == itemOut.Guid &&
- it.ItemId == stockBarcode.ItemId)
+ it.ItemOutId == outId &&
+ it.ItemId == stockBarcode.ItemId &&
+ it.DepotId == stockBarcode.DepotId.ToString())
.Count();
if (itemOutItemCount == 0)
- {
// 鎻掑叆鏂扮殑鍑哄簱鍗曟槑缁�
executeCommand += db.Insertable(new MesInvItemOutItems
{
Guid = Guid.NewGuid(),
- ItemOutId = itemOut.Guid,
+ ItemOutId = outId,
ItemNo = blDetail.Bld002,
Quantity = query.Num,
+ TlQty = query.Num,
CreateBy = query.userName,
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
LastupdateDate = DateTime.Now,
Factory = stockBarcode.Factory,
Company = stockBarcode.Company,
- DepotCode = womdab.Dab017,
+ DepotCode = depots.DepotCode,
TaskNo = query.blNo,
WorkNo = womdaa.Daa021,
WorkLine = blDetail.Bld013,
@@ -743,26 +801,26 @@
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
+ DepotId = stockBarcode.DepotId.ToString(),
+ ItemDabid = womdab.Guid,
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
// 鏇存柊宸叉湁鍑哄簱鍗曟槑缁嗘暟閲�
executeCommand += db.Updateable<MesInvItemOutItems>()
- .SetColumns(it => it.Quantity == it.Quantity + query.Num)
+ .SetColumns(it => it.TlQty == (it.TlQty ?? 0) + query.Num)
.Where(it =>
- it.ItemOutId == itemOut.Guid &&
- it.ItemId == stockBarcode.ItemId)
+ it.ItemOutId == outId &&
+ it.ItemId == stockBarcode.ItemId &&
+ it.DepotId == stockBarcode.DepotId.ToString())
.ExecuteCommand();
- }
// 鎻掑叆鍑哄簱鏉＄爜鏄庣粏
executeCommand += db.Insertable(new MesInvItemOutCDetails
{
Guid = Guid.NewGuid(),
- ItemOutId = itemOut.Guid,
+ ItemOutId = outId,
ItemBarcode = newBarcode ?? query.barcode,
ItemNo = stockBarcode.ItemNo,
LotNo = stockBarcode.LotNo,
@@ -772,7 +830,7 @@
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
LastupdateDate = DateTime.Now,
- DepotCode = stockBarcode.DepotsCode,
+ DepotCode = depots.DepotCode,
DepotSectionCode = stockBarcode.DepotSectionsCode,
Remark = blDetail.Bld010,
Factory = stockBarcode.Factory,
@@ -786,7 +844,8 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId
+ DepotId = (int)stockBarcode.DepotsId,
+ Dabid = womdab.Guid,
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆涓氬姟娴佹按
@@ -795,7 +854,7 @@
Guid = Guid.NewGuid(),
Status = 1,
BillTypeId = 200, // p_bill_type_id
- TransactionCode = "210", // p_transaction_no
+ TransactionCode = "209", // p_transaction_no
BusinessType = 1,
ItemBarcode = newBarcode ?? query.barcode,
ItemNo = stockBarcode.ItemNo,
@@ -804,7 +863,7 @@
Quantity = query.Num,
FromInvDepotsCode = stockBarcode.DepotsCode,
FromInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- Description = null,
+ Description = query.Type,
CreateBy = query.userName,
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
@@ -816,7 +875,7 @@
WorkNo = blDetail.Bld001,
WorkLine = blDetail.Bld013,
SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -828,8 +887,7 @@
Dab020 = (it.Dab020 ?? 0) + query.Num, // 宸插彂鏂欐暟閲�
Dab021 = (it.Dab021 ?? 0) + query.Num // 宸插彂鏂欐暟閲�
})
- .Where(it => it.Id == womdab.Id && it.Dab003 == womdab.Dab003)
- .IgnoreColumns(true)
+ .Where(it => it.Guid == womdab.DaaGuid && it.Dab003 == womdab.Dab003)
.ExecuteCommand();
// 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
@@ -848,13 +906,11 @@
.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();
- }
// 妫�鏌ユ槸鍚﹁繕鏈夋湭瀹屾垚鐨勬槑缁�
@@ -863,7 +919,6 @@
.First();
if (unfinishedDetail == null)
- {
// 濡傛灉娌℃湁鎵惧埌鏈畬鎴愭槑缁嗭紝鍒欐洿鏂拌ˉ鏂欏崟鐘舵�佷负宸插畬鎴�
executeCommand += db.Updateable<MesItemBl>()
.SetColumns(it => new MesItemBl
@@ -874,9 +929,15 @@
})
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
-
+
if (executeCommand <= 1) throw new Exception("鏇存柊澶辫触");
+
+
+ // 鍒涘缓 鎻掑叆鏃ュ織
+ var logService = new LogService();
+ var LogMsg = "[PDA]" + query.Type + "銆傛潯鐮併��" + query.barcode + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
+ logService.CreateLog(db, query.userName, womdaa.Guid.ToString(), "WOMDAA", LogMsg, womdaa.Daa001);
+
return executeCommand;
}) > 0;
@@ -886,13 +947,14 @@
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 PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
@@ -903,12 +965,12 @@
#region 鐢熶骇瓒呴
- public List<string> GetSccList()
+ public List<string> GetSccList(WarehouseQuery query)
{
var list = Db.Queryable<MesItemBl>()
.Where(s => (s.Bl018 ?? false) == true
&& (s.Bl019 ?? false) == false
- && s.Bl008 == "鐢熶骇瓒呴")
+ && s.Bl008 == query.Type)
.Select(s => s.BlNo)
.ToList();
return list;
@@ -919,15 +981,16 @@
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>鐢熶骇瓒呴鍗曟槑缁嗗垪琛�</returns>
- public List<MesItemBlDetail> GetMesItemBlDetailBySccBillNo(
- WarehouseQuery query)
+ public (string bl001, List<MesItemBlDetail> item)
+ GetMesItemBlDetailBySccBillNo(
+ WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
- // 妫�鏌ヨ秴棰嗗崟鏄惁瀛樺湪涓斾负鐢熶骇瓒呴绫诲瀷
+ // 妫�鏌ヨ秴棰嗗崟鏄惁瀛樺湪涓斾负鐢熶骇瓒呴/濮斿瓒呴绫诲瀷
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.billNo && a.Bl008 == "鐢熶骇瓒呴")
+ .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
.First();
if (mesItemBl == null)
@@ -967,7 +1030,7 @@
})
.ToList();
- return pendingDetails;
+ return (mesItemBl.Bl001, pendingDetails);
}
/// <summary>
@@ -982,7 +1045,7 @@
/// - userName: 鐢ㄦ埛鍚�(蹇呭～)
/// - blNo: 瓒呴鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList)
+ public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
ScanBarcodeForOverPicking(
WarehouseQuery query)
{
@@ -1020,7 +1083,7 @@
// 妫�鏌ヨ秴棰嗗崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && a.Bl008 == "鐢熶骇瓒呴")
+ .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
.First();
if (mesItemBl == null)
@@ -1086,28 +1149,32 @@
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 PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (false, pendingList);
+ query.Num = stockBarcode.Quantity;
+ query.Fum = quantity;
+
+ return (query, pendingList);
}
// 鎵ц鏁版嵁搴撲簨鍔�
UseTransaction(db =>
{
// 鐢熸垚鎴栬幏鍙栧嚭搴撳崟
- Guid outId = Guid.Empty;
+ 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
@@ -1117,7 +1184,7 @@
if (outRecord == null)
{
outId = Guid.NewGuid();
- outNo = BillNo.GetBillNo("SCBL"); // 闇�瑕佸疄鐜扮敓鎴愬崟鍙风殑鏂规硶
+ outNo = BillNo.GetBillNo("BL(宸ュ崟琛ユ枡)"); // 闇�瑕佸疄鐜扮敓鎴愬崟鍙风殑鏂规硶
// 鎻掑叆鍑哄簱鍗曚富琛�
db.Insertable(new MesInvItemOuts
@@ -1136,7 +1203,7 @@
OutPart = womdaa.Daa013,
FType = 0,
WorkNo = womdaa.Daa021,
- OutType = "鐢熶骇瓒呴鍗�",
+ OutType = query.Type,
BoardItem = womdaa.Daa002,
PbillNo = womdaa.Daa001,
OutDate = DateTime.Now,
@@ -1157,7 +1224,6 @@
.First();
if (outItem == null)
- {
// 鎻掑叆鍑哄簱鍗曟槑缁�
db.Insertable(new MesInvItemOutItems
{
@@ -1178,12 +1244,11 @@
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
+ DepotId = stockBarcode.DepotId.ToString(),
// Unit = blDetail.Bld009,
// DepotId = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
// 鏇存柊鍑哄簱鍗曟槑缁嗘暟閲�
db.Updateable<MesInvItemOutItems>()
.SetColumns(it => new MesInvItemOutItems
@@ -1194,7 +1259,6 @@
it.ItemOutId == outId &&
it.ItemId == stockBarcode.ItemId)
.ExecuteCommand();
- }
// 鎻掑叆鍑哄簱鏉＄爜鏄庣粏
db.Insertable(new MesInvItemOutCDetails
@@ -1219,7 +1283,8 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId
+ DepotId = (int)stockBarcode.DepotsId,
+ Dabid = womdab.Guid,
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆涓氬姟娴佹按
@@ -1247,7 +1312,7 @@
WorkLine = blDetail.Bld013,
SuppNo = stockBarcode.SuppNo,
SuppId = stockBarcode.SuppId,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -1258,7 +1323,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();
// 鏇存柊瓒呴鍗曟槑缁�
@@ -1287,12 +1352,10 @@
// 濡傛灉鎵�鏈夋槑缁嗗畬鎴�,鏇存柊瓒呴鍗曠姸鎬佷负宸插畬鎴�
if (!hasUnfinished)
- {
db.Updateable<MesItemBl>()
.SetColumns(it => it.Bl019 == true)
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
return 1;
});
@@ -1303,25 +1366,26 @@
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 PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (true, finalPendingList);
+ return (query, finalPendingList);
}
/// <summary>
- /// 鐢熶骇瓒呴鎵撳嵃鏉＄爜
+ /// 鐢熶骇瓒呴鎵撳嵃鏉＄爜
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉</returns>
- public (bool success, List<PendingMaterialDto> pendingList)
+ public (bool success, List<MesItemBlDetail> pendingList)
PrintBarcodeForOverPicking(WarehouseQuery query)
{
UseTransaction(db =>
@@ -1526,7 +1590,7 @@
itemOut = new MesInvItemOuts
{
Guid = Guid.NewGuid(),
- ItemOutNo = BillNo.GetBillNo("SCBL"), // 闇�瑕佸疄鐜扮敓鎴愬崟鍙风殑鏂规硶
+ ItemOutNo = BillNo.GetBillNo("BL(宸ュ崟琛ユ枡)"), // 闇�瑕佸疄鐜扮敓鎴愬崟鍙风殑鏂规硶
TaskNo = query.blNo,
CreateBy = query.userName,
CreateDate = DateTime.Now,
@@ -1560,7 +1624,6 @@
.Count();
if (itemOutItemCount == 0)
- {
// 鎻掑叆鏂扮殑鍑哄簱鍗曟槑缁�
db.Insertable(new MesInvItemOutItems
{
@@ -1582,13 +1645,11 @@
ErpId = workOrderDetail.Eid,
ErpAutoid = workOrderDetail.Erpid,
PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
+ ItemId = blDetail.Bld012
// Unit = blDetail.Bld009,
// DepotId = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
// 鏇存柊宸叉湁鍑哄簱鍗曟槑缁嗘暟閲�
db.Updateable<MesInvItemOutItems>()
.SetColumns(it => it.Quantity == it.Quantity + query.Num)
@@ -1596,7 +1657,6 @@
it.ItemOutId == itemOut.Guid &&
it.ItemId == stockBarcode.ItemId)
.ExecuteCommand();
- }
// 鎻掑叆鍑哄簱鏄庣粏璁板綍
db.Insertable(new MesInvItemOutCDetails
@@ -1667,7 +1727,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();
// 鏇存柊琛ユ枡鍗曟槑缁嗗凡琛ユ暟閲�
@@ -1685,13 +1745,11 @@
.First();
if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
- {
// 鏇存柊鏄庣粏瀹屾垚鐘舵��
db.Updateable<MesItemBlDetail>()
.SetColumns(it => it.Bld011 == 1)
.Where(it => it.Id == blDetail1.Id)
.ExecuteCommand();
- }
// 妫�鏌ユ槸鍚︽墍鏈夋槑缁嗛兘宸插畬鎴�
var hasUnfinished = db.Queryable<MesItemBlDetail>()
@@ -1700,29 +1758,31 @@
// 濡傛灉鎵�鏈夋槑缁嗗畬鎴�,鏇存柊琛ユ枡鍗曠姸鎬佷负宸插畬鎴�
if (!hasUnfinished)
- {
db.Updateable<MesItemBl>()
.SetColumns(it => it.Bl019 == true)
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
return 1;
});
// 鑾峰彇鏈�缁堢殑寰呭鐞嗗垪琛�
+ // 鑾峰彇琛ユ枡鍗曟槑缁嗕腑鏈畬鎴愮殑璁板綍
+ // 閫氳繃宸﹁繛鎺ユ煡璇㈣ˉ鏂欏崟(MesItemBl)鍜岃ˉ鏂欏崟鏄庣粏(MesItemBlDetail)琛�
+ // 鏉′欢: 1.琛ユ枡鍗曞彿鍖归厤 2.璁″垝鏁伴噺(Bld007)鍑忓幓宸茶ˉ鏁伴噺(Bld008)澶т簬0(鍗虫湭瀹屾垚鐨�)
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 PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012, // 鐗╂枡ID
+ Bld002 = b.Bld002, // 鐗╂枡缂栧彿
+ Bld003 = b.Bld003, // 鐗╂枡鍚嶇О
+ Bld004 = b.Bld004, // 鐗╂枡瑙勬牸
+ Bld007 = b.Bld007, // 璁″垝鏁伴噺
+ Bld008 = b.Bld008 // 宸茶ˉ鏁伴噺
})
.ToList();
--
Gitblit v1.9.3