diff --git a/ZR.Model/MES/wms/WmGoodsChangeLog.cs b/ZR.Model/MES/wms/WmGoodsChangeLog.cs
index 04cf36e6..2eb8e77b 100644
--- a/ZR.Model/MES/wms/WmGoodsChangeLog.cs
+++ b/ZR.Model/MES/wms/WmGoodsChangeLog.cs
@@ -14,7 +14,7 @@ namespace ZR.Model.MES.wms
         public int Id { get; set; }
 
         /// <summary>
-        /// 操作类型;0-默认1-拼箱2-拆箱3-移库4-待定。。。其余待定 
+        /// 操作类型;0-默认 1-拼箱 2-拆箱 3-移库 4-待定。。。其余待定 
         /// </summary>
         public int Type { get; set; }
 
diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
index 7ebf917c..656d11cb 100644
--- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
+++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
@@ -51,7 +51,7 @@ namespace ZR.Service.mes.wms
                     }
 
                     wmGood.PackageCode = Getpack_no(resultionPackage.WorkoderID, flow_num.ToString("000"));
-                  
+
                     wmGood.PackageCodeClient = resultionPackage.PatchCode;
                     wmGood.Partnumber = resultionPackage.PartNumner;
                     wmGood.PackageCodeOriginal = resultionPackage.originalCode;
@@ -79,13 +79,14 @@ namespace ZR.Service.mes.wms
             //  修改入库检验 为入库完成   WmFgentryInspect
             UseTran2(() =>
             {
-                if(preparegoodsList!=null&& preparegoodsList.Count() > 0) { 
-                    foreach(var preparegood in preparegoodsList)
+                if (preparegoodsList != null && preparegoodsList.Count() > 0)
+                {
+                    foreach (var preparegood in preparegoodsList)
                     {
                         if (!string.IsNullOrEmpty(preparegood.PackageCode))
                         {
                             Context.Updateable<WmFgentryInspect>()
-                            .SetColumns(it=>it.Bitwm==1)
+                            .SetColumns(it => it.Bitwm == 1)
                             .Where(it => it.Packcode == preparegood.PackageCode)
                             .ExecuteCommand();
 
@@ -97,7 +98,7 @@ namespace ZR.Service.mes.wms
                 }
 
             });
-           
+
 
             int result = Context.Insertable(preparegoodsList).ExecuteCommand();
             return result;
@@ -221,37 +222,37 @@ namespace ZR.Service.mes.wms
             {
                 MaterialUtils materialToos = new MaterialUtils();
                 ResultionPackageCodeDto packageCodeDto = materialToos.ResolutionPackage(code);
-                if(packageCodeDto == null)
+                if (packageCodeDto == null)
                 {
                     return null;
                 }
-                WmGoodsChangeLog changeLog = Context.Queryable<WmGoodsChangeLog>()
-                    .Where(it => it.Description.Contains(packageCodeDto.PatchCode))
+                string SerialNumber = packageCodeDto.PatchCode.Split('_')[1] ?? "000";
+                WmPackageLcl packageLcl = Context.Queryable<WmPackageLcl>()
+                    .Where(it => it.WorkOrderId == packageCodeDto.WorkoderID)
+                    .Where(it => it.SerialNumber == SerialNumber)
                     .OrderByDescending(it => it.CreatedTime)
                     .First();
-                if(changeLog != null)
+                if (packageLcl != null)
                 {
                     // 拼箱
-                    if(changeLog.Type == 1)
+                    if (packageLcl.Type == 1)
                     {
-                        var json = JsonSerializer.Deserialize<WmGoodsConsolidationJSON>(changeLog.JsonMsg);
-                        packageCodeDto.Remark = "标签涉及拼箱，参考标签:" + json.NewPartnumber;
+                        packageCodeDto.Remark = "标签最后涉及拼箱";
                     }
                     // 拆箱
-                    else if (changeLog.Type == 2)
+                    else if (packageLcl.Type == 2)
                     {
-                        var json = JsonSerializer.Deserialize<WmGoodsUnpackingJSON>(changeLog.JsonMsg);
-                        packageCodeDto.Remark = "标签涉及拆箱参考数据，主箱:" + json.MainPackage.PatchCode + "\n次标签1:"+json.NewPatchCode1 + "\n次标签2:" + json.NewPatchCode2;
+                        packageCodeDto.Remark = "标签最后涉及拆箱";
                     }
                 }
-                
-            return packageCodeDto;
+
+                return packageCodeDto;
             }
             catch (Exception ex)
             {
-                throw new Exception(ex.Message);
+                throw new Exception("格式化异常:" + ex.Message);
             }
-            
+
             /*// 初步进行解析检测，增加解析成功率
             string[] splitstr = code.Split('^');
             if (splitstr.Length < 1)
@@ -302,7 +303,7 @@ namespace ZR.Service.mes.wms
                 {
                     return "标签解析异常！";
                 }
-              
+
 
                 // 2.判断是否已入库
                 bool isExistedWarehouse = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any();
@@ -337,7 +338,7 @@ namespace ZR.Service.mes.wms
                     var inspect = Context.Queryable<WmFgentryInspect>()
                           .Where(it => it.Workorder == resultionPackage.WorkoderID)
                           .Where(it => it.Packcode.EndsWith(package_no))
-                          .OrderByDescending(it=>it.CreatedTime)
+                          .OrderByDescending(it => it.CreatedTime)
                           .First();
                     // XXX 添加校验，如果是编号为4号的打印机打出来的就跳过GP12，满箱与测试标签校验
                     if (recourd.Machine != "4")
@@ -356,7 +357,7 @@ namespace ZR.Service.mes.wms
                             return "该箱号GP12  未检验，不得入库";
                         }
                     }
-                    
+
                     // 4.isStrict = TRUE时判断能否追溯
                     string flow = resultionPackage.PatchCode.Split('_')[1];
                     int flow_num = 0;