diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 16afd40..49b6317 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2487,7 +2487,8 @@ public class WmsEnumUtil { TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"), - BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"); + BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"), + PDA_BTN(90, "PDA_BTN", "PDA按钮"); private String code; private String description; @@ -9540,6 +9541,50 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * PDA_BTN + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PDA_BTN { + CLEAR_REDIS(10, "CLEAR_REDIS", "清空缓存"); + + private int value; + private String code; + private String description; + + PDA_BTN(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 String valueOfDescription(int val) { + return valueOf(val); + } + } } 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 index 560d696..873c9da 100644 --- 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 @@ -4,21 +4,17 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** * @Description: - * @Author: jokelin - * @Date: 2020/4/20 5:16 下午 + * @Author: Jessica + * @Date: 2020/11/20 5:16 下午 * @Modify: */ @Data @@ -41,6 +37,10 @@ public class MesPartFurnace extends BaseBean implements Serializable { @ApiParam("物料编码") private String partNo; + @Column(name = "orientation") + @ApiParam("方向") + private String orientation; + @Column(name = "MODEL_IMG_URL") @ApiParam("模式图片路径") private String modelImgUrl; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 416d7cd..91703ac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -86,6 +86,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("是否需要设备自动报警") private Integer isEquMonitor; + @Column(name = "IS_TEMPORARY") + @ApiParam("是否临时开线") + private Integer isTemporary = 2; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java index ca3ec40..cbc5250 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java @@ -21,18 +21,37 @@ import java.util.List; public class ProduceDispPassPlatoModel { @ApiParam("项目号") - private List prodCfgTypeCodeList; + private String prodCfgTypeCode; @ApiParam("零件号") - private List partNoList; + private String partNo; - @ApiParam("单项占比") - private BigDecimal singleRatio; + @ApiParam("缺陷代码") + private String defectCode; - @ApiParam("累计占比") - private BigDecimal cumulativeRatio; + @ApiParam("缺陷名称") + private String defectName; - @ApiParam("缺陷数量") - private BigDecimal defectQty; + @ApiParam("单项占比") + private Double singleRatio; + @ApiParam("累计占比") + private Double cumulativeRatio; + + @ApiParam("数量") + private Long qty; + + public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.partNo = partNo; + this.defectCode = defectCode; + this.defectName = defectName; + this.qty = qty; + } + + public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.partNo = partNo; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java index 806e221..e8b1087 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -17,7 +18,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class ProduceDispPassPlatoQueryModel { +public class ProduceDispPassPlatoQueryModel extends BaseBean { /** * 必选 */ @@ -25,8 +26,9 @@ public class ProduceDispPassPlatoQueryModel { @ApiParam("工序") private String processCode; - @ApiParam("统计方式") - private Integer statisticalPlacer; + //质量状态（20冻结，30报废） + @ApiParam("质量状态") + private List qcStatusList; /** * 可选 */ @@ -36,6 +38,10 @@ public class ProduceDispPassPlatoQueryModel { @ApiParam("零件号") private List partNoList; + //统计方式（0按月，1按天） + @ApiParam("统计方式") + private Integer statisticalPlacer; + @ApiParam("开始时间") private String modifyStartDate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java index d27e146..84449e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java @@ -19,11 +19,9 @@ public class ProduceDispPassRateModel { @ApiParam("统计时间") private String statisticalTime; - @ApiParam("质量状态/类型") - private Integer qcStatus; - + //统计选项（10=全部，20=冻结，30=报废） @ApiParam("统计选项") - private String statisticalOption; + private Integer statisticalOption; @ApiParam("冻结数") private BigDecimal freezeQty; @@ -37,9 +35,8 @@ public class ProduceDispPassRateModel { @ApiParam("占比率") private BigDecimal ratio; - public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { this.statisticalTime = statisticalTime; - this.qcStatus = qcStatus; this.statisticalOption = statisticalOption; this.freezeQty = freezeQty; this.scrapQty = scrapQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java index ed9dd7b..5b6f1fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java @@ -25,11 +25,20 @@ public class ProduceDispPassRateQueryModel { @ApiParam("工序") private String processCode; + //统计方式（0=按月，1按天） @ApiParam("统计方式") - private Integer statisticalPlacer; + private Integer statisticalMethod; + //质量状态（10=合格，20=冻结，30=报废） @ApiParam("质量类型") - private String qcStatus; + private Integer qcStatus; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + /** * 可选 @@ -40,10 +49,5 @@ public class ProduceDispPassRateQueryModel { @ApiParam("零件号") private List partNoList; - @ApiParam("开始时间") - private String modifyStartDate; - - @ApiParam("结束时间") - private String modifyEndDate; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java new file mode 100644 index 0000000..3f50ac6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java @@ -0,0 +1,29 @@ +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; + +@Data +@Api("JIS发运报表明细模型") +public class JisReportDetailModel extends BaseBean { + @ApiParam("客户工厂") + private String customerNo; + @ApiParam("计划发货数量") + private Integer planShipingCount; + @ApiParam("计划发货时间") + private String planLoadTime; + @ApiParam("料架号") + private String fixLotNo; + @ApiParam("排序单号") + private String queneGroupNo; + @ApiParam("JIS号") + private String jisNo; + @ApiParam("箱条码") + private String sn; + @ApiParam("实际发货时间") + private String actualLoadTime; + @ApiParam("实际上线时间") + private String custOnLineTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java new file mode 100644 index 0000000..9df6674 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java @@ -0,0 +1,43 @@ +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; + +@Data +@Api("JIS发运报表模型") +public class JisReportModel extends BaseBean { + + @ApiParam("客户工厂") + private String custOrganizeCode; + @ApiParam("计划装车时间") + private String planLoadTime; + @ApiParam("计划发货数量") + private Double planShipingCount; + @ApiParam("实际装车时间") + private String actualLoadTime; + @ApiParam("实际发货数量") + private Double actualShipingCount; + @ApiParam("状态") + private Integer shippingStatus; + @ApiParam("料架号1") + private String queueGroupNo_1; + @ApiParam("客户上线时间1") + private String custOnLineTime_1; + @ApiParam("料架号2") + private String queueGroupNo_2; + @ApiParam("客户上线时间2") + private String custOnLineTime_2; + @ApiParam("料架号3") + private String queueGroupNo_3; + @ApiParam("客户上线时间3") + private String custOnLineTime_3; + @ApiParam("料架号4") + private String queueGroupNo_4; + @ApiParam("客户上线时间4") + private String custOnLineTime_4; + @ApiParam("客户现场库存") + private Double qty; + +}