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

1

Browse Source
This commit is contained in:
周科达
2024-08-21 14:58:53 +08:00
parent 75d3148560
commit 98183ea01c
1 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
View File

@@ -319,126 +319,126 @@ namespace Tnb.WarehouseMgr
WmsTempCode wmsTempCode = await _db.Queryable<WmsCarryCode>() // WmsTempCode wmsTempCode = await _db.Queryable<WmsCarryCode>()
.LeftJoin<WmsTempCode>((a, b) => a.barcode == b.barcode) // .LeftJoin<WmsTempCode>((a, b) => a.barcode == b.barcode)
.Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id) // .Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id)
.Select((a, b) => b) // .Select((a, b) => b)
.FirstAsync(); // .FirstAsync();
//
string purchaseDId = wmsTempCode?.require_id ?? ""; // string purchaseDId = wmsTempCode?.require_id ?? "";
WmsPurchaseD wmsPurchaseD = await _db.Queryable<WmsPurchaseD>().SingleAsync(x => x.id == purchaseDId); // WmsPurchaseD wmsPurchaseD = await _db.Queryable<WmsPurchaseD>().SingleAsync(x => x.id == purchaseDId);
string purchaseHId = wmsPurchaseD?.bill_id ?? ""; // string purchaseHId = wmsPurchaseD?.bill_id ?? "";
WmsPurchaseH wmsPurchaseH = await _db.Queryable<WmsPurchaseH>().SingleAsync(x => x.id == purchaseHId); // WmsPurchaseH wmsPurchaseH = await _db.Queryable<WmsPurchaseH>().SingleAsync(x => x.id == purchaseHId);
string wmsPurchaseOrderHId = wmsPurchaseH?.erp_bill_code ?? ""; // string wmsPurchaseOrderHId = wmsPurchaseH?.erp_bill_code ?? "";
WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable<WmsPurchaseOrderH>().SingleAsync(x => x.id == wmsPurchaseOrderHId); // WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable<WmsPurchaseOrderH>().SingleAsync(x => x.id == wmsPurchaseOrderHId);
WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable<WmsPurchaseOrderD>().FirstAsync(x => x.fk_wms_purchase_order_id == wmsPurchaseOrderHId); // WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable<WmsPurchaseOrderD>().FirstAsync(x => x.fk_wms_purchase_order_id == wmsPurchaseOrderHId);
BasWarehouse basWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==instock.warehouse_id); // BasWarehouse basWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==instock.warehouse_id);
//
List<String> materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList(); // List<String> materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList();
List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); // List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>() // List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId) // .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) // .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
.Select((x, y) => y) // .Select((x, y) => y)
.ToListAsync(); // .ToListAsync();
List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync(); // List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
//
DictionaryDataEntity tranType = await _db.Queryable<DictionaryDataEntity>().Where(x=>x.DictionaryTypeId=="25043925951909" && x.EnCode==wmsPurchaseH.transaction_type).FirstAsync(); // DictionaryDataEntity tranType = await _db.Queryable<DictionaryDataEntity>().Where(x=>x.DictionaryTypeId=="25043925951909" && x.EnCode==wmsPurchaseH.transaction_type).FirstAsync();
string tranTypeId = tranType?.Id ?? ""; // string tranTypeId = tranType?.Id ?? "";
string supplierId = wmsPurchaseOrderH?.supplier_id ?? ""; // string supplierId = wmsPurchaseOrderH?.supplier_id ?? "";
List<string> tableIds = new List<string>(); // List<string> tableIds = new List<string>();
tableIds.Add(_userManager.UserId); // tableIds.Add(_userManager.UserId);
tableIds.Add(WmsWareHouseConst.AdministratorOrgId); // tableIds.Add(WmsWareHouseConst.AdministratorOrgId);
tableIds.Add(instock.warehouse_id); // tableIds.Add(instock.warehouse_id);
tableIds.AddRange(materialIds); // tableIds.AddRange(materialIds);
tableIds.Add(supplierId); // tableIds.Add(supplierId);
tableIds.Add(tranTypeId); // tableIds.Add(tranTypeId);
tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); // tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
//
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); // List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x => x.table_id == instock.create_id)?.user_id ?? ""; // string erpCreateId = erpExtendFields.Find(x => x.table_id == instock.create_id)?.user_id ?? "";
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); // ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); // string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>(); // List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
Dictionary<string, object> erpRequestData = new Dictionary<string, object>(); // Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
erpRequestData.Add("approver", erpCreateId); // erpRequestData.Add("approver", erpCreateId);
erpRequestData.Add("billmaker", erpCreateId); // erpRequestData.Add("billmaker", erpCreateId);
erpRequestData.Add("bitinbill", false); // erpRequestData.Add("bitinbill", false);
erpRequestData.Add("cgeneralhid", null); // erpRequestData.Add("cgeneralhid", null);
erpRequestData.Add("corpoid", erpOrg.corpoid); // erpRequestData.Add("corpoid", erpOrg.corpoid);
erpRequestData.Add("corpvid", erpOrg.corpvid); // erpRequestData.Add("corpvid", erpOrg.corpvid);
erpRequestData.Add("creationtime", nowStr); // erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId); // erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("ctrantypeid", erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? ""); // erpRequestData.Add("ctrantypeid", erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? "");
erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? ""); // erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "");
erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? ""); // erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "");
// erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 // // erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取
erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? "");//类型视图里取 // erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.erp_warehousecode == wmsPurchaseD.erp_wh_type)?.erp_warehouseid ?? "");//类型视图里取
erpRequestData.Add("dbilldate", nowStr); // erpRequestData.Add("dbilldate", nowStr);
erpRequestData.Add("dmakedate", nowStr); // erpRequestData.Add("dmakedate", nowStr);
erpRequestData.Add("fbillflag", 2); // erpRequestData.Add("fbillflag", 2);
erpRequestData.Add("fbuysellflag", 2); // erpRequestData.Add("fbuysellflag", 2);
erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty)); // erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty));
erpRequestData.Add("pk_org", erpOrg.pk_org); // erpRequestData.Add("pk_org", erpOrg.pk_org);
erpRequestData.Add("pk_org_v", erpOrg.pk_org_v); // erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
erpRequestData.Add("pk_group", erpOrg.pk_group); // erpRequestData.Add("pk_group", erpOrg.pk_group);
erpRequestData.Add("vbillcode", instock.bill_code); // erpRequestData.Add("vbillcode", instock.bill_code);
erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? ""); // erpRequestData.Add("vtrantypecode", tranType?.EnCode ?? "");
//
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>(); // List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach (WmsInstockD item in allInstockDetails) // foreach (WmsInstockD item in allInstockDetails)
{ // {
erpRequestDataDetails.Add(new Dictionary<string, object>() // erpRequestDataDetails.Add(new Dictionary<string, object>()
{ // {
["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", // ["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cbodytranstypecode"] = erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? "", // ["cbodytranstypecode"] = erpExtendFields.Find(x => x.table_id == tranTypeId)?.transaction_type_id ?? "",
["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", // ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "",
["cgeneralbid"] = "", // ["cgeneralbid"] = "",
["cgeneralhid"] = "", // ["cgeneralhid"] = "",
["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", // ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "",
["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", // ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "",
["corpoid"] = erpOrg.corpoid, // ["corpoid"] = erpOrg.corpoid,
["corpvid"] = erpOrg.corpvid, // ["corpvid"] = erpOrg.corpvid,
["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, // ["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", // ["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 ?? "", // ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "",
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", // ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "",
["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), // ["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["nnum"] = item.qty, // ["nnum"] = item.qty,
["nshouldnum"] = item.pr_qty, // ["nshouldnum"] = item.pr_qty,
// ["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", // // ["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "",
["pk_creqwareid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "", // ["pk_creqwareid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "",
["pk_group"] = erpOrg.pk_group, // ["pk_group"] = erpOrg.pk_group,
["pk_org"] = erpOrg.pk_org, // ["pk_org"] = erpOrg.pk_org,
["pk_org_v"] = erpOrg.pk_org_v, // ["pk_org_v"] = erpOrg.pk_org_v,
["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, // ["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
["vbatchcode"] = item.code_batch, // ["vbatchcode"] = item.code_batch,
["csourcebillhid"] = wmsPurchaseH?.erp_arriveorder_pk ?? "", // ["csourcebillhid"] = wmsPurchaseH?.erp_arriveorder_pk ?? "",
["csourcebillbid"] = wmsPurchaseD?.erp_arriveorder_b_pk ?? "", // ["csourcebillbid"] = wmsPurchaseD?.erp_arriveorder_b_pk ?? "",
["vsourcebillcode"] = wmsPurchaseH?.bill_code ?? "", // ["vsourcebillcode"] = wmsPurchaseH?.bill_code ?? "",
["lineno"] = wmsPurchaseOrderDs?.lineno ?? "", // ["lineno"] = wmsPurchaseOrderDs?.lineno ?? "",
["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", // ["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "",
["bpresent"] = wmsPurchaseD.gift==1, // ["bpresent"] = wmsPurchaseD.gift==1,
["ntaxprice"] = wmsPurchaseD.price, // ["ntaxprice"] = wmsPurchaseD.price,
//
}); // });
} // }
erpRequestData.Add("dtls", erpRequestDataDetails); // erpRequestData.Add("dtls", erpRequestDataDetails);
requestData.Add(erpRequestData); // requestData.Add(erpRequestData);
BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); // BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL);
//
ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); // ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();
thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); // thirdWebapiRecord.id = SnowflakeIdHelper.NextId();
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; // thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
thirdWebapiRecord.name = "采购入库"; // thirdWebapiRecord.name = "采购入库";
thirdWebapiRecord.method = "POST"; // thirdWebapiRecord.method = "POST";
// thirdWebapiRecord.url = config.value + "uapws/rest/purchaseIn/save"; // // thirdWebapiRecord.url = config.value + "uapws/rest/purchaseIn/save";
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purchaseIn/save"; // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purchaseIn/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 = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? ""); // thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "");
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); // await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
} }
// 委外入库 // 委外入库
else if (instock.bill_type == WmsWareHouseConst.BILLTYPE_OUTSOURCEINSTOCK_ID) else if (instock.bill_type == WmsWareHouseConst.BILLTYPE_OUTSOURCEINSTOCK_ID)