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-08-20 14:51:47 +08:00
parent 6bac8c73b7 206547e61d
commit cac75ad03f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs
View File

@@ -138,4 +138,11 @@ public partial class WmsPurchaseD : BaseEntity<string>
/// erp仓库类型
/// </summary>
public string erp_wh_type { get; set; }
//public string lineno { get; set; }
public string erp_purchase_order_d_pk { get; set; }
public string erp_purchase_order_d_lineno { get; set; }
}

10
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
View File

@@ -145,7 +145,7 @@ namespace Tnb.WarehouseMgr
.ToListAsync();
WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable<WmsPurchaseOrderH>().SingleAsync(x=>x.id==purchase.erp_bill_code);
//todo 先取采购订单第一条
WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable<WmsPurchaseOrderD>().FirstAsync(x=>x.fk_wms_purchase_order_id==purchase.erp_bill_code);
//WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable<WmsPurchaseOrderD>().FirstAsync(x=>x.fk_wms_purchase_order_id==purchase.erp_bill_code);
List<string> ids = new List<string>();
ids.Add(_userManager.UserId);
@@ -193,10 +193,10 @@ namespace Tnb.WarehouseMgr
{
["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cfirstbid"] = wmsPurchaseOrderH?.erp_pk ?? "",
["cfirstid"] = wmsPurchaseOrderDs.erp_line_pk,
["cfirstid"] = item.erp_purchase_order_d_pk,
["cfirsttypecode"] = "",
["crececountryid"] = "0001Z010000000079UJJ",
["crowno"] = wmsPurchaseOrderDs.lineno,
["crowno"] = item.erp_purchase_order_d_lineno,
["csendcountryid"] = "0001Z010000000079UJJ",
["csourcetypecode"] = "",
["ctaxcountryid"] = "0001Z010000000079UJJ",
@@ -216,11 +216,11 @@ namespace Tnb.WarehouseMgr
["pk_arriveorder"] = null,
["pk_arriveorder_b"] = null,
["pk_group"] = erpOrg.pk_group,
["csourcebid"] = wmsPurchaseOrderDs.erp_line_pk,
["csourcebid"] = item.erp_purchase_order_d_pk,
["csourceid"] = wmsPurchaseOrderH?.erp_pk ?? "",
["pk_material"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "",
["pk_order"] = wmsPurchaseOrderH?.erp_pk ?? "",
["pk_order_b"] = wmsPurchaseOrderDs.erp_line_pk,
["pk_order_b"] = item.erp_purchase_order_d_pk,
["pk_org"] = erpOrg.pk_org,
["pk_org_v"] = erpOrg.pk_org_v,
["pk_psfinanceorg"] = erpOrg.pk_org_v,