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-26 17:55:01 +08:00
parent c61cd04ae7 1988c620c7
commit 0e09a8187c
5 changed files with 169 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,9 +141,9 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("billmaker",erpCreateId);
erpRequestData.Add("creationtime",nowStr);
erpRequestData.Add("creator",erpCreateId);
erpRequestData.Add("dbilldate",purchase.delivery_date.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dbilldate",purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dmakedate",nowStr);
//erpRequestData.Add("ntotalastnum",purchaseDs.Sum(x=>x.purchase_arriveqty));
erpRequestData.Add("ntotalastnum",purchaseDs.Sum(x=>x.purchase_arriveqty));
erpRequestData.Add("pk_arriveorder","");
// erpRequestData.Add("pk_dept","1001A1100000000JRLI1");
// erpRequestData.Add("pk_dept_v","0001A11000000007GGO8");
@@ -174,21 +174,23 @@ namespace Tnb.WarehouseMgr
["csourcetypecode"] = "",
["ctaxcountryid"] = "0001Z010000000079UJJ",
["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["dbilldate"] = "",
["dplanreceivedate"] = "",
["dproducedate"] = "",
["dbilldate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["dplanreceivedate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["dproducedate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["fbuysellflag"] = 1,
["fproductclass"] = 1,
["naccumchecknum"] = 0,
["nastnum"] = item.purchase_arriveqty,
["nnum"] = null,
// ["nastnum"] = item.purchase_arriveqty,
["nnum"] = item.purchase_arriveqty,
// ["nplanastnum"] = 0,
// ["nplannum"] = item.purchase_qty,
["nplannum"] = item.purchase_qty,
["apfinanceorg"] = erpOrg.pk_org,
["pk_apfinanceorg_v"] = erpOrg.pk_org_v,
["pk_arriveorder"] = "",
["pk_arriveorder_b"] = "",
["pk_group"] = "",
["csourcebid"] = wmsPurchaseOrderDs.erp_line_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,