I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【冲突】

Browse Source
yun-zuoyi
陈思洁 5 years ago
parent 2de0d76af3 063ba20f74
commit ddc00a617b
32 changed files with 712 additions and 76 deletions
Show Stats Download Patch File Download Diff File

24
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java
Unescape Escape View File

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import java.util.Map;
@ -16,37 +16,37 @@ import java.util.Map;
**/
public class BaseResultBean<Obj> {
@ApiParam("是否成功")
@ApiModelProperty("是否成功")
public boolean success;
@ApiParam("信息代码-国际化")
@ApiModelProperty("信息代码-国际化")
public String code;
@ApiParam("操作消息")
@ApiModelProperty("操作消息")
public String msg;
@ApiParam("错误消息")
@ApiModelProperty("错误消息")
public String errorMsg;
@ApiParam("http路径")
@ApiModelProperty("http路径")
public String url;
@ApiParam("List结果集")
@ApiModelProperty("List结果集")
public List<Obj> resultList;
@ApiParam("单个结果")
@ApiModelProperty("单个结果")
public Obj resultObject;
@ApiParam("翻页和结果集")
@ApiModelProperty("翻页和结果集")
public ListPager<Obj> listPager;
@ApiParam("Map结果集")
@ApiModelProperty("Map结果集")
public Map<String, Object> resultMap;
@ApiParam("翻页操作")
@ApiModelProperty("翻页操作")
public Pager pager;
@ApiParam("总记录数")
@ApiModelProperty("总记录数")
public int totalCount;
public boolean isSuccess() {

50
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -7899,7 +7899,6 @@ public class MesEnumUtil {
}
/**
* 物料 物料类型1
*/
@ -8095,4 +8094,53 @@ public class MesEnumUtil {
}
}
/**
* 展示供应商代码
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SHOW_SUPPLIER_CODE {
MGN(10, "麦格纳"),
OTHER(20, "其他"),
ALL(99, "全部");
private int value;
private String description;
SHOW_SUPPLIER_CODE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getValueStr() {
return value + "";
}
public String getDescription() {
return description;
}
public static MesEnumUtil.SHOW_SUPPLIER_CODE getByValue(Integer value) {
for (MesEnumUtil.SHOW_SUPPLIER_CODE showSupplierCode : values()) {
if (showSupplierCode.getValue() == value) {
return showSupplierCode;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

106
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java
Unescape Escape View File

@ -136,6 +136,59 @@ public class SwebEnumUtil {
}
/**
* 单据条码状态（PO/DOC_MOVE）
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SN_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
PRINTED(40, "C", "已打印");
private int value;
private String code;
private String description;
ORDER_SN_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* PO订单来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -706,59 +759,6 @@ public class SwebEnumUtil {
}
/**
* 单据条码状态（PO/DOC_MOVE）
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SN_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
PRINTED(40, "C", "已打印");
private int value;
private String code;
private String description;
ORDER_SN_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 条码类型 10=实物条码，20=虚拟条码
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
Unescape Escape View File

@ -79,6 +79,10 @@ public class BfDataObjectProperty extends BaseBean {
@ApiParam(value ="是否主键")
private Integer isPrimaryKey;
public boolean isPrimaryKey(){
return isPrimaryKey != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isPrimaryKey);
}
@Column(name="IS_NULLABLE")
@ApiParam(value = "是否允许为空")
private Integer isNullable;

6
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
Unescape Escape View File

@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -140,6 +141,11 @@ public class BfElement extends BaseBean {
@ApiParam(value = "是否导出")
private Integer isObjectExport;
@ColumnDefault("2")
@Column(name = "IS_OBJECT_IMPORT")
@ApiParam(value = "是否导入")
private Integer isObjectImport;
@Column(name="ELEMENT_SORT_ATTR_ID")
@ApiParam(value ="默认排序属性")
@JsonSerialize(using = ToStringSerializer.class)

13
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -87,6 +88,10 @@ public class BfElementProperty extends BaseBean {
@ApiParam(value = "是否必填")
private Integer propertyValueNotNull;
public boolean isPropValNotNull() {
return propertyValueNotNull == null || propertyValueNotNull == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
}
@Column(name = "PROPERTY_IS_FIND")
@ApiParam(value = "是否查询条件")
private Integer propertyIsFind;
@ -123,6 +128,14 @@ public class BfElementProperty extends BaseBean {
@ApiParam(value = "显示顺序")
private Integer propertySort;
@Column(name = "IS_SUPPORT_IMPORT")
@ApiParam(value = "是否支持导入")
private Integer isSupportImport;
public boolean isSupportImport() {
return isSupportImport != null && isSupportImport == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
}
@Column(name = "PROPERTY_CONTROL_TYPE")
@ApiParam(value = "控件类型")
private Integer propertyControlType;

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
Unescape Escape View File

@ -44,6 +44,18 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("缺陷类型")
private String defectType;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "DEFECT_FLAG_VALUE")
@ApiParam("缺陷标识值")
private String defectFlagValue;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private String defectActionType;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
Unescape Escape View File

@ -25,7 +25,7 @@ import java.io.Serializable;
@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
}
}
)
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean implements Serializable {

1
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java
Unescape Escape View File

@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail;
/**

80
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java
Unescape Escape View File

@ -0,0 +1,80 @@
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.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: dominic
* @CreateDate: 2020/10/29 14:11
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PACKAGE")
@Api("料箱表")
public class IfPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 9099416791684702129L;
@Column(name = "PACKAGE_NO")
@ApiParam("包装编号")
private String packageNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@Column(name = "PORCESS_NAME")
@ApiParam("工序名称")
private String porcessName;
@Column(name = "RK_TYPE")
@ApiParam("料架类型")
private String rkType;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
}

44
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
Unescape Escape View File

@ -0,0 +1,44 @@
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 : MES_容器位置
* @Reference :
* @Author : dominic.xiao
* @CreateDate : 2020-11-02 17:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CONTAINER_LOCATION")
@Api("MES_容器位置")
public class MesContainerLocation extends BaseBean implements Serializable {
private static final long serialVersionUID = 8181007288150974903L;
@Column(name = "CT_CODE")
@ApiParam(value = "容器类型代码")
private String ctCode;
@Column(name = "CT_LOCATION_NO")
@ApiParam(value = "容器位置编号")
private String ctLocationNo;
@Column(name = "LOCATION_CAPACITY")
@ApiParam(value = "默认容量")
private String locationCapacity;
}

60
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java
Unescape Escape View File

@ -0,0 +1,60 @@
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 : MES_客户条码规则
* @Reference :
* @Author : dominic.xiao
* @CreateDate : 2020-11-02 18:19
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER_SN_RULE")
@Api("MES_客户条码规则")
public class MesCustomerSnRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -3928160156339420471L;
@Column(name = "CUSTOMER_CODE")
@ApiParam(value = "客户代码")
private String customerCode;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam(value = "客户零件号")
private String customerPartNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料号")
private String partNo;
@Column(name = "LENGTH")
@ApiParam(value = "长度")
private Integer length;
@Column(name = "FROM1")
@ApiParam(value = "起始1")
private Integer from1;
@Column(name = "TO1")
@ApiParam(value = "至1")
private Integer to1;
@Column(name = "FIX1")
@ApiParam(value = "内容1")
private String fix1;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
Unescape Escape View File

@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private String defectActionType;
@Column(name = "DEFECT_FLAG_VALUE")
@ApiParam("缺陷标识值")
private String defectFlagValue;
@ -67,6 +71,7 @@ public class MesDefect extends BaseBean implements Serializable {
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
public MesDefect() {
}

39
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java
Unescape Escape View File

@ -0,0 +1,39 @@
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:
* @Reference:
* @Author: dominic
* @CreateDate: 2020\11\13 09:59
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_LOCATION")
@Api("产品缺陷位置")
public class MesDefectLocation extends BaseBean implements Serializable {
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置代码")
private String defectLocation;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷位置名称")
private String defectName;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
Unescape Escape View File

@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
@ApiParam("包装编码")
private String packageNo;
@Column(name = "CT_LOCATION_NO")
@ApiParam("容器位置编号")
private String ctLocationNo;
@Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam("过程条码")
private String serialNumber;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
Unescape Escape View File

@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable {
@ApiParam("包装编码")
private String packageNo;
@Column(name = "CT_LOCATION_NO", nullable = false)
@ApiParam("容器位置编号")
private String ctLocationNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;

48
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
Unescape Escape View File

@ -0,0 +1,48 @@
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;
/**
* @Description : MES_产品容器容量配置
* @Reference :
* @Author : dominic.xiao
* @CreateDate : 2020-11-02 18:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_CONTAINER_CAPACITY")
@Api("MES_产品容器容量配置")
public class MesPartContainerCapacity extends BaseBean {
private static final long serialVersionUID = 6438819635320965628L;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name = "CT_CODE")
@ApiParam(value = "容器类型代码")
private String ctCode;
@Column(name = "CT_LOCATION_NO")
@ApiParam(value = "容器位置编号")
private String ctLocationNo;
@Column(name = "CT_QTY")
@ApiParam(value = "容量")
private Integer ctQty;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java
Unescape Escape View File

@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable {
@ApiParam("面位")
private String sideLocation;
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置代码")
private String defectLocation;
@Column(name = "FILE_ID")
@ApiParam("文件id")
private Long fileId;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
Unescape Escape View File

@ -145,6 +145,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("通知标识")
private Integer noticeSign = 10;
@Column(name = "REPLACE_VIN_CODE")
@ApiParam("替换vin")
private String replaceVinCode;
@Transient
@ApiParam("创建时间")
private String cdtTruncated;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
Unescape Escape View File

@ -118,4 +118,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
@Transient
@ApiParam("计划上线结束时间")
private String planEndDate;
@Transient
@ApiParam("替换vin")
private String replaceVinCode;
}

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
Unescape Escape View File

@ -176,6 +176,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
@ApiParam("结束时间")
private String endTime;
@Transient
@ApiParam("数量")
private Double qty;
@Transient
@ApiParam("已生产数量")
private Double finsihQty;
public MesQueueOrder(){}
public int getStatusVal() {
@ -205,7 +213,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty,
Integer queueType,Integer status,String createUser,
String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo,
String workCenterCode, String workCellCode) {
String workCenterCode, String workCellCode, Double qty, Double finsihQty) {
this.id = id;
this.seq = seq;
this.partNo = partNo;
@ -221,6 +229,8 @@ public class MesQueueOrder extends BaseBean implements Serializable {
this.orderNo = orderNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.qty = qty;
this.finsihQty = finsihQty;
}
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java
Unescape Escape View File

@ -52,6 +52,9 @@ public class SparePartsImportModel {
@ApiParam("客户零件号")
private String custPartNo;
@ApiParam("替换VIN")
private String replaceVinCode;
@ApiParam("用量")
private Integer qty;

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: dominic
* @CreateDate: 2020\11\4 11:21
* @Modify:
**/
@Repository
public interface MesContainerLocationRepository extends BaseRepository<MesContainerLocation, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: dominic
* @CreateDate: 2020\11\4 13:33
* @Modify:
**/
@Repository
public interface MesCustomerSnRuleRepository extends BaseRepository<MesCustomerSnRule, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : dominic
* @CreateDate : 2020-11-10
* @Modify:
**/
@Repository
public interface MesPartContainerCapacityRepository extends BaseRepository<MesPartContainerCapacity, Long> {
}

70
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -730,6 +730,7 @@ public class MesHqlPack {
/**
* 产线看板矩阵
*
* @param boardLineMatrix
* @param organizeCode
* @return
@ -2488,6 +2489,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) {
DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
}
if (!StringUtils.isEmpty(queueJitActual.getReplaceVinCode())) {
DdlPreparedPack.getStringLikerPack(queueJitActual.getReplaceVinCode(), "replaceVinCode", packBean);
}
if (queueJitActual.getStatus() != null) {
DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);
}
@ -3548,7 +3552,7 @@ public class MesHqlPack {
* @return
*/
public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) {
DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode());
DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardCustomParamCfg.getOrganizeCode());
if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) {
DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean);
}
@ -3561,6 +3565,70 @@ public class MesHqlPack {
return packBean;
}
/**
* MES容器位置查询条件封装
*
* @param mesContainerLocation
* @return
*/
public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode());
if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) {
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean);
}
if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) {
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean);
}
if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) {
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean);
}
return packBean;
}
/**
* MES产品容器容量配置查询条件封装
*
* @param mesPartContainerCapacity
* @return
*/
public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode());
if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean);
}
if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean);
}
if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean);
}
return packBean;
}
/**
* MES客户条码规则查询条件封装
*
* @param mesCustomerSnRule
* @return
*/
public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode());
if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) {
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean);
}
if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
}
if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
}
return packBean;
}
public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) {
DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode());
DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean);

