From 9f33a4ec15b0f79ebf7cf14b70b7b7d1acb5de6d Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Sat, 31 Aug 2024 10:19:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=91=8A=E6=94=B9?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=BA=93=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 3 ++- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 4 ++-- WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 48d2a743..a7695500 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -2525,7 +2525,8 @@ namespace Tnb.ProductionMgr thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; thirdWebapiRecord.name = "生产报告"; thirdWebapiRecord.method = "POST"; - thirdWebapiRecord.url = config.value+"uapws/rest/pwrnew/save"; + // thirdWebapiRecord.url = config.value+"uapws/rest/pwrnew/save"; + thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/pwrnew/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); thirdWebapiRecord.create_time = DateTime.Now; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 76c103d6..ccdc24f0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -2908,8 +2908,8 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; thirdWebapiRecord.name = "其它入库"; thirdWebapiRecord.method = "POST"; - // thirdWebapiRecord.url = config.value+"uapws/rest/generalin/save"; - thirdWebapiRecord.url = config.value + "uapws/rest/generalin/save"; + // thirdWebapiRecord.url = config.value + "uapws/rest/generalin/save"; + thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalin/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.create_time = DateTime.Now; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index e3da89e9..cae617d3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -1101,7 +1101,8 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; thirdWebapiRecord.name = "其它出库"; thirdWebapiRecord.method = "POST"; - thirdWebapiRecord.url = config.value + "uapws/rest/generalout/save"; + // thirdWebapiRecord.url = config.value + "uapws/rest/generalout/save"; + thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalout/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.create_time = DateTime.Now; From 7e778243b73456e022902cdd9b4d8a5e6f407654 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 2 Sep 2024 09:03:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=A5=E6=BA=90erp=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=89=8D=E8=B0=83=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.ProductionMgr/PrdMoTaskService.cs | 156 ++++++++++-------- 1 file changed, 85 insertions(+), 71 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index a7695500..5954b693 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1667,7 +1667,15 @@ namespace Tnb.ProductionMgr if (qcCheckPlanAdds.Count == 1) { int hour = int.Parse(qcCheckPlanAdds[0].content.Split(" ")[2].Split("/")[1]); - TimerPoolHelper.GetInstance().StartTimer(TimeCallback2,prdTaskList.Where(p => p.mo_task_status == "Pause" || p.mo_task_status == "ToBeStarted").ToList(),TimeSpan.FromHours(hour),Timeout.InfiniteTimeSpan,false); + int minute = int.Parse(qcCheckPlanAdds[0].content.Split(" ")[1].Split("/")[1]); + if (hour > 0) + { + TimerPoolHelper.GetInstance().StartTimer(TimeCallback2,prdTaskList.Where(p => p.mo_task_status == "Pause" || p.mo_task_status == "ToBeStarted").ToList(),TimeSpan.FromHours(hour),Timeout.InfiniteTimeSpan,false); + + }else if (minute > 0) + { + TimerPoolHelper.GetInstance().StartTimer(TimeCallback2,prdTaskList.Where(p => p.mo_task_status == "Pause" || p.mo_task_status == "ToBeStarted").ToList(),TimeSpan.FromMinutes(minute),Timeout.InfiniteTimeSpan,false); + } } } @@ -2452,85 +2460,91 @@ namespace Tnb.ProductionMgr { throw Oops.Bah(result2.msg !=null ? result2.msg : "生产入库接口报错"); } - List unitDatas = await db.Queryable() + //来源erp需要调接口 + if (prdMo.data_sources == "1") + { + List unitDatas = await db.Queryable() .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id) .Select((x, y) => y) .ToListAsync(); - List erpExtendIds = new List(); - erpExtendIds.Add(_userManager.UserId); - erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId); - erpExtendIds.Add(report.material_id); - erpExtendIds.Add(report.unit_id); - erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList()); + List erpExtendIds = new List(); + erpExtendIds.Add(_userManager.UserId); + erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId); + erpExtendIds.Add(report.material_id); + erpExtendIds.Add(report.unit_id); + erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList()); - List erpExtendFields = await _db.Queryable().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> requestData = new List>(); - Dictionary erpRequestData = new Dictionary(); - erpRequestData.Add("auditer",erpCreateId); - erpRequestData.Add("billmaker",erpCreateId); - erpRequestData.Add("cdeptid","1001A1100000000JRLI1");//部门先写死 - erpRequestData.Add("cdeptvid","0001A11000000007GGO8");//部门先写死 - erpRequestData.Add("taudittime",nowStr); - erpRequestData.Add("creationtime",nowStr); - erpRequestData.Add("creator",erpCreateId); - erpRequestData.Add("dbilldate",nowStr); - erpRequestData.Add("dmakedate",nowStr); - erpRequestData.Add("pk_org",erpOrg.pk_org); - erpRequestData.Add("pk_org_v",erpOrg.pk_org_v); - erpRequestData.Add("vtrantypecode","55A4-01"); - erpRequestData.Add("vtrantypeid","0001A11000000002LVX8"); - erpRequestData.Add("vdef1",null); - erpRequestData.Add("vdef2",null); - erpRequestData.Add("report_id",report.id); - - - List> erpRequestDataDetails = new List>(); - erpRequestDataDetails.Add(new Dictionary() - { - ["cbdeptid"] = "1001A1100000000JRLI1",//部门先写死 - ["cbdeptvid"] = "0001A11000000007GGO8",//部门先写死 - ["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_line_pk, - ["cbmoid"] = prdMo.erp_mo_pk, - // ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", - // ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", - ["cbunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "", - ["cbastunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "", - ["nbplanwrnum"] = report.reported_qty, - ["nbwrnum"] = report.reported_qty, - ["tbendtime"] = nowStr, - ["tbstarttime"] = prdMoTask.act_start_date!=null ? prdMoTask.act_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", - ["vbinbatchcode"] = report.batch, - ["vbmobillcode"] = prdMo.mo_code, - ["vbmorowno"] = prdMo.erp_lineno, - ["vbrowno"] = prdMo.erp_lineno, + List erpExtendFields = await _db.Queryable().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"); - }); - erpRequestData.Add("AggWrDtl",erpRequestDataDetails); - requestData.Add(erpRequestData); + + List> requestData = new List>(); + Dictionary erpRequestData = new Dictionary(); + erpRequestData.Add("auditer",erpCreateId); + erpRequestData.Add("billmaker",erpCreateId); + erpRequestData.Add("cdeptid","1001A1100000000JRLI1");//部门先写死 + erpRequestData.Add("cdeptvid","0001A11000000007GGO8");//部门先写死 + erpRequestData.Add("taudittime",nowStr); + erpRequestData.Add("creationtime",nowStr); + erpRequestData.Add("creator",erpCreateId); + erpRequestData.Add("dbilldate",nowStr); + erpRequestData.Add("dmakedate",nowStr); + erpRequestData.Add("pk_org",erpOrg.pk_org); + erpRequestData.Add("pk_org_v",erpOrg.pk_org_v); + erpRequestData.Add("vtrantypecode","55A4-01"); + erpRequestData.Add("vtrantypeid","0001A11000000002LVX8"); + erpRequestData.Add("vdef1",null); + erpRequestData.Add("vdef2",null); + erpRequestData.Add("report_id",report.id); + + + List> erpRequestDataDetails = new List>(); + erpRequestDataDetails.Add(new Dictionary() + { + ["cbdeptid"] = "1001A1100000000JRLI1",//部门先写死 + ["cbdeptvid"] = "0001A11000000007GGO8",//部门先写死 + ["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_line_pk, + ["cbmoid"] = prdMo.erp_mo_pk, + // ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", + // ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", + ["cbunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["cbastunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == report.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["nbplanwrnum"] = report.reported_qty, + ["nbwrnum"] = report.reported_qty, + ["tbendtime"] = nowStr, + ["tbstarttime"] = prdMoTask.act_start_date!=null ? prdMoTask.act_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", + ["vbinbatchcode"] = report.batch, + ["vbmobillcode"] = prdMo.mo_code, + ["vbmorowno"] = prdMo.erp_lineno, + ["vbrowno"] = prdMo.erp_lineno, + + }); + erpRequestData.Add("AggWrDtl",erpRequestDataDetails); + requestData.Add(erpRequestData); - BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); - ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); - thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); - thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; - thirdWebapiRecord.name = "生产报告"; - thirdWebapiRecord.method = "POST"; - // thirdWebapiRecord.url = config.value+"uapws/rest/pwrnew/save"; - thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/pwrnew/save"; - thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); - thirdWebapiRecord.create_time = DateTime.Now; + BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); + ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); + thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); + thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; + thirdWebapiRecord.name = "生产报告"; + thirdWebapiRecord.method = "POST"; + // thirdWebapiRecord.url = config.value+"uapws/rest/pwrnew/save"; + 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(); + } - await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); + if (prdMoTask.schedule_type == 2) {