diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
index 83bf666..e792e13 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
@@ -75,6 +75,10 @@ namespace APT.FO.WebApi.Controllers
                 {
                     entity.COMPANY_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null)?.ID;
                 }
+                if (entity.PRODUCTION_UNIT_ID == null)
+                {
+                    entity.PRODUCTION_UNIT_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.PRODUCTION_UNIT_ID;
+                }
                 var details = entity.Nav_Details;
                 if (details != null && details.Any())
                 {
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
index bcccacf..8929b9b 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
@@ -75,6 +75,10 @@ namespace APT.FO.WebApi.Controllers
                 {
                     entity.COMPANY_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null)?.ID;
                 }
+                if (entity.PRODUCTION_UNIT_ID == null)
+                {
+                    entity.PRODUCTION_UNIT_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.PRODUCTION_UNIT_ID;
+                }
                 var details = entity.Nav_Details;
                 if (details != null && details.Any())
                 {