wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-07-18 10:29:11 +08:00
parent 019651b023 d8a9562ffa
commit 1374ba7a56
10 changed files with 185 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -27,10 +27,6 @@
/// </summary>
public const string WAREHOUSE_ZCC_ID = "33780009364245";
/// <summary>
/// 四楼待灭菌仓
/// </summary>
public const string WAREHOUSE_SLDMJC_ID = "35412479754517";
/// <summary>
/// 四楼解析库
/// </summary>
public const string WAREHOUSE_JXK_ID = "26103367464997";

4
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -2427,8 +2427,8 @@ namespace Tnb.WarehouseMgr
["cbodytranstypecode"] = "4A-01",
["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "",
["cgeneralbid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "",
["cgeneralbid"] = item.erp_line_pk ?? "",
["cgeneralhid"] = wmsMaterialTransfer.erp_pk ?? "",
["cgeneralbid"] = item.erp_line_pk,
["cgeneralhid"] = wmsMaterialTransfer.erp_pk,
["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "",
["cmaterialvid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialvid ?? "",
["corpoid"] = erpOrg.corpoid,

4
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -866,8 +866,8 @@ namespace Tnb.WarehouseMgr
["corpoid"] = erpOrg.corpoid,
["corpvid"] = erpOrg.corpvid,
["crowno"] = (dList.FindIndex(x=>x.id==wmsMaterialTransferd.id)+1) * 10,
["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk ?? "",
["csourcebillhid"] = wmsMaterialTransfer.erp_pk ?? "",
["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk,
["csourcebillhid"] = wmsMaterialTransfer.erp_pk,
["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "",
["cvendorid"] = "",
["cvendorvid"] = "",