From 46be182abc08e005d6922977f8d133fa0db705b9 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 26 Aug 2024 14:28:31 +0800 Subject: [PATCH 1/3] 1 --- QcMgr/Tnb.QcMgr/QcCheckTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs index 5ce98c24..0ba02f11 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs @@ -160,7 +160,7 @@ namespace Tnb.QcMgr }; if (!string.IsNullOrEmpty(CheckTaskOut.workid)) { - CheckTaskOut.workname = db.Queryable().Where(p => p.Id == CheckTaskOut.workid).First().FullName; + CheckTaskOut.workname = db.Queryable().Where(p => p.Id == CheckTaskOut.workid).First()?.FullName; } CheckTaskOut.checktypes = new List(); From ca47405a20a1ab2329f8509a1dd5b2405143b38f Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 26 Aug 2024 15:47:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20erp=E4=BB=93=E5=BA=93=E8=8E=B7=E5=8F=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20=E4=BF=AE=E6=94=B9=20=E7=BB=84=E7=BB=87=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=B6=E5=88=A0=E9=99=A4=E8=AE=BE=E5=A4=87=E5=85=B3?= =?UTF-8?q?=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 10 +++++++--- .../WmsMaterialTransferService.cs | 15 +++++++++++---- system/Tnb.Systems/Permission/OrganizeService.cs | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 06f550b9..8a830d0c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -2643,6 +2643,9 @@ namespace Tnb.WarehouseMgr string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? ""; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); + BasWarehouse basWarehouse = await db.Queryable().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_instock); + string whcode = basWarehouse?.whcode ?? ""; List> requestData = new List>(); Dictionary erpRequestData = new Dictionary(); @@ -2653,7 +2656,8 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("creationtime",nowStr); erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("ctrantypeid","0001H11000000000D30Z"); - erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); + // erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); + erpRequestData.Add("cwarehouseid",erpWarehouserelaHs.Find(x => x.wms_warehousecode == whcode)?.erp_warehouseid ?? ""); erpRequestData.Add("cwhsmanagerid",""); erpRequestData.Add("dbilldate",nowStr); erpRequestData.Add("dmakedate",nowStr); @@ -2669,8 +2673,8 @@ namespace Tnb.WarehouseMgr erpRequestDataDetails.Add(new Dictionary() { ["cbodytranstypecode"] = "4A-01", - ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", - ["cgeneralbid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "", + ["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode == whcode)?.erp_warehouseid ?? "", + ["cgeneralbid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode == whcode)?.erp_warehouseid ?? "", ["cgeneralbid"] = null, ["cgeneralhid"] = null, ["cmaterialoid"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "", diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index e1071ffa..4404a257 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -1033,7 +1033,13 @@ namespace Tnb.WarehouseMgr ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); string erpCreateId = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.create_id)?.user_id ?? ""; - + List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); + BasWarehouse outWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_outstock); + BasWarehouse inWarehouse = await _db.Queryable().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_instock); + string inwhcode = inWarehouse?.whcode ?? ""; + string outwhcode = outWarehouse?.whcode ?? ""; + + List> requestData = new List>(); Dictionary erpRequestData = new Dictionary(); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); @@ -1043,11 +1049,12 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("corpoid", erpOrg.corpoid); erpRequestData.Add("corpvid", erpOrg.corpoid); erpRequestData.Add("cothercalbodyoid", erpOrg.pk_org); - erpRequestData.Add("cotherwhid", erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); + // erpRequestData.Add("cotherwhid", erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); + erpRequestData.Add("cotherwhid", erpWarehouserelaHs.Find(x => x.wms_warehousecode == inwhcode)?.erp_warehouseid ?? ""); erpRequestData.Add("creationtime", nowStr); erpRequestData.Add("creator", erpCreateId); erpRequestData.Add("ctrantypeid", "0001H11000000000D31W"); - erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? ""); + erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.wms_warehousecode == outwhcode)?.erp_warehouseid ?? ""); erpRequestData.Add("dbilldate", nowStr); erpRequestData.Add("dmakedate", nowStr); erpRequestData.Add("ntotalnum", wmsCarryCodes.Sum(r => r.codeqty)); @@ -1060,7 +1067,7 @@ namespace Tnb.WarehouseMgr erpRequestDataDetails.Add(new Dictionary() { ["cbodytranstypecode"] = "4I-01", - ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? "", + ["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode == outwhcode)?.erp_warehouseid ?? "", ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == wmsMaterialTransferd.material_id)?.cmaterialoid ?? "", ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == wmsMaterialTransferd.material_id)?.cmaterialvid ?? "", ["corpoid"] = erpOrg.corpoid, diff --git a/system/Tnb.Systems/Permission/OrganizeService.cs b/system/Tnb.Systems/Permission/OrganizeService.cs index a0a14251..76c00e30 100644 --- a/system/Tnb.Systems/Permission/OrganizeService.cs +++ b/system/Tnb.Systems/Permission/OrganizeService.cs @@ -582,6 +582,7 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie // 删除该组织和角色关联数据 await _repository.AsSugarClient().Deleteable().Where(x => x.OrganizeId == id && x.ObjectType == "Role").ExecuteCommandAsync(); + await _repository.AsSugarClient().Deleteable().Where(x => x.OrganizeId == id && x.ObjectType == "Eqp").ExecuteCommandAsync(); _db.CommitTran(); } From 956fccaf6b55fb44954b5a9cd553d19615f6cd7a Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 26 Aug 2024 17:30:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QcMgr/Tnb.QcMgr/QcCheckPlanService.cs | 4 ++-- QcMgr/Tnb.QcMgr/QcCheckTaskService.cs | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs index 0e267cb0..badc4ac4 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs @@ -439,12 +439,12 @@ namespace Tnb.QcMgr if (list.IsEmpty()) { - throw Oops.Bah("未找到质检方案"); + throw Oops.Bah($"{entity.triggerevent.ToString()}未找到质检方案"); } if (list.Count > 1) { - throw Oops.Bah("找到多个质检方案"); + throw Oops.Bah($"{entity.triggerevent.ToString()}找到多个质检方案"); } // List removes = new(); diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs index 0ba02f11..32ee9afe 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs @@ -156,7 +156,7 @@ namespace Tnb.QcMgr checknum = !string.IsNullOrEmpty(QcCheckExecH.checknum) ? int.Parse(QcCheckExecH.checknum) : 0, worker_name = userEntity?.RealName ?? "", bill_code = QcCheckExecH.bill_code, - carry_code = prdReport?.material_box_code, + carry_code = prdReport!=null ? prdReport.material_box_code : "", }; if (!string.IsNullOrEmpty(CheckTaskOut.workid)) { @@ -195,7 +195,8 @@ namespace Tnb.QcMgr Item.setData.errorcause = new List(); foreach (string str in strs) { - Item.setData.errorcause.Add(new Error { id = str, name = QcErrorCauses.Where(p => p.id == str).First().name! }); + if (string.IsNullOrEmpty(str) || str == "null") continue; + Item.setData.errorcause.Add(new Error { id = str, name = QcErrorCauses.Where(p => p.id == str).First()?.name! }); } } if (!string.IsNullOrEmpty(QcCheckExecD.errorlevel)) @@ -204,7 +205,8 @@ namespace Tnb.QcMgr Item.setData.errorlevel = new List(); foreach (string str in strs) { - Item.setData.errorlevel.Add(new Error { id = str, name = QcErrorLevels.Where(p => p.id == str).First().name! }); + if (string.IsNullOrEmpty(str) || str == "null") continue; + Item.setData.errorlevel.Add(new Error { id = str, name = QcErrorLevels.Where(p => p.id == str).First()?.name! }); } } Item.setData.remark = QcCheckExecD.remark!;