排程数据组装优化

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -746,7 +746,12 @@ public class ApsServiceImpl implements ApsService {
                                         er.setCutfinishmin(processesDo.getCutfinishmin() == null ? null : processesDo.getCutfinishmin().intValue());
                                         // 单卷宽度、重量数据赋值
                                         er.setTotalVolumeWidth(processesDo.getProwidth());
-                                        er.setTotalSinglerollweight(processesDo.getSinglerollweight());
+                                        if(processesDo.getProcess().equals("小卷成退")){
+                                            er.setTotalSinglerollweight(processesDo.getSinglerollweight().multiply(new BigDecimal(equs.getPlanprocessrall())));
+                                        }else{
+                                            er.setTotalSinglerollweight(processesDo.getSinglerollweight());
+                                        }
+                                        er.setProducttype(processesDo.getProducttype());
                                         er.setTotalThickness(processesDo.getThickness());
                                         er.setOnceprocessmin(processesDo.getOnceprocessmin().intValue());
                                         if(lastpros != null && lastpros.size()>0 && equs.getId().equals(lastpros.get(0).getId())){

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/EquipmentRunTime.java

@@ -83,4 +83,9 @@ public class EquipmentRunTime {
      */
     private BigDecimal lastSerialLbWeight;
 
+    /**
+     * 产品类型
+     */
+    private String producttype;
+
 }