|
@@ -1595,7 +1595,9 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
|
|
destination = "roll_club_three";
|
|
destination = "roll_club_three";
|
|
} else if ("上若".equals(print.getDestination())) {
|
|
} else if ("上若".equals(print.getDestination())) {
|
|
destination = "roll_out_shipp";
|
|
destination = "roll_out_shipp";
|
|
- }
|
|
|
|
|
|
+ } else if ("付跨".equals(print.getDestination())) {
|
|
|
|
+ destination = "roll_deputy_cross";
|
|
|
|
+ }
|
|
hotChargeMap.put("hotChargeDestination", destination);
|
|
hotChargeMap.put("hotChargeDestination", destination);
|
|
// 将当前记录的热装信息添加到列表
|
|
// 将当前记录的热装信息添加到列表
|
|
hotChargeList.add(hotChargeMap);
|
|
hotChargeList.add(hotChargeMap);
|
|
@@ -1642,6 +1644,8 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
|
|
data.put("totalWeight", ((BigDecimal) data.get("totalWeight")).toPlainString());
|
|
data.put("totalWeight", ((BigDecimal) data.get("totalWeight")).toPlainString());
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
return finalResult;
|
|
return finalResult;
|
|
}
|
|
}
|
|
|
|
|