Commit 70a66a6b LN

料架界面的任务显示工单颜色

1 个父辈 4a4e77da
......@@ -198,7 +198,7 @@ public class DataInitManager {
Menu celueOut = new Menu(new ArrayList<Menu>(), 1, "tacticsOuput", "策略出库", 1, "tacticsOuput", "neolight/tacticsOuput/index", "", 0, "workOrder");
Menu groupOut = new Menu(new ArrayList<Menu>(), 1, "labelOuput", "物料分组", 1, "labelOuput", "neolight/labelOuput/index", "", 0, "export1");
Menu manualOut = new Menu(new ArrayList<Menu>(), 1, "manualOut", "手动出库", 1, "manualOut", "neolight/manualOut/index", "", 0, "export1");
Menu materialBox = new Menu(new ArrayList<Menu>(), 1, "materialBox", "料盒操作", 1, "materialBox", "neolight/materialBox/index", "", 0, "export1");
Menu materialBox = new Menu(new ArrayList<Menu>(), 1, "materialBox", "料盒操作", 1, "materialBox", "neolight/materialBox/index", "", 0, "mIbox");
celueOut.setHidden(true);
groupOut.setHidden(true);
manualOut.setHidden(true);
......
......@@ -164,6 +164,9 @@ public class Storage extends BasePo implements Serializable {
return DeviceType.SMD_DUO.name().equals(type);
}
public boolean isXLC() {
return DeviceType.SMD_XLC.name().equals(type);
}
public boolean canPutInPos(int w, int h, int PosW, int posH){
......
package com.neotel.smfcore.core.system.rest.bean.dto;
import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.core.system.bean.MSDAppendInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......@@ -126,6 +127,7 @@ public class TaskDto implements Serializable {
/**
* 亮灯料架颜色
*/
@ApiModelProperty("亮灯料架颜色")
private String lightColor = "";
@ApiModelProperty("更新时间")
......@@ -140,4 +142,12 @@ public class TaskDto implements Serializable {
@ApiModelProperty("如果是出库任务,需要记录入库时间")
private Date putInDate;
public String getTaskColor() {
if (ObjectUtil.isNotEmpty(lightColor)) {
return "#" + lightColor;
}
return "";
}
}
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!