diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index 4fbdafad..aaf12156 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -4025,39 +4025,10 @@ namespace Tnb.ProductionMgr
             {
                 if (worklineId != null && !worklineId.IsEmpty())
                 {
-                    PrdMoTask prdMoTask = await GetPrdMoTaskInfoByWorklineId(new Dictionary<string, string>()
-                    {
-                        { "workline_id", worklineId }
-                    });
+                    PrdMoTask prdMoTask = await _db.Queryable<PrdMoTask>().Where(x => x.workline_id == worklineId && x.mo_task_status == DictConst.InProgressEnCode && x.parent_id != null).FirstAsync();
                     if (prdMoTask == null) throw Oops.Bah("没找到对应任务单");
             
-                    // if (await _db.Queryable<PrdOutPackMarkLabel>().Where(x =>
-                    //         x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null && x.is_mark==0).AnyAsync())
-                    // {
-                    //     await _db.Updateable<PrdOutPackMarkLabel>()
-                    //         .SetColumns(x => x.is_label == 0)
-                    //         .Where(x => x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null &&
-                    //                     x.is_mark == 0)
-                    //         .ExecuteCommandAsync();
-                    // }
-                    // 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 = bm.code,
-                    //         create_time = DateTime.Now,
-                    //     };
-                    //
-                    //     await _db.Insertable<PrdOutPackMarkLabel>(prdOutPackMarkLabel).ExecuteCommandAsync();
-                    // }
-            
-                    //PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
                     BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==prdMoTask.material_id);
-                    PrdMo mo = await _db.Queryable<PrdMo>().SingleAsync(x => x.id == prdMoTask.mo_id);
                     string batch = prdMoTask.batch;
 
                     string code = $"(01){basMaterial.di ?? ""}*(11){prdMoTask.act_start_date.Value.ToString("yyMMdd")}*(17){prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{prdMoTask.act_start_date.Value.ToString("yyyyMMdd")}*{prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}";
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
index 967dffe3..e211f1ae 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs
@@ -566,7 +566,7 @@ namespace Tnb.WarehouseMgr
                                 Logger.LogInformation($"【WmsMaterialSignHService ModifyAsync】thirdResult {JsonConvert.SerializeObject(thirdResult)}");
                                 if (thirdResult.Code!=200)
                                 {
-                                    throw Oops.Bah(thirdResult.msgResult);
+                                    throw Oops.Bah(thirdResult.msgResult ?? "erp接口调用失败");
                                 }
                             }