diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index 83c5994..b234ae3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -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 { - @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 resultList; - @ApiParam("单个结果") + @ApiModelProperty("单个结果") public Obj resultObject; - @ApiParam("翻页和结果集") + @ApiModelProperty("翻页和结果集") public ListPager listPager; - @ApiParam("Map结果集") + @ApiModelProperty("Map结果集") public Map resultMap; - @ApiParam("翻页操作") + @ApiModelProperty("翻页操作") public Pager pager; - @ApiParam("总记录数") + @ApiModelProperty("总记录数") public int totalCount; public boolean isSuccess() { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 4d2d890..98ad82a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -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; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 95a12d9..bb8bf78 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2559,7 +2559,8 @@ public class MesPcnEnumUtil { public enum PACKAGE_OP_TYPE { PACK(10, "打包"), - UNPACK(20, "拆包"); + UNPACK(20, "拆包"), + STOP_OVER(30, "过站"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 2184f9a..a130b9b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -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) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 7d5ab65..e919715 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -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; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 3dcf892..5eec86d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -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) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 33d1bef..864ad93 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java new file mode 100644 index 0000000..c42ce77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -0,0 +1,53 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FURNACE_LOCATION") +@Api("MES_炉内模式位置信息") +public class MesFurnaceLocation extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404126L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "MODEL_IMG_URL") + @ApiParam("模式图片路径") + private String modelImgUrl; + + @Column(name = "SEQ") + @ApiParam("推荐顺序") + private Integer seq; + + @Transient + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java new file mode 100644 index 0000000..15e8fb0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java @@ -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; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FURNACE_LOCATION_DETAIL") +@Api("MES_炉内占位信息") +public class MesFurnaceLocationDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818212133126L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 770fcc1..fc5e470 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -153,6 +153,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("erp工作中心") private String erpWorkCenterCode; + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + @Transient @ApiParam("目标库位代码") private String destLocationCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 811165e..8315005 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -34,7 +34,7 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; - @Column(name = "CT_LOCATION_NO", nullable = false) + @Column(name = "CT_LOCATION_NO") @ApiParam("容器位置编号") private String ctLocationNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 3082b0c..83ae8a0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -58,5 +58,19 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java new file mode 100644 index 0000000..8ba6f09 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -0,0 +1,40 @@ +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/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FURNACE") +@Api("MES_物料上炉模式") +public class MesPartFurnace extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404111L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index ad5c91b..e2807df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index 04d6155..004377f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -118,4 +118,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Transient @ApiParam("计划上线结束时间") private String planEndDate; + + @Transient + @ApiParam("替换vin") + private String replaceVinCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 8524845..6f6b2bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -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; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index eaecea7..970d9b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -52,6 +52,9 @@ public class SparePartsImportModel { @ApiParam("客户零件号") private String custPartNo; + @ApiParam("替换VIN") + private String replaceVinCode; + @ApiParam("用量") private Integer qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java new file mode 100644 index 0000000..777a721 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocationDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java new file mode 100644 index 0000000..e2b36dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocation; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java new file mode 100644 index 0000000..c81d1dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPartFurnaceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index abe8e5e..2064ad7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2489,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); } @@ -3549,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); } @@ -3625,4 +3628,12 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) { + DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean); + DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean); + DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java new file mode 100644 index 0000000..ab2cd47 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java @@ -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; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java index a4d0580..d49ea8c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -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 implements Serializable { private static final long serialVersionUID = 3075276018074690913L; + @ApiParam("结果") private boolean result; @@ -32,7 +32,7 @@ public class ExcelImportModel implements Serializable { private int failRowNum; @ApiParam("错误信息集合") - private List ImportErrorModels; + private List importErrorModels; @ApiParam("错误的行号") private String errorRows; @@ -46,4 +46,17 @@ public class ExcelImportModel 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; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java index c644a49..4a135a5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java @@ -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; + } + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 3466256..0b95c97 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -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 = "箱条码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 89f6ed4..e34f49c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -324,10 +324,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, + public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; - this.erpSrcNo = erpSrcNo; + this.remark = remark; this.item = item; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index b327dc3..d2bd144 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -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;