diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index d64615d7..f40d69df 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -46,6 +46,7 @@ using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Interfaces;
 using Tnb.WarehouseMgr;
+using Tnb.WarehouseMgr.Entities.Enums;
 
 // using Tnb.PerMgr.Entities;
 
@@ -1435,20 +1436,21 @@ namespace Tnb.ProductionMgr
                                 BasMbom basMbom = await _db.Queryable<BasMbom>().SingleAsync(x => x.id == item.bom_id);
                                 
                                 //string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
-                                string code = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
+                                string code1 = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}";
+                                string code2 = $"{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
                                 Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
                                 {
                                     ["DevName"] = "外包装箱码垛线",
                                     ["token"] = _eleCtlCfg.token,
                                     ["TagName"] = "WBZX_tb_cs",
-                                    ["Value"] = code,
+                                    ["Value"] = code1,
                                 };
                                 Dictionary<string, string> dicCommand2 = new(StringComparer.OrdinalIgnoreCase)
                                 {
                                     ["DevName"] = "外包装箱码垛线",
                                     ["token"] = _eleCtlCfg.token,
                                     ["TagName"] = "WBZX_pm_cs",
-                                    ["Value"] = code,
+                                    ["Value"] = code2,
                                 };
                                 Dictionary<String, String> workLineDic = new Dictionary<string, string>()
                                 {
@@ -1958,6 +1960,10 @@ namespace Tnb.ProductionMgr
                 WmsCarryH wmsCarryH = await db.Queryable<WmsCarryH>().SingleAsync((x => x.carry_code == materialBoxCode));
                 if (wmsCarryH == null)
                     throw Oops.Bah($"未找到{materialBoxCode}载具");
+                if (wmsCarryH.carry_status == ((int)EnumCarryStatus.占用).ToString())
+                {
+                    throw Oops.Bah($"提报失败，载具已绑定");
+                }
                 
                 BindCarryCodeInput bindCarryCodeInput = new BindCarryCodeInput();
                 bindCarryCodeInput.carry_id = wmsCarryH.id;