From 2075957d9c0c87e66b0392fdc0a2d5b9290dfee5 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 14 二月 2025 08:22:54 +0800
Subject: [PATCH] 1.成品入库后台完成 2.报工后台优化
---
service/Warehouse/MesItemBlManager.cs | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index ff3728d..a80a2a2 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -68,6 +68,7 @@
}
/// <summary>
+ /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -80,7 +81,7 @@
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
- SctlScanBarcode(
+ ScblScanBarcode(
WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
@@ -93,7 +94,7 @@
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
if (string.IsNullOrEmpty(query.blNo))
- throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
+ throw new Exception("鐢宠鍗曞彿涓嶈兘涓虹┖锛�");
// 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
@@ -114,7 +115,7 @@
// 妫�鏌ヨˉ鏂欏崟鐘舵��
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)
@@ -184,9 +185,17 @@
// 寮�鍚簨鍔″鐞�
var success = UseTransaction(db =>
{
+ var outNoType = "";
+ if(query.Type == "鐢熶骇琛ユ枡")
+ {
+ outNoType = "BL(宸ュ崟琛ユ枡)";
+ }else
+ {
+ outNoType = "CL(宸ュ崟瓒呴)";
+ }
// 鑾峰彇鎴栧垱寤哄嚭搴撳崟
var outId = Guid.NewGuid();
- var outNo = BillNo.GetBillNo("BL(宸ュ崟琛ユ枡)");
+ var outNo = BillNo.GetBillNo(outNoType);
var existingOut = db.Queryable<MesInvItemOuts>()
.Where(a => a.BbillNo == query.blNo
@@ -220,6 +229,7 @@
Remark = mesItemBl.Bl007,
DepotCode = womdab.Dab017,
OutPart = womdaa.Daa013,
+ OutType = query.Type,
FType = 0,
Factory = stockBarcode.Factory,
Company = stockBarcode.Company,
@@ -228,23 +238,23 @@
PbillNo = womdaa.Daa001,
OutDate = DateTime.Now,
Status = 0,
- BbillNo = query.blNo
+ 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
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
@@ -254,6 +264,7 @@
ItemOutId = outId,
ItemNo = blDetail.Bld002,
Quantity = stockBarcode.Quantity,
+ TlQty = stockBarcode.Quantity,
CreateBy = query.userName,
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
@@ -268,7 +279,8 @@
ErpId = womdab.Eid,
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
- ItemId = blDetail.Bld012
+ ItemId = blDetail.Bld012,
+ DepotId = stockBarcode.DepotsId.ToString(),
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
--
Gitblit v1.9.3