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

重写模具保养

Browse Source
This commit is contained in:
周科达
2024-08-01 10:11:23 +08:00
parent 5df23e01ee
commit f6da16904d
23 changed files with 1532 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,22 +131,22 @@ namespace Tnb.WarehouseMgr
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
.Select((x,y)=>y)
.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);
List<string> ids = new List<string>();
ids.Add(_userManager.UserId);
ids.Add(WmsWareHouseConst.AdministratorOrgId);
ids.Add(purchase.warehouse_id);
ids.AddRange(materialIds);
ids.Add(purchase.supplier_id);
ids.Add(wmsPurchaseOrderH.supplier_id);
ids.AddRange(unitDatas.Select(x=>x.Id).ToList());
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.user_id ?? "";
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
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);
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
@@ -165,6 +165,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("pk_org_v",erpOrg.pk_org_v);
erpRequestData.Add("pk_group",erpOrg.pk_group);
erpRequestData.Add("pk_pupsndoc","");
erpRequestData.Add("csourceid", wmsPurchaseOrderH?.erp_pk ?? "");
erpRequestData.Add("pk_purchaseorg",erpOrg.pk_org);
erpRequestData.Add("pk_purchaseorg_v",erpOrg.pk_org_v);
erpRequestData.Add("pk_supplier",erpExtendFields.Find(x=>x.table_id==purchase.supplier_id)?.supplier_id ?? "");//先写死
@@ -183,7 +184,7 @@ namespace Tnb.WarehouseMgr
["cfirstid"] = wmsPurchaseOrderDs.erp_line_pk,
["cfirsttypecode"] = "",
["crececountryid"] = "0001Z010000000079UJJ",
["crowno"] = (dList.FindIndex(x=>x.id==item.id)+1) * 10,
["crowno"] = wmsPurchaseOrderDs.lineno,
["csendcountryid"] = "0001Z010000000079UJJ",
["csourcetypecode"] = "",
["ctaxcountryid"] = "0001Z010000000079UJJ",
@@ -202,7 +203,7 @@ namespace Tnb.WarehouseMgr
["pk_apfinanceorg_v"] = erpOrg.pk_org_v,
["pk_arriveorder"] = null,
["pk_arriveorder_b"] = null,
["pk_group"] = "",
["pk_group"] = erpOrg.pk_group,
["csourcebid"] = wmsPurchaseOrderDs.erp_line_pk,
["csourceid"] = wmsPurchaseOrderH?.erp_pk ?? "",
["pk_material"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "",