yun-zuoyi
陈思洁 5 years ago
commit bae2130d72

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : ANDON_
@ -45,4 +46,12 @@ public class AndonCellAlarmCause extends BaseBean {
@Column(name = "AC_CODE")
@ApiParam(value = "事件描述")
private String acCode;
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@Transient
@ApiParam(value = "呼叫原因描述")
private String acName;
}

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : ANDON_
@ -47,5 +48,12 @@ public class AndonCellEventCause extends BaseBean {
@ApiParam(value = "事件原因")
private String ecCode;
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@Transient
@ApiParam(value = "事件原因描述")
private String ecName;
}

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : ANDON_
@ -45,4 +46,12 @@ public class AndonCellEventMethod extends BaseBean {
@Column(name = "EM_CODE")
@ApiParam(value = "处理方法")
private String emCode;
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@Transient
@ApiParam(value = "处理方法描述")
private String emName;
}

@ -266,6 +266,10 @@ public class AndonManageQueue extends BaseManageQueue {
@ApiParam(value ="生产累计件数")
private Integer totalProdNum;
@Transient
@ApiParam(value ="安灯类型名称")
private String alarmCodeName;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : ANDON_PLC
@ -82,6 +83,22 @@ public class AndonPLC extends BaseBean {
@ApiParam(value = "是否安灯")
private Integer isAlarmStatus;
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@Transient
@ApiParam(value = "生产线名称")
private String workCenterName;
@Transient
@ApiParam(value = "标签业务类型名称")
private String tagBusinessTypeName;
@Transient
@ApiParam(value = "是否安灯名称")
private String isAlarmStatusName;
public int getIsAlarmStatusVal(){
if(isAlarmStatus == null){
return 0;

@ -36,12 +36,12 @@ import java.util.List;
public class Work extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)
@FieldAnnotation(popSearch = true, mainkey = true, modify = false)
private String code;
@Column(name="ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(relation = "Order")
@FieldAnnotation(relation = "Order", modify = false)
private Long orderId;
@Column(name="WORK_TYPE")
@ -77,9 +77,10 @@ public class Work extends BaseAPS {
@ApiParam(value ="指定数量")
private Double specifyCount;
@Column(name="SPECIFY_RESOURCE")
@ApiParam(value ="指定资源")
private String specifyResource;
@Column(name="SPECIFY_RESOURCE_ID")
@ApiParam(value ="指定主资源")
@FieldAnnotation(relation = "SpecifyResource")
private Long specifyResourceId;
@Column(name="SPECIFY_PRODUCE_TIME")
@ApiParam(value ="指定制造时间")
@ -223,4 +224,13 @@ public class Work extends BaseAPS {
@JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); }
public Resource getSpecifyResource() {
return BeanRelation.get(this, EWork.SpecifyResource);
}
public void setSpecifyResource(Resource resource) {
this.specifyResourceId = resource != null ? resource.getId() : 0;
BeanRelation.set(this, EWork.SpecifyResource, resource);
}
}

@ -113,6 +113,11 @@ public class WorkPlan extends BaseAPS {
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer lockTime;
@Column(name="FORCE_POST_SET_ZERO")
@ApiParam(value ="是否将后设置时间强制设置成0")
@FieldAnnotation(property = false)
private Boolean forcePostSetZero;
@Column(name="WORK_RESOURCE_ID")
@ApiParam(value ="工作资源对象id")
@FieldAnnotation(property = false)

@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material")
@FieldAnnotation(relation = "Material", modify = false)
private Long materialId;
@Column(name="PREV_ORDER_ID")
@ApiParam(value ="前订单")
@FieldAnnotation(relation = "PrevOrder")
@FieldAnnotation(relation = "PrevOrder", modify = false)
private Long prevOrderId;
@Column(name="POST_ORDER_ID")
@ApiParam(value ="后订单")
@FieldAnnotation(relation = "PostOrder")
@FieldAnnotation(relation = "PostOrder", modify = false)
private Long postOrderId;
@Column(name="PREV_WORK_ID")
@ApiParam(value ="前工作")
@FieldAnnotation(relation = "PrevWork")
@FieldAnnotation(relation = "PrevWork", modify = false)
private Long prevWorkId;
@Column(name="POST_WORK_ID")
@ApiParam(value ="后工作")
@FieldAnnotation(relation = "PostWork")
@FieldAnnotation(relation = "PostWork", modify = false)
private Long postWorkId;
@Column(name="COUNT", columnDefinition = "decimal(18,8)")

@ -12,4 +12,5 @@ public enum EWork {
PlanFeedbacks, // 工作计划反馈
MainPlan, // 关联的为主资源的计划
WorkPlans, // 关联的工作计划
SpecifyResource, // 指定资源
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.aps.model;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class GanttOrderModel {
private Long id;
private String code;
private String name;
private List<GanttOrderModel> children = new ArrayList<>();
}

@ -18,4 +18,6 @@
</Relation>
<Relation field="PlanFeedbacks" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="SpecifyResource" name="Resource" type="MULTI_TO_ONE">
</Relation>
</Class>

@ -363,10 +363,10 @@ public class WmsEnumUtil {
}
/**
* PO
* PO/DOC_MOVE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PO_SN_STATUS {
public enum ORDER_SN_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
@ -376,7 +376,7 @@ public class WmsEnumUtil {
private String code;
private String description;
PO_SN_STATUS(int value, String code, String description) {
ORDER_SN_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;

@ -80,7 +80,8 @@ public class MesQcCheckStandard extends BaseBean {
public MesQcCheckStandard() {
}
public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
this.id = id;
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;

@ -0,0 +1,100 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class QueueJisModel implements Serializable {
@ApiParam("id")
private Long id;
@ApiParam("作业任务编号")
private String taskNo;
@ApiParam("作业类型")
private Integer taskType;
@ApiParam("作业状态")
private Integer taskStatus;
@ApiParam(value="生产线")
private String workCenterCode;
@ApiParam("计划日期")
private String planTime;
@ApiParam("任务来源")
private Integer taskSource;
@ApiParam("备注")
private String memo;
@ApiParam("通知标识")
private Integer notifyFlag;
@ApiParam("关联任务")
private String relateTask;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("有效性")
public Integer isValid;
@ApiParam("是否已删除")
public Integer isDeleted;
@ApiParam("创建用户")
public String createUser;
@ApiParam("创建日期")
public String createDatetime;
@ApiParam("修改人")
public String modifyUser;
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("作业类型")
private String taskTypeName;
@ApiParam("作业状态")
private String taskStatusName;
@ApiParam("任务来源")
private String taskSourceName;
@ApiParam("通知标识")
private String notifyFlagName;
@ApiParam("mes设备作业任务页面按钮控制")
private MesButtonFlagModel mesButtonFlagModel;
public QueueJisModel() {
}
public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.taskNo = taskNo;
this.taskType = taskType;
this.taskStatus = taskStatus;
this.workCenterCode = workCenterCode;
this.planTime = planTime;
this.taskSource = taskSource;
this.memo = memo;
this.notifyFlag = notifyFlag;
this.relateTask = relateTask;
this.organizeCode = organizeCode;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.annotations.XStreamOmitField;
@ -90,6 +91,7 @@ public class SuitClientModel {
/**
*
*/
@JsonIgnore
@XStreamCDATA
private Object suitResultMessage;

@ -0,0 +1,24 @@
package cn.estsh.i3plus.pojo.model.wms;
import lombok.Data;
import java.io.Serializable;
/**
* @Description SAP DBModel
* @Reference
* @Author dragon
* @CreateDate 2020/1/2 11:23
* @Modify
*/
@Data
public class WmsSapDbParamModel implements Serializable {
private static final long serialVersionUID = 5784492509251527816L;
private String organizeCode;//工厂代码
private String orderNo;//单号
private String partNo;//物料号
private String masterTableName;//单据主表名
private String masterStatusName;//单据状态名
private String detailsTableName;//单据明细表名
private String snTableName;//单据条码表名
}

@ -4,19 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
import cn.estsh.i3plus.pojo.softswitch.bean.*;
/**
* @Description :
@ -415,7 +403,6 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
@ -426,4 +413,12 @@ public class SoftSwitchHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean);
return ddlPackBean;
}
}

@ -67,7 +67,7 @@ public class WmsDocMovementSn extends BaseBean {
*/
@Column(name="SN_STATUS")
@ApiParam(value = "操作状态", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer snStatus;
@Column(name="SN")

@ -31,11 +31,11 @@ public class WmsLocatePart extends BaseBean {
private static final long serialVersionUID = 9134745988014340144L;
@Column(name = "LOCATE_NO")
@ApiParam(value = "库位码")
@ApiParam(value = "库位码")
private String locateNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料码")
@ApiParam(value = "物料码")
private String partNo;
@Column(name = "PART_NAME_RDD")

@ -171,7 +171,7 @@ public class WmsPart extends BaseBean {
private Double proportion;
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ApiParam(value = "贵重物料")
@ApiParam(value = "是否贵重")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
private Integer isValuable;

@ -41,11 +41,11 @@ public class WmsTransType extends BaseBean {
private String transTypeName;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "-1")
@ApiParam(value = "序号")
private Integer seq;
@Column(name = "AG_ID")
@ApiParam(value = "作业流程", example = "-1")
@ApiParam(value = "作业流程")
@JsonSerialize(using = ToStringSerializer.class)
private Long agId;
@ -66,10 +66,19 @@ public class WmsTransType extends BaseBean {
@ApiParam(value = "PDA图标")
private String pdaIcon;
@Column(name = "IS_SEND_ERROR_EMAIL", columnDefinition = "int default 2")
@ApiParam(value = "是否发送异常邮件")
private Integer isSendErrorEmail;
@Transient
@ApiParam("菜单URL")
private String menuUrl;
@Transient
@ApiParam("交易处理组件调用类")
private String callClass;
public String getMenuUrl() {
return "/handle?transTypeCode=" + this.transTypeCode;
}

@ -64,4 +64,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam("关联单号")
private String refOrderNo;
@ApiParam("开始时间")
private String createDateTimeStart;
@ApiParam("结束时间")
private String createDateTimeEnd;
}

@ -351,7 +351,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result);
getStringBuilderPack(wmsPart, result);
return result;
@ -2677,4 +2677,19 @@ public class WmsHqlPack {
return result;
}
/**
* dataAuth
*
* @param wmsSnOperateRecord
* @return
*/
public static DdlPackBean packHqlWmsSnOperateRecord(WmsSnOperateRecord wmsSnOperateRecord) {
DdlPackBean result = new DdlPackBean();
if (!Strings.isNullOrEmpty(wmsSnOperateRecord.getSn())) {
DdlPreparedPack.getStringEqualPack(wmsSnOperateRecord.getSn(), "sn", result);
}
getStringBuilderPack(wmsSnOperateRecord, result);
return result;
}
}

Loading…
Cancel
Save