From 62750a4a726896b803fa0f7b1862c19f7bd04f4c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 10 二月 2025 14:37:23 +0800
Subject: [PATCH] 1.生产补料初步完成（拆分补料还未完成） 2.出库物料明细实体类调整
---
entity/MesInvItemOutItems.cs | 4 ++--
service/Warehouse/MesItemBlManager.cs | 10 ++++++----
entity/MesItemBlDetail.cs | 6 +++---
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/entity/MesInvItemOutItems.cs b/entity/MesInvItemOutItems.cs
index 51c374e..831d24c 100644
--- a/entity/MesInvItemOutItems.cs
+++ b/entity/MesInvItemOutItems.cs
@@ -203,13 +203,13 @@
/// 宸插叆搴撴暟
/// </summary>
[SugarColumn(ColumnName = "rk_qty")]
- public int? RkQty { get; set; }
+ public decimal? RkQty { get; set; }
/// <summary>
/// 宸叉壂鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "tl_qty")]
- public int? TlQty { get; set; }
+ public decimal? TlQty { get; set; }
/// <summary>
/// 鐗╂枡ID
diff --git a/entity/MesItemBlDetail.cs b/entity/MesItemBlDetail.cs
index 3a5f95d..6663589 100644
--- a/entity/MesItemBlDetail.cs
+++ b/entity/MesItemBlDetail.cs
@@ -53,20 +53,20 @@
/// 璁″垝鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "bld006")]
- public int? Bld006 { get; set; }
+ public decimal? Bld006 { get; set; }
/// <summary>
/// 鐢宠鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "bld007")]
- public int? Bld007 { get; set; }
+ public decimal? Bld007 { get; set; }
/// <summary>
/// 宸查鏁伴噺
/// 榛樿鍊�: ((0))
/// </summary>
[SugarColumn(ColumnName = "bld008")]
- public int? Bld008 { get; set; }
+ public decimal? Bld008 { get; set; }
/// <summary>
/// 鍗曚綅
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index b8f5a7a..0349e88 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -221,6 +221,7 @@
Remark = mesItemBl.Bl007,
DepotCode = womdab.Dab017,
OutPart = womdaa.Daa013,
+ OutType = "鐢熶骇琛ユ枡",
FType = 0,
Factory = stockBarcode.Factory,
Company = stockBarcode.Company,
@@ -229,23 +230,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)
.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)
.ExecuteCommand();
else
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
@@ -255,6 +256,7 @@
ItemOutId = outId,
ItemNo = blDetail.Bld002,
Quantity = stockBarcode.Quantity,
+ TlQty = stockBarcode.Quantity,
CreateBy = query.userName,
CreateDate = DateTime.Now,
LastupdateBy = query.userName,
--
Gitblit v1.9.3