optimize_patch/订单排样客户端/EDIT/Packing/stock.cs
@@ -12,6 +12,7 @@ using MyGlassEdit.ng.optima.model; using Newtonsoft.Json; using ng.optima.server; using ng.optima.model; namespace directPacking { @@ -5661,7 +5662,17 @@ else { MarkModel mm = JsonConvert.DeserializeObject<MarkModel>(p.dabiao); MarkNewModel new_mm = JsonConvert.DeserializeObject<MarkNewModel>(p.dabiao); MarkModel mm = new MarkModel(); if (new_mm.markIcon == null) { mm = JsonConvert.DeserializeObject<MarkModel>(p.dabiao); } else{ mm = new_mm.markIcon; } if (string.IsNullOrEmpty(mm.trademark)) { continue;