Browse Source

排产的后台代码和功能

master
Rui_Li 4 years ago
parent
commit
ac08ac8da8
  1. 11
      src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
  2. 2
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

11
src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java

@ -72,6 +72,7 @@ public class ScheduleData extends BaseShopOrderData {
private Date closedDate;//
private String repairSOFlag;//
private String manualFlag;//
private boolean checkedFlag;//是否选中
public ScheduleData() {
}
@ -411,4 +412,12 @@ public class ScheduleData extends BaseShopOrderData {
public void setManualFlag(String manualFlag) {
this.manualFlag = manualFlag;
}
}
public boolean isCheckedFlag() {
return checkedFlag;
}
public void setCheckedFlag(boolean checkedFlag) {
this.checkedFlag = checkedFlag;
}
}

2
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@ -35,7 +35,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//获取当前加工中心机台对应的calendarId
Map<String, Object> resultMap = scheduleMapper.getCalendarId(inData);
//判断是否存在当前的加工中心机台数据
if (resultMap.size() == 0) {
if (resultMap == null || resultMap.size() == 0) {
//throw new RuntimeException("");
return new ArrayList<ShiftInfoData>();
} else {

Loading…
Cancel
Save