[麦格纳问题:87 增加工单管理页面]

yun-zuoyi
joke.wang 5 years ago
parent 417120358c
commit 1d50c135ac

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
@ -187,6 +188,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
private String areaCodeName;
@Transient
@ApiParam("状态-下达,启动,暂停")
private List<Integer> statusList;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "计划开始日期查询用,查询开始日期", example = "2018-12-31 23:59:59")
public String startTimeStart;

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.*;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
@ -177,6 +178,11 @@ public class MesPcnHqlPack {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
}
// 工单管理,查询下达,启动,暂停状态
if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){
DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean);
}
// 时间段查询
if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
DdlPreparedPack.timeBuilder(

Loading…
Cancel
Save