其他出入库 erp仓库获取方式 修改 组织删除时删除设备关系

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<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
+                            BasWarehouse basWarehouse = await db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_instock);
+                            string whcode = basWarehouse?.whcode ?? "";
                             
                             List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
                             Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
@@ -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<string, object>()
                                 {
                                     ["cbodytranstypecode"] = "4A-01",
-                                    ["cbodywarehouseid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "",
+                                    ["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode == whcode)?.erp_warehouseid ?? "",
-                                    ["cgeneralbid"] = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? "",
+                                    ["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 ?? "",

WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs

@@ -1033,6 +1033,12 @@ 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<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
+                    BasWarehouse outWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_outstock);
+                    BasWarehouse inWarehouse = await _db.Queryable<BasWarehouse>().SingleAsync(x=>x.id==wmsMaterialTransfer.warehouse_instock);
+                    string inwhcode = inWarehouse?.whcode ?? "";
+                    string outwhcode = outWarehouse?.whcode ?? "";
+                    
                     
                     List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
                     Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
@@ -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<string, object>()
                     {
                         ["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,

system/Tnb.Systems/Permission/OrganizeService.cs

@@ -582,6 +582,7 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie
 
             // 删除该组织和角色关联数据
             await _repository.AsSugarClient().Deleteable<OrganizeRelationEntity>().Where(x => x.OrganizeId == id && x.ObjectType == "Role").ExecuteCommandAsync();
+            await _repository.AsSugarClient().Deleteable<OrganizeRelationEntity>().Where(x => x.OrganizeId == id && x.ObjectType == "Eqp").ExecuteCommandAsync();
 
             _db.CommitTran();
         }