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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2024-10-25 17:41:04 +08:00
parent 611900639c 7335b7aa27
commit 9fd13a55fc
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceDService.cs
View File

@@ -250,9 +250,9 @@ namespace Tnb.WarehouseMgr
#region
erpRequestData.Add("billmaker", erpCreateId);//制单人
erpRequestData.Add("cbizid", erpOrg?.person_id ?? null);//业务员
erpRequestData.Add("cbiztype", wmsOutsourceH?.transaction_type ?? null);//业务流程
erpRequestData.Add("cdptid", erpOrg?.cdptid ?? null);//部门id
erpRequestData.Add("cdptvid", erpOrg?.cdptvid ?? null);//部门vid
erpRequestData.Add("cbiztype", null);//业务流程
erpRequestData.Add("cdptid", erpOrg != null ? (string.IsNullOrEmpty(erpOrg.cdptid) ? null : erpOrg.cdptid) : null);//部门id
erpRequestData.Add("cdptvid", erpOrg != null ? (string.IsNullOrEmpty(erpOrg.cdptvid) ? null : erpOrg.cdptvid) : null);//部门vid
erpRequestData.Add("corpoid", erpOrg?.corpoid ?? null);//公司id
erpRequestData.Add("corpvid", erpOrg?.corpvid ?? null);//公司vid
erpRequestData.Add("creationtime", nowStr);//创建时间
@@ -351,7 +351,7 @@ namespace Tnb.WarehouseMgr
{
throw Oops.Bah("没有请求数据");
}
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();

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

@@ -290,6 +290,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("creator",erpCreateId);
erpRequestData.Add("dbilldate",purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dmakedate",nowStr);
erpRequestData.Add("ctrantypeid", "0001H11000000000D2ZU");//到货交易类型主键
erpRequestData.Add("ntotalastnum",purchaseDs.Sum(x=>x.purchase_arriveqty));
erpRequestData.Add("pk_arriveorder",null);
// erpRequestData.Add("pk_dept","1001A1100000001JFOPQ");