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-09-20 18:10:18 +08:00
parent 156c6c126d f4e2f26141
commit d35203a505
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
View File

@@ -399,6 +399,9 @@ namespace Tnb.WarehouseMgr
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach(var item in wmsMaterialSignDs) foreach(var item in wmsMaterialSignDs)
{ {
WmsCarryCode wmsCarryCode = await _db.Queryable<WmsCarryCode>().Where(x=>x.barcode==item.barcode).FirstAsync();
string gysid = wmsCarryCode?.auxprop_gys ?? "";
ErpExtendField supplier = await _db.Queryable<ErpExtendField>().Where(x=>x.supplier_id==gysid).FirstAsync();
// 出库数量wmsMaterialSignD.sign_qty // 出库数量wmsMaterialSignD.sign_qty
erpRequestDataDetails.Add(new Dictionary<string, object>() erpRequestDataDetails.Add(new Dictionary<string, object>()
{ {
@@ -414,8 +417,8 @@ namespace Tnb.WarehouseMgr
["vsourcebillcode"] = wmsTransferOrderH?.erp_bill_code ?? "", ["vsourcebillcode"] = wmsTransferOrderH?.erp_bill_code ?? "",
["vsourcerowno"] = wmsRawmatTransferoutstockD?.lineno ?? "", ["vsourcerowno"] = wmsRawmatTransferoutstockD?.lineno ?? "",
["cunitid"] = erpExtendFields.Find(x => x.table_id == wmsRawmatTransferoutstockD.unit_id)?.cunitid ?? "", ["cunitid"] = erpExtendFields.Find(x => x.table_id == wmsRawmatTransferoutstockD.unit_id)?.cunitid ?? "",
["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", ["cvendorid"] = gysid,
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", ["cvendorvid"] = supplier?.supplier_vid ?? gysid,
["dbizdate"] = wmsTransferOrderH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), ["dbizdate"] = wmsTransferOrderH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
["dplanarrivedate"] = nowStr, ["dplanarrivedate"] = nowStr,
["dplanoutdate"] = nowStr, ["dplanoutdate"] = nowStr,
@@ -425,7 +428,7 @@ namespace Tnb.WarehouseMgr
["pk_org"] = erpOrg.pk_org, ["pk_org"] = erpOrg.pk_org,
["pk_org_v"] = erpOrg.pk_org_v, ["pk_org_v"] = erpOrg.pk_org_v,
["vbatchcode"] = item.code_batch, ["vbatchcode"] = item.code_batch,
["vfree1"] = item.code_batch, ["vfree1"] = wmsCarryCode?.auxprop_xph,
}); });
} }
erpRequestData.Add("dtls", erpRequestDataDetails); erpRequestData.Add("dtls", erpRequestDataDetails);
@@ -437,7 +440,7 @@ namespace Tnb.WarehouseMgr
thirdWebapiRecord.name = "调拨出库"; thirdWebapiRecord.name = "调拨出库";
thirdWebapiRecord.method = "POST"; thirdWebapiRecord.method = "POST";
//thirdWebapiRecord.url = config.value + "uapws/rest/transOut/save"; //thirdWebapiRecord.url = config.value + "uapws/rest/transOut/save";
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "/uapws/rest/transOut/save"; thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transOut/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now; thirdWebapiRecord.create_time = DateTime.Now;
thirdWebapiRecord.remark = $"原材料调拨出库wms_rawmat_transferoutstock_h:{wmsRawmatTransferoutstockH.bill_code}"; thirdWebapiRecord.remark = $"原材料调拨出库wms_rawmat_transferoutstock_h:{wmsRawmatTransferoutstockH.bill_code}";