Merge remote-tracking branch 'origin/dev' into dev

yun-zuoyi
汪云昊 6 years ago
commit 7131271edc

@ -1,11 +1,15 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
import java.util.List;
/**
* @Description :
@ -48,4 +52,8 @@ public class BaseOrder extends BaseAPS {
@Column(name="RECEIVE_DATE")
@ApiParam(value ="接单日期")
private Date receiveDate;
public List<Work> getWorks() {
return BeanRelation.list(this, EBaseOrder.Works);
}
}

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
/**
* @Description :
* @Reference :

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-23
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_DATA_LINK")
@Api("数据集成数据连接信息")
public class DataLink extends BaseAPS {
@Column(name="NAME")
@ApiParam(value ="编码")
private String name;
@Column(name="TYPE")
@ApiParam(value ="链接类型")
private DATA_LINK_TYPE type;
@Column(name="PATH")
@ApiParam(value ="IP/文件路径")
private String path;
@Column(name="PORT")
@ApiParam(value ="端口")
private Integer port;
@Column(name="DB_NAME")
@ApiParam(value ="数据库名")
private String dbName;
@Column(name="USER_NAME")
@ApiParam(value ="用户名")
private String userName;
@Column(name="PASSWORD")
@ApiParam(value ="密码")
private String password;
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EExportDetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-23
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_EXPORT_DETAIL")
@Api("数据导出明细")
public class ExportDetail extends BaseAPS {
@Column(name="FILTER")
@ApiParam(value ="筛选")
private String filter;
@Column(name="SORT_BY")
@ApiParam(value ="排序")
private String sortBy;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")
private String outName;
@Column(name="IN_NAME")
@ApiParam(value ="内部表名")
private String inName;
@Column(name="PROJECT_ID")
@ApiParam(value ="导出项目ID")
private Long projectId;
public ExportProject getProject() {
return BeanRelation.get(this, EExportDetail.Project);
}
public void setProject(ExportProject project) {
this.projectId = project != null ? project.getId() : 0l;
BeanRelation.set(this, EExportDetail.Project, project);
}
}

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EExportProject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-23
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_EXPORT_PROJECT")
@Api("数据导出明细集合")
public class ExportProject extends BaseAPS {
@Column(name="NAME")
@ApiParam(value ="标识名")
private String name;
@Column(name="LINK_ID")
@ApiParam(value ="数据源连接")
private Long linkId;
public DataLink getLink() {
return BeanRelation.get(this, EExportProject.Link);
}
public void setLink(DataLink link) {
this.linkId = link != null ? link.getId() : 0l;
BeanRelation.set(this, EExportProject.Link, link);
}
public List<ExportDetail> getDetails() {
return BeanRelation.list(this, EExportProject.Details);
}
}

@ -1,14 +1,17 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.lang.reflect.Method;
@ -28,14 +31,44 @@ import java.lang.reflect.Method;
@Table(name="APS_FIELD_INFO")
@Api("字段信息")
public class FieldInfo extends BaseCode {
@Column(name="CLASS_NAME")
@ApiParam(value ="所属类简称")
private String className;
@Column(name="TYPE")
@ApiParam(value ="类型")
private FIELD_TYPE type;
@Column(name="TYPE_NAME")
@ApiParam(value ="类型全称")
private String typeName;
@Column(name="CUSTOMIZE")
@ApiParam(value ="是否为自定义字段")
private Boolean customize;
@Column(name="MODIFY")
@ApiParam(value ="是否能修改")
private Boolean modify;
@Column(name="DISPLAY")
@ApiParam(value ="是否在界面显示")
private Boolean display;
@Column(name="PRIC")
@ApiParam(value ="浮点数显示精度")
private Integer pric;
@Column(name="TIPS")
@ApiParam(value ="字段提示")
private String tips;
@Column(name="EXPRESSION")
@ApiParam(value ="表达式")
private String expression;
@Column(name="POSITION")
@ApiParam(value ="位置")
private String position;
@JsonIgnore

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-23
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_IMPORT_DETAIL")
@Api("数据导入明细")
public class ImportDetail extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="导入类型")
private IMPORT_DETAIL_TYPE type;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")
private String outName;
@Column(name="IN_NAME")
@ApiParam(value ="内部表名")
private String inName;
}

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-23
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_IMPORT_PROJECT")
@Api("数据导入明细集合")
public class ImportProject extends BaseAPS {
@Column(name="NAME")
@ApiParam(value ="标识名")
private String name;
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
import io.swagger.annotations.Api;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import lombok.Data;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import lombok.Data;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.DIRECTION;
import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_LOCK_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_TIME_TYPE;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -1,7 +1,10 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWork;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -90,4 +93,17 @@ public class Work extends BaseCode {
@Column(name="PLAN_RESOURCE")
@ApiParam(value ="计划主资源")
private String planResource;
@Column(name="ORDER_ID")
@ApiParam(value ="订单")
private Long orderId;
public BaseOrder getOrder() {
return BeanRelation.get(this, EWork.Order);
}
public void setOrder(BaseOrder order) {
this.orderId = order != null ? order.getId() : 0l;
BeanRelation.set(this, EWork.Order, order);
}
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE;
import io.swagger.annotations.Api;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.aps.bean;
package cn.estsh.i3plus.pojo.aps.common;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import lombok.Data;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.aps.bean;
package cn.estsh.i3plus.pojo.aps.common;
import io.swagger.annotations.ApiParam;
import lombok.Data;

@ -0,0 +1,8 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DATA_LINK_TYPE {
CSV,
MYSQL,
ORACLE,
SQLSERVER
}

@ -0,0 +1,6 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum IMPORT_DETAIL_TYPE {
REPLACE,
DIFF
}

@ -0,0 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EExportDetail {
Project
}

@ -0,0 +1,6 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EExportProject {
Link,
Details
}

@ -0,0 +1,6 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EImportProject {
Link,
Details
}

@ -0,0 +1,10 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import lombok.Data;
@Data
public class APSPager extends Pager {
private String filter;
private String sort;
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.DataLink;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface DataLinkRepository extends CrudRepository<DataLink, Long> {
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ExportDetail;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ExportDetailRepository extends CrudRepository<ExportDetail, Long> {
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ExportProject;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ExportProjectRepository extends CrudRepository<ExportProject, Long> {
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ImportDetail;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ImportDetailRepository extends CrudRepository<ImportDetail, Long> {
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ImportProject;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ImportProjectRepository extends CrudRepository<ImportProject, Long> {
}

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ExportProject">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
</Relation>
<Relation field="Details" name="ExportDetail" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ImportProject">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
</Relation>
<Relation field="Details" name="ImportDetail" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="Material">
<Relation field="ProductRouting" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="ProductRouting" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -12,6 +12,82 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_JUDGE_FLAG {
EQUAL("=", "等于"),
NOT_EQUAL("!=", "不等于"),
GREATER_THAN(">", "大于"),
NOT_LESS_THAN(">=", "大于大于"),
LESS_THAN("<", "小于"),
NOT_GREATER_THAN("<=", "小于等于");
private String value;
private String description;
MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_LOGIC_FLAG {
AND("&&", "逻辑与"),
OR("||", "逻辑或");
private String value;
private String description;
MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesWorkOrderapprovalStatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -554,7 +630,7 @@ public class MesEnumUtil {
}
/**
* MesPlanOrdersource
* MesWorkOrdersource
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_SOURCE {

@ -14,7 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :mes
* @Description :mes
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-09-19
@ -25,26 +25,36 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_STATUS")
@Api("系统业务动作")
public class MesStatus extends BaseBean {
@Column(name="STATUS_CODE")
@ApiParam("状态代码")
private String statusCode;
@Table(name="MES_BUTTON_STATUS")
@Api("按钮状态配置表")
public class MesButtonStatus extends BaseBean {
@Column(name="STATUS_NAME")
@ApiParam("状态名称")
private String statusName;
@Column(name="BUTTON_CODE")
@ApiParam("按钮代码")
private String buttonCode;
@Column(name="STATUS_VALUE")
@ApiParam("状态值")
private Integer statusValue;
@Column(name="CLASS_NAME")
@ApiParam("实体类名称")
private String ClassName;
@Column(name="STATUS_FIELD")
@ApiParam("状态字段")
private String statusField;
public int getStatusValueVal() {
return this.statusValue == null ? 0 : this.statusValue;
}
@Column(name="JUDGE_FLAG")
@ApiParam("判断符合")
private String judgeFlag;
@Column(name="STATUS_VALUE")
@ApiParam("状态值")
private String statusValue;
@Column(name="LOGIC_FLAG")
@ApiParam("逻辑符合")
private String logicFlag;
@Column(name="STATUS_DESC")
@ApiParam("描述")
private String statusDesc;
}

@ -187,6 +187,10 @@ public class MesWorkOrder extends BaseBean {
@ApiParam("mes生产工单页面按钮控制")
private MesWorkOrderButtonModel workOrderButtonModel;
@Transient
@ApiParam(value="下达按钮编号")
public String buttonCode;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesButtonStatus;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-09-23
* @Modify:
**/
@Repository
public interface MesButtonStatusRepository extends BaseRepository<MesButtonStatus, Long> {
}

@ -1215,4 +1215,19 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
return packBean;
}
/**
*
*
* @param organizeCode
* @return
*/
public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode);
if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) {
DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean);
}
packBean.setOrderByStr(buttonStatus.orderBy());
return packBean;
}
}

@ -63,7 +63,7 @@ public class WmsDocMovementSn extends BaseBean {
public String unit;
/**
*
* itemStatus
*/
@Column(name="SN_STATUS")
@ApiParam(value = "操作状态", example = "10")
@ -105,4 +105,8 @@ public class WmsDocMovementSn extends BaseBean {
@Transient
@ApiParam("ERP库存地")
private String erpWhNo;
@Transient
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus;
}

@ -37,7 +37,7 @@ import java.util.List;
@Index(columnList = "FIX_LOT_NO"),
@Index(columnList = "DATE_CODE"),
@Index(columnList = "VENDOR_NO")
})
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@ -118,26 +118,26 @@ public class WmsStockSn extends BaseBean {
*/
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
private Integer qcStatus;
/**
* 1=10=20=30=40=50=60=70=
*/
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
private Integer snStatus;
/**
* 1:2
*/
@Column(name = "PRINTED")
@ApiParam(value = "是否打印", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
private Integer printed;
@Column(name = "PDATE")
@ApiParam(value = "打印时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pdate;
/**
* 1=ASN,10=PO,20=SO
@ -160,7 +160,7 @@ public class WmsStockSn extends BaseBean {
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
private Integer snType = 10;
@ApiParam(value = "仓库名称")
@ -246,9 +246,10 @@ public class WmsStockSn extends BaseBean {
@Transient
private Integer isSnapshot;
public WmsStockSn(){}
public WmsStockSn() {
}
public WmsStockSn(String partNo){
public WmsStockSn(String partNo) {
this.partNo = partNo;
}
@ -256,17 +257,33 @@ public class WmsStockSn extends BaseBean {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}
public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
public Integer getSnType() {
return snType == null ? 0 : snType.intValue();
}
public Double getQty() {
return qty == null ? 0L : qty.doubleValue();
}
public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
public Double getInputNCQty() {
return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();
}
public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) {
public WmsStockSn(Long snCount, Double sumPartQty, String locateNo) {
this.snCount = snCount;
this.sumPartQty = sumPartQty;
this.locateNo = locateNo;
}
//locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid
public WmsStockSn(String locateNo, String partNo, Integer snStatus,
Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) {
this.locateNo = locateNo;
this.partNo = partNo;
this.snStatus = snStatus;
this.qcStatus = qcStatus;
this.qty = qty;
this.isDeleted = isDeleted;
this.isValid = isValid;
}
}

Loading…
Cancel
Save