Browse Source

送样卡合并堆垛部分

lingpeng.li 2 weeks ago
parent
commit
8842ab9661

+ 17 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -682,6 +682,23 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				 }
 			 }
 
+			 //  解析 stackLength 数组
+			 String stackLengthJson = record.getStackLength();
+			 if (StringUtils.isNotBlank(stackLengthJson)) {
+				 try {
+					 JsonNode stackArray = objectMapper.readTree(stackLengthJson);
+					 if (stackArray.isArray()) {
+						 for (JsonNode node : stackArray) {
+							 String mm = node.path("stackingLength").asText();
+							 int count = node.path("stackingCount").asInt(0);
+							 mergedLengthCount.merge(mm, count, Integer::sum);
+						 }
+					 }
+				 } catch (Exception e) {
+					 log.warn("解析 stackLength 失败: {}, 内容: {}", record.getHeatNo(), stackLengthJson, e);
+				 }
+			 }
+
 			 // 转换 mm 为 m(两位小数),组装 vo
 			 for (Map.Entry<String, Integer> entry : mergedLengthCount.entrySet()) {
 				 String mmStr = entry.getKey();