erp原材料调拨、委外调整
This commit is contained in:
@@ -293,138 +293,153 @@ namespace Tnb.WarehouseMgr
|
||||
ArgumentNullException.ThrowIfNull(nameof(instock));
|
||||
}
|
||||
|
||||
if (instock.sync_status != WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC)
|
||||
// 采购入库
|
||||
if (instock.bill_type == WmsWareHouseConst.BILLTYPE_MATERIALINSTOCK_ID)
|
||||
{
|
||||
//如果是自动单据，需要回更上层系统
|
||||
Dictionary<string, string> pars = new() { { nameof(WmsInstockH.source_id), instock?.source_id ?? string.Empty } };
|
||||
dynamic callBackRes = await _prdInstockService.SyncInstock(pars);
|
||||
instock!.sync_status = callBackRes == true ? WmsWareHouseConst.SYNC_STATUS__SYNCCOMPLETE : WmsWareHouseConst.SYNC_STATUS__SYNCFAILED;
|
||||
_ = await _db.Updateable(instock).UpdateColumns(it => it.sync_status).ExecuteCommandAsync();
|
||||
}
|
||||
List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
|
||||
if (allInstockDetails.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
|
||||
{
|
||||
instock.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;
|
||||
}
|
||||
else
|
||||
{
|
||||
//任务没有结束，更新状态为工作中
|
||||
instock.status = WmsWareHouseConst.BILLSTATUS_ON_ID;
|
||||
}
|
||||
_ = await _db.Updateable(instock).UpdateColumns(it => it.status).ExecuteCommandAsync();
|
||||
|
||||
|
||||
|
||||
WmsTempCode wmsTempCode = await _db.Queryable<WmsCarryCode>()
|
||||
.LeftJoin<WmsTempCode>((a,b)=>a.barcode==b.barcode)
|
||||
.Where((a,b) => a.carry_code == input.wmsDistaskH.carry_code)
|
||||
.Select((a,b)=>b)
|
||||
.FirstAsync();
|
||||
|
||||
string purchaseDId = wmsTempCode?.require_id ?? "";
|
||||
WmsPurchaseD wmsPurchaseD = await _db.Queryable<WmsPurchaseD>().SingleAsync(x=>x.id==purchaseDId);
|
||||
string purchaseHId = wmsPurchaseD?.bill_id ?? "";
|
||||
WmsPurchaseH wmsPurchaseH = await _db.Queryable<WmsPurchaseH>().SingleAsync(x=>x.id==purchaseHId);
|
||||
string wmsPurchaseOrderHId = wmsPurchaseH?.erp_bill_code ?? "";
|
||||
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);
|
||||
|
||||
List<String> materialIds = allInstockDetails.Select(x=>x.material_id).Distinct().ToList();
|
||||
List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
|
||||
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
|
||||
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
|
||||
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
|
||||
.Select((x,y)=>y)
|
||||
.ToListAsync();
|
||||
|
||||
List<string> tableIds = new List<string>();
|
||||
tableIds.Add(_userManager.UserId);
|
||||
tableIds.Add(WmsWareHouseConst.AdministratorOrgId);
|
||||
tableIds.Add(instock.warehouse_id);
|
||||
tableIds.AddRange(materialIds);
|
||||
tableIds.Add(instock.supplier_id);
|
||||
tableIds.AddRange(unitDatas.Select(x=>x.Id).ToList());
|
||||
|
||||
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 ?? "";
|
||||
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
|
||||
string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
|
||||
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
|
||||
erpRequestData.Add("approver",erpCreateId);
|
||||
erpRequestData.Add("billmaker",erpCreateId);
|
||||
erpRequestData.Add("bitinbill",false);
|
||||
erpRequestData.Add("cgeneralhid",null);
|
||||
erpRequestData.Add("corpoid",erpOrg.corpoid);
|
||||
erpRequestData.Add("corpvid",erpOrg.corpvid);
|
||||
erpRequestData.Add("creationtime",nowStr);
|
||||
erpRequestData.Add("creator",erpCreateId);
|
||||
erpRequestData.Add("ctrantypeid",wmsPurchaseH?.transaction_type ?? "");
|
||||
erpRequestData.Add("cvendorid",erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_id ?? "");
|
||||
erpRequestData.Add("cvendorvid",erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_vid ?? "");
|
||||
erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取
|
||||
erpRequestData.Add("dbilldate",nowStr);
|
||||
erpRequestData.Add("dmakedate",nowStr);
|
||||
erpRequestData.Add("fbillflag",2);
|
||||
erpRequestData.Add("fbuysellflag",2);
|
||||
erpRequestData.Add("ntotalnum",allInstockDetails.Sum(x=>x.qty));
|
||||
erpRequestData.Add("pk_org",erpOrg.pk_org);
|
||||
erpRequestData.Add("pk_org_v",erpOrg.pk_org_v);
|
||||
erpRequestData.Add("pk_group",erpOrg.pk_group);
|
||||
erpRequestData.Add("vbillcode",null);
|
||||
erpRequestData.Add("vtrantypecode",null);
|
||||
|
||||
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
|
||||
foreach(WmsInstockD item in allInstockDetails)
|
||||
{
|
||||
erpRequestDataDetails.Add(new Dictionary<string, object>()
|
||||
if (instock.sync_status != WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC)
|
||||
{
|
||||
["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
|
||||
["cbodytranstypecode"] = wmsPurchaseH?.transaction_type ?? "",
|
||||
["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==instock.warehouse_id)?.cotherwhid ?? "",
|
||||
["cgeneralbid"] = "",
|
||||
["cgeneralhid"] = "",
|
||||
["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,
|
||||
["corpvid"] = erpOrg.corpvid,
|
||||
["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 ?? "",
|
||||
["cvendorid"] = erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_id ?? "",
|
||||
["cvendorvid"] = erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_vid ?? "",
|
||||
["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
["nnum"] = item.qty,
|
||||
["nshouldnum"] = item.pr_qty,
|
||||
["pk_creqwareid"] = erpExtendFields.Find(x=>x.table_id==instock.warehouse_id)?.cotherwhid ?? "",
|
||||
["pk_group"] = erpOrg.pk_group,
|
||||
["pk_org"] = erpOrg.pk_org,
|
||||
["pk_org_v"] = erpOrg.pk_org_v,
|
||||
["pseudocolumn"] = (allInstockDetails.FindIndex(x=>x.id==item.id)+1) * 10,
|
||||
["vbatchcode"] = item.code_batch,
|
||||
["csourcebillhid"] = wmsPurchaseOrderH?.erp_pk ?? "",
|
||||
["csourcebillbid"] = wmsPurchaseOrderDs?.erp_line_pk ?? "",
|
||||
["vsourcebillcode"] = wmsPurchaseOrderH?.erp_bill_code ?? "",
|
||||
["lineno"] = wmsPurchaseOrderDs?.lineno ?? "",
|
||||
["vfree1"] = erpExtendFields.Find(x=>x.table_id==instock.supplier_id)?.supplier_id ?? "",
|
||||
|
||||
});
|
||||
//如果是自动单据，需要回更上层系统
|
||||
Dictionary<string, string> pars = new() { { nameof(WmsInstockH.source_id), instock?.source_id ?? string.Empty } };
|
||||
dynamic callBackRes = await _prdInstockService.SyncInstock(pars);
|
||||
instock!.sync_status = callBackRes == true ? WmsWareHouseConst.SYNC_STATUS__SYNCCOMPLETE : WmsWareHouseConst.SYNC_STATUS__SYNCFAILED;
|
||||
_ = await _db.Updateable(instock).UpdateColumns(it => it.sync_status).ExecuteCommandAsync();
|
||||
}
|
||||
List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
|
||||
if (allInstockDetails.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
|
||||
{
|
||||
instock.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;
|
||||
}
|
||||
else
|
||||
{
|
||||
//任务没有结束，更新状态为工作中
|
||||
instock.status = WmsWareHouseConst.BILLSTATUS_ON_ID;
|
||||
}
|
||||
_ = await _db.Updateable(instock).UpdateColumns(it => it.status).ExecuteCommandAsync();
|
||||
|
||||
|
||||
|
||||
WmsTempCode wmsTempCode = await _db.Queryable<WmsCarryCode>()
|
||||
.LeftJoin<WmsTempCode>((a, b) => a.barcode == b.barcode)
|
||||
.Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id)
|
||||
.Select((a, b) => b)
|
||||
.FirstAsync();
|
||||
|
||||
string purchaseDId = wmsTempCode?.require_id ?? "";
|
||||
WmsPurchaseD wmsPurchaseD = await _db.Queryable<WmsPurchaseD>().SingleAsync(x => x.id == purchaseDId);
|
||||
string purchaseHId = wmsPurchaseD?.bill_id ?? "";
|
||||
WmsPurchaseH wmsPurchaseH = await _db.Queryable<WmsPurchaseH>().SingleAsync(x => x.id == purchaseHId);
|
||||
string wmsPurchaseOrderHId = wmsPurchaseH?.erp_bill_code ?? "";
|
||||
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);
|
||||
|
||||
List<String> materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList();
|
||||
List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
|
||||
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
|
||||
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
|
||||
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode))
|
||||
.Select((x, y) => y)
|
||||
.ToListAsync();
|
||||
|
||||
List<string> tableIds = new List<string>();
|
||||
tableIds.Add(_userManager.UserId);
|
||||
tableIds.Add(WmsWareHouseConst.AdministratorOrgId);
|
||||
tableIds.Add(instock.warehouse_id);
|
||||
tableIds.AddRange(materialIds);
|
||||
tableIds.Add(instock.supplier_id);
|
||||
tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
|
||||
|
||||
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 ?? "";
|
||||
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
|
||||
string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
|
||||
Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
|
||||
erpRequestData.Add("approver", erpCreateId);
|
||||
erpRequestData.Add("billmaker", erpCreateId);
|
||||
erpRequestData.Add("bitinbill", false);
|
||||
erpRequestData.Add("cgeneralhid", null);
|
||||
erpRequestData.Add("corpoid", erpOrg.corpoid);
|
||||
erpRequestData.Add("corpvid", erpOrg.corpvid);
|
||||
erpRequestData.Add("creationtime", nowStr);
|
||||
erpRequestData.Add("creator", erpCreateId);
|
||||
erpRequestData.Add("ctrantypeid", wmsPurchaseH?.transaction_type ?? "");
|
||||
erpRequestData.Add("cvendorid", erpExtendFields.Find(x => x.table_id == instock.supplier_id)?.supplier_id ?? "");
|
||||
erpRequestData.Add("cvendorvid", erpExtendFields.Find(x => x.table_id == instock.supplier_id)?.supplier_vid ?? "");
|
||||
erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取
|
||||
erpRequestData.Add("dbilldate", nowStr);
|
||||
erpRequestData.Add("dmakedate", nowStr);
|
||||
erpRequestData.Add("fbillflag", 2);
|
||||
erpRequestData.Add("fbuysellflag", 2);
|
||||
erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty));
|
||||
erpRequestData.Add("pk_org", erpOrg.pk_org);
|
||||
erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
|
||||
erpRequestData.Add("pk_group", erpOrg.pk_group);
|
||||
erpRequestData.Add("vbillcode", null);
|
||||
erpRequestData.Add("vtrantypecode", null);
|
||||
|
||||
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
|
||||
foreach (WmsInstockD item in allInstockDetails)
|
||||
{
|
||||
erpRequestDataDetails.Add(new Dictionary<string, object>()
|
||||
{
|
||||
["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "",
|
||||
["cbodytranstypecode"] = wmsPurchaseH?.transaction_type ?? "",
|
||||
["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "",
|
||||
["cgeneralbid"] = "",
|
||||
["cgeneralhid"] = "",
|
||||
["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,
|
||||
["corpvid"] = erpOrg.corpvid,
|
||||
["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 ?? "",
|
||||
["cvendorid"] = erpExtendFields.Find(x => x.table_id == instock.supplier_id)?.supplier_id ?? "",
|
||||
["cvendorvid"] = erpExtendFields.Find(x => x.table_id == instock.supplier_id)?.supplier_vid ?? "",
|
||||
["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
["nnum"] = item.qty,
|
||||
["nshouldnum"] = item.pr_qty,
|
||||
["pk_creqwareid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "",
|
||||
["pk_group"] = erpOrg.pk_group,
|
||||
["pk_org"] = erpOrg.pk_org,
|
||||
["pk_org_v"] = erpOrg.pk_org_v,
|
||||
["pseudocolumn"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10,
|
||||
["vbatchcode"] = item.code_batch,
|
||||
["csourcebillhid"] = wmsPurchaseOrderH?.erp_pk ?? "",
|
||||
["csourcebillbid"] = wmsPurchaseOrderDs?.erp_line_pk ?? "",
|
||||
["vsourcebillcode"] = wmsPurchaseOrderH?.erp_bill_code ?? "",
|
||||
["lineno"] = wmsPurchaseOrderDs?.lineno ?? "",
|
||||
["vfree1"] = erpExtendFields.Find(x => x.table_id == instock.supplier_id)?.supplier_id ?? "",
|
||||
|
||||
});
|
||||
}
|
||||
erpRequestData.Add("PurchaseInBodyVODtl", erpRequestDataDetails);
|
||||
requestData.Add(erpRequestData);
|
||||
|
||||
ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();
|
||||
thirdWebapiRecord.id = SnowflakeIdHelper.NextId();
|
||||
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
|
||||
thirdWebapiRecord.name = "采购入库";
|
||||
thirdWebapiRecord.method = "POST";
|
||||
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purchaseIn/save";
|
||||
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
|
||||
thirdWebapiRecord.create_time = DateTime.Now;
|
||||
thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "");
|
||||
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
|
||||
}
|
||||
erpRequestData.Add("PurchaseInBodyVODtl",erpRequestDataDetails);
|
||||
requestData.Add(erpRequestData);
|
||||
// 委外入库
|
||||
else if (instock.bill_type == WmsWareHouseConst.BILLTYPE_OUTSOURCEINSTOCK_ID)
|
||||
{
|
||||
|
||||
}
|
||||
// 调拨入库
|
||||
else if (instock.bill_type == WmsWareHouseConst.BILLTYPE_RAWMATTRANSFERINSTOCK_ID)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord();
|
||||
thirdWebapiRecord.id = SnowflakeIdHelper.NextId();
|
||||
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
|
||||
thirdWebapiRecord.name = "采购入库";
|
||||
thirdWebapiRecord.method = "POST";
|
||||
thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/purchaseIn/save";
|
||||
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
|
||||
thirdWebapiRecord.create_time = DateTime.Now;
|
||||
thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "");
|
||||
|
||||
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
|
||||
|
||||
}
|
||||
|
||||
await _db.Ado.CommitTranAsync();
|
||||
|
||||
Reference in New Issue
Block a user