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

生产报告回写id 产成品入库修改

Browse Source
This commit is contained in:
周科达
2024-08-30 15:27:17 +08:00
parent 60c27e331d
commit 285618ada9
8 changed files with 106 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -272,7 +272,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("cdptvid","0001A11000000007GGO8");//部门先写死
erpRequestData.Add("corpoid", erpOrg.corpoid);
erpRequestData.Add("corpvid", erpOrg.corpvid);
erpRequestData.Add("cotherwhid", wmsErpWarehouserelaHs.Find(x=>x.wms_warehousecode==wmsRawmatTransferoutstockD.warehouse_instock_code)?.erp_warehouseid ?? "");
erpRequestData.Add("cotherwhid", wmsRawmatTransferoutstockD.warehouse_instock_code);
erpRequestData.Add("cwarehouseid", wmsErpWarehouserelaHs.Find(x=>x.erp_warehousecode==wmsRawmatTransferoutstockD.erp_wh_type)?.erp_warehouseid ?? "");
erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId);
@@ -297,7 +297,7 @@ namespace Tnb.WarehouseMgr
erpRequestDataDetails.Add(new Dictionary<string, object>()
{
["cbodytranstypecode"] = "4Y-01",
["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode==wmsRawmatTransferoutstockD.warehouse_instock_code)?.erp_warehouseid ?? "",
["cbodywarehouseid"] = wmsRawmatTransferoutstockD.warehouse_instock_code,
["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "",
["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "",
["corpoid"] = erpOrg.corpoid,

9
WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
View File

@@ -349,7 +349,8 @@ namespace Tnb.WarehouseMgr
WmsPrdInstockH instock = await _db.Queryable<WmsPrdInstockH>().SingleAsync(x=>x.id==wmsPrdInstockD.prd_instock_id);
BasWarehouse scWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==wmsPrdInstockD.scwarehouse_id);
BasWarehouse kcWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==wmsPrdInstockD.warehouse_id);
//todo 产成品入库
PrdReport prdReport = await _db.Queryable<PrdReport>().SingleAsync(x => x.id == instock.prd_report_id);
List<WmsPrdInstockCode> allInstockDetails = await _db.Queryable<WmsPrdInstockCode>().Where(it => it.prd_instock_id == instock.id).ToListAsync();
List<String> materialIds = Arrays.AsList(instock.material_id);
@@ -397,7 +398,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("pk_group", erpOrg.pk_group);
erpRequestData.Add("vbillcode", instock.bill_code);
erpRequestData.Add("vtrantypecode", "46-01");
erpRequestData.Add("csourcebillhid", "");//todo 后面填
erpRequestData.Add("csourcebillhid", prdReport?.erp_pk_wr ?? "");//todo 后面填
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
@@ -414,8 +415,8 @@ namespace Tnb.WarehouseMgr
["cproductid"] = erpExtendFields.Find(x => x.table_id == instock.material_id)?.cmaterialoid ?? "",
["fproductclass"] = 1,
["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
["csourcebillhid"] = "",
["csourcebillbid"] = "",
["csourcebillhid"] = prdReport?.erp_pk_wr ?? "",
["csourcebillbid"] = prdReport?.erp_pk_wr_product ?? "",
["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "",
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "",