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/MesItemQtrkManager.cs | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/service/Warehouse/MesItemQtrkManager.cs b/service/Warehouse/MesItemQtrkManager.cs
index 2d13b92..8c75e6d 100644
--- a/service/Warehouse/MesItemQtrkManager.cs
+++ b/service/Warehouse/MesItemQtrkManager.cs
@@ -170,11 +170,14 @@
// 鏌ヨ鏄惁瀛樺湪鏈叆搴撶殑鍏ュ簱鍗�
var existingInv = db.Queryable<MesInvItemIns>()
.Where(x => x.Status == 0
+ && x.InsDate.Value.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")
&& x.TransctionNo == transactionNo.ToString()
- && x.CbillNo == p_bill_no
- && x.SuppNo == barcode.SuppNo
+ && x.TaskNo == p_bill_no
+ //&& x.CbillNo == p_bill_no
+ && x.BillTypeId == billTypeId
+ && x.DepotsId == Convert.ToInt64(c_depot_id))
// && x.DepotsCode == c_depot_code)
- && x.DepotsId == c_depot_id)
+ //&& x.SuppNo == barcode.SuppNo)
.First();
var newId = Guid.Empty;
@@ -183,7 +186,7 @@
if (existingInv == null)
{
newId = Guid.NewGuid();
- billNo = BillNo.GetBillNo("INV_IN_OTHER");
+ billNo = BillNo.GetBillNo("QTRK(鍏朵粬鍏ュ簱鍗�)");
barcode.UrgentFlag ??= false;
@@ -204,7 +207,11 @@
CbillNo = p_bill_no,
Fstatus = 0,
Status = 0,
- Reason = qtrk.Qt010
+ Reason = qtrk.Qt010,
+ TaskNo = p_bill_no,
+ DepotsId = Convert.ToInt64(c_depot_id) ,
+ InType = "鍏朵粬鍏ュ簱"
+
}).IgnoreColumns(true).ExecuteCommand();
}
else
@@ -217,8 +224,9 @@
var existingItem = db.Queryable<MesInvItemInCItems>()
.Where(x => x.ItemInId == newId
&& x.ItemId == barcode.ItemId
- && x.WorkNo == barcode.WorkNo
- && x.WorkLine == barcode.WorkLine)
+ && x.DepotId == c_depot_id.ToString()
+ )
+ //&& x.DepotCode =
.First();
if (existingItem == null)
@@ -246,7 +254,8 @@
Remark = barcode.Memo,
EbelnK3id = barcode.EbelnK3id,
LineK3id = barcode.LineK3id,
- ItemId = barcode.ItemId
+ ItemId = barcode.ItemId,
+ DepotId = c_depot_id.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
// 瀛樺湪鍒欐洿鏂版暟閲�
@@ -274,7 +283,7 @@
LotNo = barcode.LotNo,
SuppId = barcode.SuppId,
SuppNo = barcode.SuppNo,
- DepotId = c_depot_id,
+ DepotId = Convert.ToInt64(c_depot_id),
DepotCode = c_depot_code,
DepotSectionCode = p_section_code,
ItemSname = barcode.ItemSname,
@@ -377,7 +386,8 @@
// 鏇存柊鐢宠鍗曟槑缁嗗凡鍏ュ簱鏁伴噺
res += db.Updateable<MesItemQtrrDetail>()
.SetColumns(x => x.Qd008 == (x.Qd008 ?? 0) + barcode.Quantity)
- .Where(x => x.Guid == barcode.Guid)
+ .Where(x => x.QtrkGuid == qtrk.Guid &&
+ x.ItemId == barcode.ItemId.ToString())
.ExecuteCommand();
// 妫�鏌ユ槸鍚﹀畬鍏ㄥ叆搴撳苟鏇存柊鐘舵��
--
Gitblit v1.9.3