退火炉宽度替换为长度

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

@@ -1014,10 +1014,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 aspCheckItemUse.put(aspCheckItemsDo.getId(), 0);
                 // 退火炉套筒间隙扣除
                 if (apsScheduleConfig != null) {
-                    if(aspCheckItemsDo.getEquipmentwidth() == null){
-                        throw new CustomException("退火炉的宽度没有维护");
+                    if(aspCheckItemsDo.getEquipmentlength() == null){
+                        throw new CustomException("退火炉的长度没有维护");
                     }
-                    aspCheckItemsDo.setEquipmentwidth(aspCheckItemsDo.getEquipmentwidth().subtract(apsScheduleConfig.getLooseness()));
+                    aspCheckItemsDo.setEquipmentlength(aspCheckItemsDo.getEquipmentlength().subtract(apsScheduleConfig.getLooseness()));
                 }
             }
             for (ApsProcessOperationVo processOperationM : processOperationMs) {
@@ -1040,7 +1040,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                             // 选择的设备要在可选设备的范围内
                             if (processOperationM.getCanchoosedeviceid().contains(aspCheckItemsDos.get(i).getId())) {
                                 // 单卷宽度不能超过设备宽度并且单卷重不能超过设备的承重
-                                if (processOperationM.getProwidth().compareTo(aspCheckItemsDos.get(i).getEquipmentwidth()) < 0
+                                if (processOperationM.getProwidth().compareTo(aspCheckItemsDos.get(i).getEquipmentlength()) < 0
                                         && processOperationM.getSinglerollweight().compareTo(aspCheckItemsDos.get(i).getEquipmentbearing()) < 0) {
                                     // 获取使用次数最小的可选设备
                                     if (aspCheckItem == null) {
@@ -1060,11 +1060,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                             // 选择的设备要在可选设备的范围内
                             if (processOperationM.getCanchoosedeviceid().contains(aspCheckItem.getId())) {
                                 // 单卷宽度不能超过设备宽度并且单卷重不能超过设备的承重
-                                if (processOperationM.getProwidth().compareTo(aspCheckItem.getEquipmentwidth()) < 0
+                                if (processOperationM.getProwidth().compareTo(aspCheckItem.getEquipmentlength()) < 0
                                         && processOperationM.getSinglerollweight().compareTo(aspCheckItem.getEquipmentbearing()) < 0) {
                                     for (int n = 1; n <= lastnum; n++) {
                                         // 宽度余量
-                                        if (aspCheckItem.getEquipmentwidth().compareTo(processOperationM.getProwidth().multiply(new BigDecimal(n))) < 0) {
+                                        if (aspCheckItem.getEquipmentlength().compareTo(processOperationM.getProwidth().multiply(new BigDecimal(n))) < 0) {
                                             break;
                                         }
                                         // 重量余量
@@ -1209,7 +1209,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     Integer sy = 0;
                     for (int j = 1; j <= processOperationM.getPlanprocessrall(); j++) {
                         // 宽度余量
-                        if (aspCheckItem.getEquipmentwidth().subtract(totalWidth).compareTo(processOperationM.getProwidth().multiply(new BigDecimal(j))) < 0) {
+                        if (aspCheckItem.getEquipmentlength().subtract(totalWidth).compareTo(processOperationM.getProwidth().multiply(new BigDecimal(j))) < 0) {
                             break;
                         }
                         // 重量余量