diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
index 76aa8d73..43966db8 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
@@ -154,7 +154,7 @@ namespace Tnb.WarehouseMgr
                     List<String> unitCodes = purchaseDs.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))
+                        .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && (unitCodes.Contains(y.EnCode) || unitCodes.Contains(y.Id)))
                         .Select((x,y)=>y)
                         .ToListAsync();
                     List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
@@ -164,6 +164,7 @@ namespace Tnb.WarehouseMgr
                     
                     List<string> ids = new List<string>();
                     ids.Add(_userManager.UserId);
+                    ids.Add(WmsWareHouseConst.AdministratorUserId);
                     ids.Add(WmsWareHouseConst.AdministratorOrgId);
                     ids.Add(purchase.warehouse_id);
                     ids.AddRange(materialIds);
@@ -171,7 +172,7 @@ namespace Tnb.WarehouseMgr
                     ids.AddRange(unitDatas.Select(x=>x.Id).ToList());
         
                     List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x=>ids.Contains(x.table_id)).ToListAsync();
-                    string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.user_id ?? "";
+                    string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId || x.table_id==WmsWareHouseConst.AdministratorUserId)?.user_id ?? "";
                     ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
                     string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     
@@ -206,7 +207,7 @@ namespace Tnb.WarehouseMgr
                     {
                         erpRequestDataDetails.Add(new Dictionary<string, object>()
                         {
-                            ["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
+                            ["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id || x.Id==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
                             ["cfirstbid"] = wmsPurchaseOrderH?.erp_pk ?? "",
                             ["cfirstid"] = item.erp_purchase_order_d_pk,
                             ["cfirsttypecode"] = "",
@@ -215,7 +216,7 @@ namespace Tnb.WarehouseMgr
                             ["csendcountryid"] = "0001Z010000000079UJJ",
                             ["csourcetypecode"] = "",
                             ["ctaxcountryid"] = "0001Z010000000079UJJ",
-                            ["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
+                            ["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id || x.Id==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
                             ["dbilldate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
                             ["dplanreceivedate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
                             ["dproducedate"] = purchase.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs
index ceef2543..ebc6167e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs
@@ -124,12 +124,14 @@ namespace Tnb.WarehouseMgr
             string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID;
             List<string> tableIds = new List<string>();
             tableIds.Add(WmsWareHouseConst.AdministratorOrgId);
+            tableIds.Add(WmsWareHouseConst.AdministratorUserId);
             tableIds.AddRange(materialIds);
             tableIds.Add(supplierId);
             tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
             
             List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync();
             string userId = wmsRawmatTransferoutstockH.create_id ?? WmsWareHouseConst.AdministratorUserId;
+            tableIds.Add(userId);
             string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? "";
             ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
             string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");