From a400c2a3d27ff60864a69cbd60f2034baf46a7ee Mon Sep 17 00:00:00 2001
From: hlb <894797954@qq.com>
Date: Mon, 27 Nov 2023 14:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=84=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E5=92=8C=E7=AE=B1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Consts/WmsWareHouseConst.cs | 4 ++++
.../Entity/WmsHandleCode.cs | 8 ++++++++
WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs | 10 ++++++++--
.../Tnb.WarehouseMgr/WmsPDAInStockService.cs | 4 ++++
.../Tnb.WarehouseMgr/WmsPDAScanInStockService.cs | 12 +++++++++---
5 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
index 825c64f7..07c1ed9b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -10,6 +10,10 @@
/// 中储仓ID
///
public const string WAREHOUSE_ZC_ID = "2";
+ ///
+ /// 成品仓库ID
+ ///
+ public const string WAREHOUSE_CP_ID = "26103372441637";
///
/// 出入库单据状态TypeID
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs
index 591b7576..6a66c097 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsHandleCode.cs
@@ -94,4 +94,12 @@ public partial class WmsHandleCode : BaseEntity
///
public DateTime? modify_time { get; set; }
+ ///
+ /// 规格型号
+ ///
+ public string? material_specification { get; set; }
+ ///
+ /// 箱号
+ ///
+ public string? container_no { get; set; }
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
index 6e52bfdb..a9a17487 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
@@ -177,6 +177,8 @@ namespace Tnb.WarehouseMgr
material_code = detail.material_code,
barcode = code,
code_batch = detail.code_batch,
+ material_specification= detail.material_specification,
+ container_no =detail.container_no,
codeqty = detail.pr_qty!.Value,
unit_id = detail.unit_id,
is_lock = 0,
@@ -335,12 +337,14 @@ namespace Tnb.WarehouseMgr
instockcode.id = SnowflakeIdHelper.NextId();
string materialCode = instockcode.material_code;
string? codeBatch = instockcode.code_batch;
- WmsInstockCode? b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch);
+ string? materialSpecification = instockcode.material_specification;
+ string? containerNo = instockcode.container_no;
+ WmsInstockCode? b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch && x.material_specification == materialSpecification && x.container_no == containerNo);
if (b != null)
{
WmsInstockCode c = DeepCopyHelper.DeepCopy(b);
c.id = SnowflakeIdHelper.NextId();
- c.bill_d_id = instockds?.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id ?? "";
+ c.bill_d_id = instockds?.Find(x => x.material_code == materialCode && x.code_batch == codeBatch && x.material_specification == materialSpecification && x.container_no == containerNo)?.id ?? "";
c.barcode = instockcode.barcode;
c.codeqty = instockcode.codeqty;
c.is_end = 0;// 未结束
@@ -411,6 +415,8 @@ namespace Tnb.WarehouseMgr
ptc.codeqty = jo.codeqty;
ptc.unit_id = jo.unit_id!;
ptc.code_batch = jo.code_batch;
+ ptc.material_specification = jo.material_specification;
+ ptc.container_no = jo.container_no;
pretaskCodes.Add(ptc);
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
index 1ba5f236..cc9bd7a3 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
@@ -160,6 +160,8 @@ namespace Tnb.WarehouseMgr
ptc.codeqty = jo.Value(nameof(WmsPretaskCode.codeqty));
ptc.unit_id = jo.Value(nameof(WmsPretaskCode.unit_id))!;
ptc.code_batch = jo.Value(nameof(WmsPretaskCode.code_batch));
+ ptc.material_specification = jo.Value(nameof(WmsPretaskCode.material_specification))!;
+ ptc.container_no = jo.Value(nameof(WmsPretaskCode.container_no));
pretaskCodes.Add(ptc);
}
}
@@ -208,6 +210,8 @@ namespace Tnb.WarehouseMgr
material_code = jo.Value(nameof(WmsHandleCode.material_code))!,
barcode = jo.Value(nameof(WmsHandleCode.barcode))!,
code_batch = jo.Value(nameof(WmsHandleCode.code_batch)),
+ material_specification = jo.Value(nameof(WmsPretaskCode.material_specification))!,
+ container_no = jo.Value(nameof(WmsPretaskCode.container_no)),
codeqty = jo.Value(nameof(WmsHandleCode.codeqty)),
unit_id = _db.Queryable().Single(it => it.id == materialId).unit_id,
create_id = _userManager.UserId,
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
index 86b3c6ac..5ace7920 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
@@ -105,7 +105,7 @@ namespace Tnb.WarehouseMgr
bill_type = WmsWareHouseConst.BILLTYPE_MATERIALINSTOCK_ID,
biz_type = WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID,
bill_date = DateTime.Today,
- warehouse_id = whId?.ToString() ?? "26103372441637",
+ warehouse_id = whId?.ToString() ?? WmsWareHouseConst.WAREHOUSE_CP_ID,
status = WmsWareHouseConst.BILLSTATUS_ADD_ID,
generate_type = "0",
sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC,
@@ -130,7 +130,9 @@ namespace Tnb.WarehouseMgr
pr_qty = item.codeqty,
qty = 0,
code_batch = item.code_batch,
- warehouse_id = "26103372441637",
+ material_specification = item.material_specification,
+ container_no = item.container_no,
+ warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID,
print_qty = item.codeqty,
scan_qty = item.codeqty,
print_id = "",
@@ -163,6 +165,8 @@ namespace Tnb.WarehouseMgr
unit_id = mat.unit_id,
barcode = carryCode,
code_batch = item.code_batch,
+ material_specification = item.material_specification,
+ container_no = item.container_no,
codeqty = item.codeqty,
is_lock = 0,
is_end = 0,
@@ -179,7 +183,7 @@ namespace Tnb.WarehouseMgr
}
- InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = "26103372441637", Size = 1 };
+ InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID, Size = 1 };
List endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
WmsPointH sPoint = new();
WmsPointH ePoint = new();
@@ -250,6 +254,8 @@ namespace Tnb.WarehouseMgr
ptc.material_code = instockCode.material_code;
ptc.barcode = instockCode.barcode;
ptc.codeqty = instockCode.codeqty;
+ ptc.material_specification = instockCode.material_specification;
+ ptc.container_no = instockCode.container_no;
ptc.unit_id = instockCode.unit_id;
ptc.code_batch = instockCode.code_batch;
pretaskCodes.Add(ptc);