yun-zuoyi
陈思洁 5 years ago
commit 381ff0c974

@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -29,10 +30,12 @@ public class HeuristicRule extends BaseRule {
@ApiParam(value ="工作筛选")
private String workFilter;
@Lob
@Column(name="WORK_SORT")
@ApiParam(value ="工作排序")
private String workSort;
@Lob
@Column(name="RES_SELECT")
@ApiParam(value ="资源选择")
private String resSelect;

@ -95,7 +95,7 @@ public class ProductOrder extends BaseOrder {
@Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充")
@FieldAnnotation(defaultValue = "true")
@FieldAnnotation(defaultValue = "false", display = false)
private Boolean autoSupply;
@Column(name="PRODUCT_ROUTING_ID")

@ -137,10 +137,10 @@ public class Pager {
public int getStartRow() {
if(pageSize > 0){
if(currentPage >= 1){
return currentPage * pageSize - pageSize;
}else {
return 0;
if (currentPage >= 1) {
startRow = currentPage * pageSize - pageSize;
} else {
startRow = 0;
}
}
return startRow;

@ -664,7 +664,6 @@ public class ApsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_SORT_RULE {
NONE("NONE", "非内置"),
ORDER_LET("ORDER_LET", "订单交货期"),
ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"),
ORDER_EST("ORDER_EST", "订单最早开始时刻"),
@ -682,7 +681,8 @@ public class ApsEnumUtil {
WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),
TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"),
TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"),
TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级");
TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"),
CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");
private String value;
private String description;

@ -1251,7 +1251,7 @@ public class ImppEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOG_STORAGE {
MONGO(1, "MongoDB"),
// MONGO(1, "MongoDB"),
ELASTICSEARCH(2, "Elasticsearch");
private int value;
private String description;

@ -3190,8 +3190,8 @@ public class MesEnumUtil {
EXEC(10, "执行方法"),
COMPLETE(20, "完成方法"),
HNC_ISSUED(30,"队列自动下达"),
LABEL_PROPERTIES(40,"标签属性查询方法");
HNC_ISSUED(30, "队列自动下达"),
LABEL_PROPERTIES(40, "标签属性查询方法");
private int value;
private String description;
@ -5826,9 +5826,9 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLC_DATA_TYPE {
STRING("10", "String", "字符串"),
BOOLEAN("20","Boolean", "布尔"),
BOOLEAN("20", "Boolean", "布尔"),
WORD("30", "Word", "整形-Word"),
DWORD("40","Dword", "整形-DWord"),
DWORD("40", "Dword", "整形-DWord"),
LONG("50", "Long", "长整形-Long"),
SHORT("60", "Short", "UShort"),
DOUBLE("70", "Double", "双精度-Double"),
@ -5845,7 +5845,7 @@ public class MesEnumUtil {
private String code;
private String description;
PLC_DATA_TYPE(String value, String code,String description) {
PLC_DATA_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -5868,6 +5868,7 @@ public class MesEnumUtil {
}
return tmp;
}
public static String codeOfValue(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -6700,10 +6701,10 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QAD_DATA_OBJECT {
BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom","BOM"),
CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem","getCustomerPartList", "MesCustomerPart","客户物料号"),
CUSTOMER("soapenv#Envelope#SyncCustomer","getCustomerList", "MesCustomer","客户信息"),
PART("soapenv#Envelope#SyncItem","getPartList", "MesPart","物料信息");
BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom", "BOM"),
CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem", "getCustomerPartList", "MesCustomerPart", "客户物料号"),
CUSTOMER("soapenv#Envelope#SyncCustomer", "getCustomerList", "MesCustomer", "客户信息"),
PART("soapenv#Envelope#SyncItem", "getPartList", "MesPart", "物料信息");
private String code;
private String method;
@ -6984,4 +6985,74 @@ public class MesEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EXTRACT_OBJECT_TYPE {
MODEL(10, "实体对象(单表)"),
PRODUCT_DATA(20, "动态对象(生产数据表)");
private Integer value;
private String description;
EXTRACT_OBJECT_TYPE(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COEFFICIENT_TYPE {
CONTROL(10, "控制限系数"),
CENTER(20, "中心线系数");
private Integer value;
private String description;
COEFFICIENT_TYPE(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -2596,7 +2596,6 @@ public class MesPcnEnumUtil {
ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
//TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件");
private String value;
private String description;
@ -3560,7 +3559,7 @@ public class MesPcnEnumUtil {
JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"),
NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"),
CLEAR_CACHE(50, "CLEAR_CACHE", "工步已清空缓存执行完工步之后无需放入StationRequestBean");
private int value;
private String code;
private String description;
@ -4854,4 +4853,39 @@ public class MesPcnEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCHEDULING_RECORD_STATUS {
PENDING(10, "待处理"),
PROCESSED(20, "已处理");
private Integer value;
private String description;
SCHEDULING_RECORD_STATUS(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -858,7 +858,9 @@ public class WmsEnumUtil {
MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
PROD_SCRAP(680, "PROD_SCRAP", "生产报废"),
OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"),
OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回");
OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"),
WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"),
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库");
private int value;
private String code;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -143,4 +143,8 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "JIS_BACKFLUSH_STATUS")
@ApiParam("回冲状态")
private String jisBackflushStatus;
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
}

@ -47,6 +47,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable {
@ApiParam("缓存类型")
private Integer cfgType;
@Column(name = "SEQ")
@ApiParam("排序号")
private Integer seq;
@Transient
@ApiParam("当前JIT缓存数")
private Integer currentJitCacheNum;

@ -49,4 +49,8 @@ public class MesJitLockCache extends BaseBean implements Serializable {
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "JIT_SEQ")
@ApiParam("JIT排序号")
private String jitSeq;
}

@ -52,4 +52,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable {
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;
@Column(name = "JIT_SEQ")
@ApiParam("JIT排序号")
private String jitSeq;
}

@ -46,6 +46,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
@ApiParam("方法代码")
private String methodCode;
@Column(name = "BATCH_METHOD_CODE")
@ApiParam("批量方法代码")
private String batchMethodCode;
@ApiParam(value = "第二个模板内容")
private String otherTemplateContent;

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/8/29 5:11
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCHEDULING_RECORD")
@Api("MES_排程记录表")
public class MesSchedulingRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 5841185737664839362L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
}

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/8/24 17:47
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SPC_CONTROL_COEFFICIENT")
@Api("MES_SPC控制图系数")
public class MesSpcControlCoefficient extends BaseBean implements Serializable {
private static final long serialVersionUID = -2790965693171941915L;
@Column(name = "SINGLE_GROUP_QTY")
@ApiParam("子组容量")
private Integer singleGroupQty;
@Column(name = "COEFFICIENT_TYPE")
@ApiParam("系数类型")
private String coefficientType;
@Column(name = "COEFFICIENT_CODE")
@ApiParam("系数代码")
private String coefficientCode;
@Column(name = "COEFFICIENT_DESC")
@ApiParam("系数描述")
private String coefficientDesc;
@Column(name = "COEFFICIENT_VALUE")
@ApiParam("系数值")
private Double coefficientValue;
}

@ -0,0 +1,70 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/8/24 17:47
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SPC_KEY_DATA")
@Api("MES_SPC关键数据")
public class MesSpcKeyData extends BaseBean implements Serializable {
private static final long serialVersionUID = 2255345691671062029L;
@Column(name = "KD_CODE")
@ApiParam("关键数据代码")
private String kdCode;
@Column(name = "KD_NAME")
@ApiParam("关键数据名称")
private String kdName;
@Column(name = "NOMINAL_VALUE")
@ApiParam("公称值")
private Double nominalValue;
@Column(name = "SPEC_USL")
@ApiParam("规格上限")
private Double specUsl;
@Column(name = "SPEC_LSL")
@ApiParam("规格下限")
private Double specLsl;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "OBJECT_TYPE")
@ApiParam("取值对象类型")
private Integer objectType;
@Column(name = "OBJECT_CODE")
@ApiParam("取值对象")
private String objectCode;
@Column(name = "FIELD_CODE")
@ApiParam("取值字段")
private String fieldCode;
@Column(name = "KD_CONDITION")
@ApiParam("取值条件")
private String kdCondition;
}

@ -0,0 +1,134 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/8/24 16:50
* @desc
*/
public class BarRequestModel {
@ApiParam("产线")
private String workCenterCode;
@ApiParam("关键数据代码")
private String keyData;
@ApiParam("零件号")
private List<String> partNos;
@ApiParam("单组数量")
private Integer count;
@ApiParam("组数")
private Integer groupCount;
@ApiParam("总数")
private Integer totalCount;
@ApiParam("开始时间")
private String startTime;
@ApiParam("结束时间")
private String endTime;
@ApiParam("均值图")
private boolean xbar;
@ApiParam("极差图")
private boolean rbar;
@ApiParam("正太分布图")
private boolean normalDistribution;
public String getWorkCenterCode() {
return workCenterCode;
}
public void setWorkCenterCode(String workCenterCode) {
this.workCenterCode = workCenterCode;
}
public String getKeyData() {
return keyData;
}
public void setKeyData(String keyData) {
this.keyData = keyData;
}
public List<String> getPartNos() {
return partNos;
}
public void setPartNos(List<String> partNos) {
this.partNos = partNos;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public Integer getGroupCount() {
return groupCount;
}
public void setGroupCount(Integer groupCount) {
this.groupCount = groupCount;
}
public Integer getTotalCount() {
return this.count * this.groupCount;
}
public void setTotalCount(Integer totalCount) {
this.totalCount = totalCount;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public boolean isXbar() {
return xbar;
}
public void setXbar(boolean xbar) {
this.xbar = xbar;
}
public boolean isRbar() {
return rbar;
}
public void setRbar(boolean rbar) {
this.rbar = rbar;
}
public boolean isNormalDistribution() {
return normalDistribution;
}
public void setNormalDistribution(boolean normalDistribution) {
this.normalDistribution = normalDistribution;
}
}

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
@ -19,6 +20,9 @@ public class MesPaintSnPrintModel implements Serializable {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("过程条码数组")
private List<String> serialNumberList;
@ApiParam("产品条码")
private String produceSn;

@ -0,0 +1,98 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/8/26 14:46
* @desc
*/
@Data
public class NormalDistributionModel {
@ApiParam("尺寸上限")
private Double usl;
@ApiParam("尺寸下限")
private Double lsl;
@ApiParam("柱状图")
private List<Integer> bar = new ArrayList<>();
@ApiParam("曲线图")
private List<Double> line = new ArrayList<>();
@ApiParam("平均均值-绿线")
private List<Double> xAxis = new ArrayList<>();
@ApiParam("数据个数")
private Integer totalCount;
@ApiParam("数据总数")
private Double totalDataSum;
@ApiParam("平均均值")
private Double xbarbar;
@ApiParam("平均极差")
private Double rbar;
@ApiParam("最大值")
private Double maxValue;
@ApiParam("最小值")
private Double minValue;
@ApiParam("低于下限数据个数")
private Integer belowLowerLimitCount;
@ApiParam("高于上限数据个数")
private Integer aboveUpperLimitCount;
@ApiParam("d2")
private Double d2;
@ApiParam("n")
private Integer n;
@ApiParam("高能力指数")
private Double cpu;
@ApiParam("低能力指数")
private Double cpl;
@ApiParam("过程能力指数")
private Double cp;
@ApiParam("过程能力")
private Double cpk;
@ApiParam("过程比率")
private Double cr;
@ApiParam("标准偏差n")
private Double stdOffset;
@ApiParam("标准偏差n-1")
private Double stdOffsetMinusOne;
@ApiParam("方差n")
private Double variance;
@ApiParam("方差n-1")
private Double varianceMinusOne;
@ApiParam("性能指数")
private Double pp;
@ApiParam("性能比率")
private Double pr;
@ApiParam("性能指数")
private Double ppk;
}

@ -0,0 +1,32 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/8/25 16:23
* @desc
*/
@Data
public class RbarModel {
@ApiParam("控制上限")
private Double ucl;
@ApiParam("控制下限")
private Double lcl;
@ApiParam("极差-蓝线 key组号value值")
private List<Double> maxGap = new ArrayList<>();
@ApiParam("平均极差-绿线")
private Double rbar;
@ApiParam("标准差")
private Double stdDev;
}

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/8/29 10:04
* @Modify:
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class TorqueGatherModel {
@ApiParam("枪号")
private String torqueNo;
@ApiParam("扭矩值")
private String torqueValue;
@ApiParam("扭矩角")
private String torqueAngle;
@ApiParam("是否合格")
private String isQualified;
}

@ -0,0 +1,33 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/8/25 16:22
* @desc
*/
@Data
public class XbarModel {
@ApiParam("控制上限")
private Double ucl;
@ApiParam("控制下限")
private Double lcl;
@ApiParam("均值-蓝线 key组号value值")
private List<Double> xbar = new ArrayList<>();
@ApiParam("平均均值-绿线")
private Double xbarbar;
@ApiParam("标准差")
private Double stdDev;
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesSchedulingRecord;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/8/29 5:15
* @Modify:
*/
@Repository
public interface MesSchedulingRecordRepository extends BaseRepository<MesSchedulingRecord, Long> {
}

@ -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.MesSpcControlCoefficient;
import org.springframework.stereotype.Repository;
/**
* @Description : if
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-28 16:49
* @Modify:
**/
@Repository
public interface MesSpcControlCoefficientRepository extends BaseRepository<MesSpcControlCoefficient, Long> {
}

@ -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.MesSpcKeyData;
import org.springframework.stereotype.Repository;
/**
* @Description : if
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-28 16:49
* @Modify:
**/
@Repository
public interface MesSpcKeyDataRepository extends BaseRepository<MesSpcKeyData, Long> {
}

@ -105,6 +105,58 @@ public class PrintOrderDataModel implements Serializable {
@Transient
public String receiveDateTime;
@Transient
@ApiParam("类型名称")
public String busiTypeName;
@Transient
@ApiParam("物料编号")
public String partNo;
@ApiParam(value = "标题")
@Transient
public String title;
@Transient
@ApiParam(value = "客户简称")
private String custName;
@Transient
@ApiParam(value = "客户全称")
private String custDesc;
@Transient
@ApiParam(value = "客户地址")
private String custAddr;
@Transient
@ApiParam(value = "联系人")
private String custOwner;
@Transient
@ApiParam(value = "电话号码")
private String custTel;
@Transient
@ApiParam("业务类型")
public Integer busiType;
@Transient
@ApiParam("源存储区代码")
public String srcZoneNo;
@Transient
@ApiParam(value = "生产小组")
private String productionGroup;
@Transient
@ApiParam(value="修改日期查询用,查询起始日期")
public String modifyDateTimeStart;
@Transient
@ApiParam(value = "修改日期查询用,查询结束日期")
public String modifyDateTimeEnd;
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();

@ -108,6 +108,15 @@ public class BsSuitCase extends BaseBean {
return isNeedCertification.intValue();
}
@Column(name = "IS_SAVE_EMPTY_MSG")
@ApiParam(value = "是否保存空报文")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isSaveEmptyMsg;
public int getIsSaveEmptyMsgVal(){
return isSaveEmptyMsg == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSaveEmptyMsg;
}
@Column(name = "IS_PUSH_MQ")
@ApiParam(value = "是否推送MQ")
private Integer isPushMQ;

@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.List;
import java.util.Map;
/**
* @Description :
@ -137,6 +138,8 @@ public class BsSuitRecord extends BaseBean {
@ApiParam(value = "脚本结果")
private String scriptResult;
/************************************** 临时属性 ***************************************/
@Transient
@ApiParam(value = "适配记录参数")
private List<BsSuitRecordParam> bsSuitRecordParamList;
@ -154,6 +157,10 @@ public class BsSuitRecord extends BaseBean {
private List<BsSuitFile> bsSuitFileList;
@Transient
@ApiParam(value = "日志长文本记录集合<关联类型,记录内容>")
private Map<Integer ,BsLongData> bsLongDataMap;
@Transient
@ApiParam(value = "适配记录报文-查询条件")
private String searchMessage;

@ -28,8 +28,11 @@ import javax.persistence.Table;
@Table(name = "WMS_ACTION_MODULE")
@Api("作业步骤处理组件")
public class WmsActionModule extends BaseBean {
private static final long serialVersionUID = 9117362998863937579L;
private static final int TRUE = 1;
private static final int FALSE = 2;
@Column(name = "AM_NAME",nullable = false)
@ApiParam("组件名称")
@AnnoOutputColumn
@ -63,6 +66,22 @@ public class WmsActionModule extends BaseBean {
@ApiParam(value = "作业类型名称")
public String opTypeName;
@Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2")
@ApiParam(value = "是否脚本组件")
private Integer isScriptModule = FALSE;
/**
*
* @return
*/
public boolean isScriptModule() {
if (this.isScriptModule != null && this.isScriptModule.intValue() == TRUE) {
return true;
}
return false;
}
public WmsActionModule() {
}

@ -11,11 +11,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -117,6 +113,7 @@ public class WmsCSOrderDetails extends BaseBean {
public String vendorNo;
@Column(name = "LOT_NO", nullable = false)
@ColumnDefault("")
@ApiParam("收货批次")
public String lotNo = "";

@ -248,6 +248,9 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "替代物料编码")
private String subPartNo;
@Transient
@ApiParam(value = "颜色")
private String color;
@Transient
@ApiParam(value = "替代物料名称")
@ -474,4 +477,31 @@ public class WmsDocMovementDetails extends BaseBean {
this.createDatetime = createDatetime;
}
public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, String color) {
this.id = wmsDocMovementDetails.getId();
this.orderNo = wmsDocMovementDetails.getOrderNo();
this.partNo = wmsDocMovementDetails.getPartNo();
this.qty = wmsDocMovementDetails.getQty();
this.seqNo = wmsDocMovementDetails.getSeqNo();
this.partNameRdd = wmsDocMovementDetails.getPartNameRdd();
this.partSpec = wmsDocMovementDetails.getPartSpec();
this.workOrderCode = wmsDocMovementDetails.getWorkOrderCode();
this.productionGroup = wmsDocMovementDetails.getProductionGroup();
this.item = wmsDocMovementDetails.getItem();
this.planTime = wmsDocMovementDetails.getPlanTime();
this.planDate = wmsDocMovementDetails.getPlanDate();
this.unit = wmsDocMovementDetails.getUnit();
this.custNo = wmsDocMovementDetails.getCustNo();
this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo();
this.srcWhNo = wmsDocMovementDetails.getSrcWhNo();
this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo();
this.destWhNo = wmsDocMovementDetails.getDestWhNo();
this.destZoneNo = wmsDocMovementDetails.getDestZoneNo();
this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo();
this.destAreaNo = wmsDocMovementDetails.getDestAreaNo();
this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
this.color = color;
}
}

@ -277,6 +277,14 @@ public class WmsDocMovementMaster extends BaseBean {
public String title;
@Transient
@ApiParam(value = "生产小组")
private String productionGroup;
@Transient
@ApiParam(value = "父位置号")
private String seqNo;
@Transient
@ApiParam("物料编号组")
public String[] partNos;
@ -284,6 +292,42 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam("工厂集合")
private List<String> organizeCodeList;
@Transient
@ApiParam("物料名称")
public String partNameRdd;
@Transient
@ApiParam(value = "简称")
private String partSpec;
@Transient
@ApiParam(value = "工单码")
private String workOrderCode;
@Transient
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Transient
@ApiParam(value = "客户简称")
private String custName;
@Transient
@ApiParam(value = "客户全称")
private String custDesc;
@Transient
@ApiParam(value = "客户地址")
private String custAddr;
@Transient
@ApiParam(value = "联系人")
private String custOwner;
@Transient
@ApiParam(value = "电话号码")
private String custTel;
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}
@ -299,4 +343,32 @@ public class WmsDocMovementMaster extends BaseBean {
public WmsDocMovementMaster() {
}
public WmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster,String seqNo,String assignSrcZoneNo,String partNo,String partNameRdd,
String partSpec,String workOrderCode,Double qty,String productionGroup,Integer busiType,String modifyDatetime,
String custName,String custDesc,String custAddr,String custOwner,String custTel) {
this.id = wmsDocMovementMaster.getId();
this.orderNo = wmsDocMovementMaster.getOrderNo();
this.custNo = wmsDocMovementMaster.getCustNo();
this.organizeCode = wmsDocMovementMaster.getOrganizeCode();
this.orderStatus = wmsDocMovementMaster.getOrderStatus();
this.vendorNo = wmsDocMovementMaster.getVendorNo();
this.erpSrcNo = wmsDocMovementMaster.getErpSrcNo();
this.seqNo = seqNo;
this.assignSrcZoneNo = assignSrcZoneNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.partSpec = partSpec;
this.workOrderCode = workOrderCode;
this.qty = qty;
this.productionGroup = productionGroup;
this.busiType = busiType;
this.modifyDatetime = modifyDatetime;
// this.color = color;
this.custName = custName;
this.custDesc = custDesc;
this.custAddr = custAddr;
this.custOwner = custOwner;
this.custTel = custTel;
}
}

@ -180,6 +180,10 @@ public class WmsMoveSn extends BaseBean {
public String serialSn;
@Transient
@ApiParam("客户编号")
public String custNo;
@Transient
@ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
private Integer busiTypeCode;
@ -376,4 +380,25 @@ public class WmsMoveSn extends BaseBean {
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
public WmsMoveSn(String partNo, String partNameRdd,String sn,String vendorNo,String custNo,String srcLocateNo,String destLocateNo,String srcZoneNo,
Double srcQty,Double destQty,String orderNo,String srcWhNo, Integer srcQcStatus ,Integer descQcStatus,
Integer srcSnStatus,Integer destSnStatus ) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.sn = sn;
this.vendorNo = vendorNo;
this.custNo = custNo;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.srcZoneNo = srcZoneNo;
this.srcQty = srcQty;
this.destQty = destQty;
this.orderNo = orderNo;
this.srcWhNo = srcWhNo;
this.srcQcStatus = srcQcStatus;
this.descQcStatus = descQcStatus;
this.srcSnStatus = srcSnStatus;
this.destSnStatus = destSnStatus;;
}
}

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.wms.engine.rule;
import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -54,5 +53,10 @@ public class GenerateLocateRule {
*/
private boolean orderByAxle;
/**
*
*/
private boolean isEmptyLocate;
}

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-08-31 9:44
* @Modify:
**/
@Data
@Api("委外扣减库存模型")
public class WmsShipModel extends BaseBean {
@ApiParam(value ="组织代码")
public String organizeCode;
@ApiParam("物料编码")
private String shipPartNo;
@ApiParam("物料名称")
public String shipPartName;
@ApiParam("简称及版本")
private String rcPartNo;
@ApiParam("项目名称")
private String prodCfgTypeName;
@ApiParam("单位")
public String unit;
@ApiParam("委外发运数量")
public Double shipQty;
@ApiParam("发运存储区代码")
public String shipZoneNo;
@ApiParam("ASN收货数量")
private Double rcQty;
@ApiParam("ASN收货存储区代码")
public String rcZoneNo;
@ApiParam("委外库存数量")
private Double shipStockQty;
@ApiParam("委外发运时间")
private String shipTime;
@ApiParam(value="发运时间,查询起始日期")
public String shipTimeStart;
@ApiParam(value = "发运时间,查询结束日期")
public String shipTimeEnd;
}

@ -3481,4 +3481,23 @@ public class WmsHqlPack {
return result;
}
/**
*
*
* @param wmsEnum
* @return
*/
public static DdlPackBean packHqlWmsEnum(WmsEnum wmsEnum) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsEnum.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumType(), "enumType", result);
DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumValue(), "enumValue", result);
getStringBuilderPack(wmsEnum, result);
return result;
}
}

Loading…
Cancel
Save