|
@@ -105,6 +105,10 @@ public class ApsUtils {
|
|
|
int aaa = 0;
|
|
|
}
|
|
|
String equids = CollUtil.join(productionProcesses.getOptionalEquipments(), ",");
|
|
|
+ // 存在历史排程设备则按照历史排程设备排产
|
|
|
+ if(StrUtil.isNotBlank(productionProcesses.getLastHistoryEquipmentId())){
|
|
|
+ equids = productionProcesses.getLastHistoryEquipmentId();
|
|
|
+ }
|
|
|
if(equPros.size() == 0){
|
|
|
List<ProductionProcessesTa> pps = new ArrayList<>();
|
|
|
pps.add(productionProcesses);
|