31
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java
Unescape Escape View File

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.base.dynamic.DynamicEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-11-17 16:32
* @Modify:
**/
@Data
@ApiModel("检查唯一返回结果model")
public class BfCheckOnlyResultModel {
@ApiModelProperty("是否唯一")
private boolean isOnly;
@ApiModelProperty("重复的数据")
private DynamicEntity repeatData;
@ApiModelProperty("异常信息")
private Exception exception;
public BfCheckOnlyResultModel() {
this.isOnly = true;
}
}

19
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java
Unescape Escape View File

@ -5,9 +5,9 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -16,12 +16,12 @@ import java.util.List;
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("mes导入结果model")
public class ExcelImportModel<T> implements Serializable {
private static final long serialVersionUID = 3075276018074690913L;
@ApiParam("结果")
private boolean result;
@ -32,7 +32,7 @@ public class ExcelImportModel<T> implements Serializable {
private int failRowNum;
@ApiParam("错误信息集合")
private List<ImportErrorModel> ImportErrorModels;
private List<ImportErrorModel> importErrorModels;
@ApiParam("错误的行号")
private String errorRows;
@ -46,4 +46,17 @@ public class ExcelImportModel<T> implements Serializable {
@ApiParam("Sheet名称")
private String sheetName;
public ExcelImportModel() {
result = true;
}
public void addErrorMsg(ImportErrorModel errorModel) {
if (importErrorModels == null) {
importErrorModels = new ArrayList<>();
}
importErrorModels.add(errorModel);
result = false;
}
}

64
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java
Unescape Escape View File

@ -21,9 +21,19 @@ import java.io.Serializable;
public class ImportErrorModel implements Serializable {
private static final long serialVersionUID = 1212013821950324792L;
@ApiParam("sheet名称")
private String sheetName;
@ApiParam("错误的行号")
private int rowNum;
@ApiParam("错误的列号")
private int colNum;
@ApiParam("错误的列名")
private String colName;
@ApiParam("错误数量")
private int errorNum;
@ -33,4 +43,58 @@ public class ImportErrorModel implements Serializable {
@ApiParam("错误描述")
private String errorInfo;
public static final class Builder {
private String sheetName;
private int rowNum;
private int colNum;
private String colName;
private String errorInfo;
private Builder() {
}
public static Builder newBuilder() {
return new Builder();
}
public Builder withSheetName(String sheetName) {
this.sheetName = sheetName;
return this;
}
public Builder withRowNum(int rowNum) {
this.rowNum = rowNum;
return this;
}
public Builder withColNum(int colNum) {
this.colNum = colNum;
return this;
}
public Builder withColName(String colName) {
this.colName = colName;
return this;
}
public Builder withErrorInfo(String errorInfo) {
this.errorInfo = errorInfo;
return this;
}
public ImportErrorModel build() {
ImportErrorModel importErrorModel = new ImportErrorModel();
importErrorModel.setSheetName(sheetName);
importErrorModel.setRowNum(rowNum);
importErrorModel.setColNum(colNum);
importErrorModel.setColName(colName);
if(errorInfo== null){
importErrorModel.setErrorInfo("SHEET【" + sheetName + "】中第【" + rowNum + "】行，第【" + colNum + "】列 " +
colName + " 数据为空");
}else {
importErrorModel.setErrorInfo(errorInfo);
}
return importErrorModel;
}
}
}

6
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
Unescape Escape View File

@ -59,6 +59,10 @@ public class SwebPurchaseOrderSn extends BaseBean {
@Column(name = "UNIT")
private String unit;
@Column(name = "SN_STATUS")
@ApiParam(value = "SN状态", example = "1")
private Integer snStatus;
@Column(name = "BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "箱数", example = "0")
@ -66,7 +70,7 @@ public class SwebPurchaseOrderSn extends BaseBean {
@Column(name = "SERIAL_NO")
@ApiParam(value = "序列号")
private String serialNo;
private Integer serialNo;
@Column(name = "SN")
@ApiParam(value = "箱条码")

15
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -696,10 +696,23 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
this.custNo = custNo;
}
public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) {
public WmsDocMovementDetails(String orderNo, String prodCfgTypeCode, String prodCfgTypeName,
Double qty, String planDate, String planTime, String custNo) {
this.orderNo = orderNo;
this.prodCfgTypeCode = prodCfgTypeCode;
this.prodCfgTypeName = prodCfgTypeName;
this.qty = qty;
this.planDate = planDate;
this.planTime = planTime;
this.custNo = custNo;
}
public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode, String custNo) {
this.orderNo = orderNo;
this.pickQty = pickQty;
this.prodCfgTypeCode = prodCfgTypeCode;
this.custNo = custNo;
}
}

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java
Unescape Escape View File

@ -35,6 +35,9 @@ public class WmsVendorDelayMasterModel extends BaseBean {
@ApiParam(value = "延迟次数")
private Long sumDelayCount;
@ApiParam(value = "延迟到货百分比")
private Double delayPercent;
@ApiParam(value = "查询开始时间")
private String startDateTime;
@ -62,7 +65,8 @@ public class WmsVendorDelayMasterModel extends BaseBean {
this.createDatetime = createDateTime;
}
public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime,
String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
this.orderNo = orderNo;
this.reason = reason;
this.planDate = planDate;

Write Preview
Loading…
Cancel
Save