diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index 48a508ae..8d449da8 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -3197,12 +3197,13 @@ namespace Tnb.ProductionMgr
                     }
                     else
                     {
+                        BasMaterial bm = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == prdMoTask.material_id);
                         PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel()
                         {
                             is_mark = null,
                             is_label = 0,
                             mo_task_code = prdMoTask.mo_task_code,
-                            material_code = prdMoTask.material_code,
+                            material_code = bm.code,
                             create_time = DateTime.Now,
                         };
 
@@ -3212,7 +3213,7 @@ namespace Tnb.ProductionMgr
                     PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
                     BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==parent.material_id);
 
-                    string code = $"{basMaterial.di ?? ""}*{DateTime.Now.ToString("yyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*{parent.batch??""}#{basMaterial.material_standard}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
+                    string code = $"{basMaterial.di ?? ""}*{DateTime.Now.ToString("yyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*{parent.batch??""}#{basMaterial.material_standard}*{parent.batch??""}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
                     return code;
                 }
             }