Merge branch 'master' into dgq_06/tgs_kb

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -371,11 +371,16 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
 
                     // 这里用优先级取 createTime
                     Date finalCreateTime = null;
-                    if (rollOne != null && rollOne.getRollSendDetails() != null && rollOne.getRollSendDetails().get(0).getCreateTime() != null) {
+                    if (rollOne != null
+                            && rollOne.getRollSendDetails() != null
+                            && !rollOne.getRollSendDetails().isEmpty()
+                            && rollOne.getRollSendDetails().get(0).getCreateTime() != null) {
+
                         finalCreateTime = rollOne.getRollSendDetails().get(0).getCreateTime();
                     } else {
                         finalCreateTime = latest.getCreateTime();
                     }
+
                     detail.setCreateTime(finalCreateTime);
                     detail.setHeatNoAmount(totalAmount);
                     detail.setHeatNoWeight(totalWeight);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillPrintController.java

@@ -461,6 +461,10 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
                 } else {
                     weight = billetRulerConfig.getWeight();
                     exportRow.setWeightPerPiece(BigDecimal.valueOf(weight));
+                    Integer amount = x.getAmountTotal();
+                    BigDecimal totalWeight = (amount == null) ? BigDecimal.ZERO :
+                            BigDecimal.valueOf(weight).multiply(BigDecimal.valueOf(amount));
+                    exportRow.setTotalWeight(totalWeight);
                 }