This commit is contained in:
2024-07-19 08:50:02 +08:00
parent 9326b55a8e
commit 6e3bda642a
7 changed files with 255 additions and 35 deletions

View File

@@ -47,6 +47,7 @@ using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Interfaces;
using Tnb.WarehouseMgr;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.ProductionMgr.Entities.Entity;
// using Tnb.PerMgr.Entities;
@@ -2110,6 +2111,116 @@ namespace Tnb.ProductionMgr
throw Oops.Bah(result2.msg !=null ? result2.msg : "生产入库接口报错");
}
List<string> erpExtendIds = new List<string>();
erpExtendIds.Add(_userManager.UserId);
erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId);
erpExtendIds.Add(report.material_id);
erpExtendIds.Add(report.unit_id);
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>erpExtendIds.Contains(x.table_id)).ToListAsync();
string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.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("auditer",erpCreateId);
erpRequestData.Add("billmaker",erpCreateId);
erpRequestData.Add("cdeptid","");
erpRequestData.Add("cdeptvid","");
erpRequestData.Add("creationtime",nowStr);
erpRequestData.Add("creator",erpCreateId);
erpRequestData.Add("cshiftid","");
erpRequestData.Add("cteamid","");
erpRequestData.Add("cwkid","");
erpRequestData.Add("cworkmanid",erpCreateId);
erpRequestData.Add("dbilldate",nowStr);
erpRequestData.Add("dmakedate",nowStr);
erpRequestData.Add("fbillstatus",1);
erpRequestData.Add("fprodmode",1);
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("pk_wr","");
erpRequestData.Add("vbillcode","");
erpRequestData.Add("vnote","");
erpRequestData.Add("vtrantypecode","55A4-01");
erpRequestData.Add("vtrantypeid","0001A11000000002LVX8");
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
erpRequestDataDetails.Add(new Dictionary<string, object>()
{
["bbchkflag"] = "N",
["bbhasbckfled"] = "N",
["bbhaspicked"] = "N",
["bbinstock"] = "N",
["bbisempass"] = "N",
["bbotherreject"] = "N",
["bbsetmark"] = "N",
["bbstockbycheck"] = "N",
["cbastunitid"] = "",
["cbbomversionid"] = "",
["cbdeptid"] = "",
["cbdeptvid"] = "",
["cbfirstmobid"] = "",
["cbfirstmoid"] = "",
["cbmainbomid"] = "",
["cbmainmaterialid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialoid ?? "",
["cbmainmaterialvid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialvid ?? "",
["cbmaterialid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialvid ?? "",
["cbmaterialvid"] = erpExtendFields.Find(x=>x.table_id==report.material_id)?.cmaterialvid ?? "",
["cbmobid"] = prdMo.erp_lineno,
["cbmoid"] = prdMo.erp_mo_pk,
["cbsrctranstype"] = "",
["cbsrctype"] = "",
["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "",
["cbworkmanid"] = erpCreateId,
["fbproducttype"] = 1,
["fbsourcetype"] = 2,
// ["nbplanwrastnum"] = "",
["nbplanwrnum"] = report.reported_qty,
["nbwrnum"] = report.reported_qty,
["pk_wr"] = "",
["pk_wr_product"] = "",
["pseudocolumn"] = 10,
["tbendtime"] = "",
["tbstarttime"] = "",
["vbbatchcode"] = report.batch,
["vbbatchid"] = "",
["vbchangerate"] = "",
["vbfirstcode"] = "",
["vbfirstid"] = "",
["vbfirstmocode"] = "",
["vbfirstmorowno"] = "",
["vbfirsttype"] = "",
["vbidentify"] = "",
["vbinbatchcode"] = report.batch,
["vbinbatchid"] = "",
["vbmainbomcode"] = "",
["vbmainidentify"] = "",
["vbmainmorowno"] = "",
["vbmobillcode"] = prdMo.mo_code,
["vbrowno"] = prdMo.erp_lineno,
["vbsrccode"] = "",
["vbsrcid"] = "",
["vbsrcrowid"] = "",
["vbsrcrowno"] = "",
["vbsrctranstype"] = "",
["vbdef2"] = 10,
});
erpRequestData.Add("AggWrDtl",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/pwrnew/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
thirdWebapiRecord.create_time = DateTime.Now;
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
if (prdMoTask.schedule_type == 2)
{