diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index ea05280..5f6df39 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -338,9 +338,10 @@ public class AndonManageQueue extends BaseManageQueue { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ + public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ this.organizeCode = organizeCode; this.workCenterNameRdd = workCenterNameRdd; + this.workCellCode = workCellCode; this.workCellNameRdd = workCellNameRdd; this.resetUser = resetUser; this.alarmCode = alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 30d3683..0533141 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -67,6 +67,6 @@ public class MesWorkCell extends BaseBean { private String workCellType; public String getName(){ - return this.workCellName; + return this.workCellCode; } } 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 91d933f..2d6168e 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 @@ -276,7 +276,8 @@ public class MesEnumUtil { DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), - QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"); + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); private String value; private String description; @@ -1461,7 +1462,9 @@ public class MesEnumUtil { MES_PART_OJBECT(340, "物料对象"), MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"); + MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), + MES_PLC(390, "PLC地址清单"); private int value; private String description; 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 cf5ea6e..8f6f9c2 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 @@ -214,7 +214,45 @@ public class MesPcnEnumUtil { } } + /** + * MES_TYPE_CFG 类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG { + + DEFECT("DEFECT", "缺陷"), + DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), + REPAIR("REPAIR", "处理措施"), + SCRAP("SCRAP", "报废原因"), + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); + + private String value; + private String description; + + MES_TYPE_CFG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * MesProdBindRecord 是否是关键件 */ 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 785a1f8..d6d917c 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 @@ -4603,4 +4603,110 @@ public class WmsEnumUtil { } } + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_DETAILS_STATUS { + BE_HANDLE(10,"BE_HANDLE", "待处理"), + CANCELLATION(20,"CANCELLATION", "已处理"); + + private int value; + private String code; + private String description; + + PULL_TASK_DETAILS_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 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_MASTER_STATUS { + CREATE(10,"CREATE", "创建"), + ENABLED(20,"ENABLED", "已启动"), + COMPLETE(30,"COMPLETE", "已完成"), + CLOSE(40,"CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + PULL_TASK_MASTER_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; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 6dc2133..43f7f49 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -36,6 +36,8 @@ public class WcCheckModel { private List materials; @ApiParam("物料 列") private Map materialsColumn; + @ApiParam("普通列") + private Map commonColumn; @ApiParam("法") private List routes; @@ -66,6 +68,9 @@ public class WcCheckModel { @ApiParam("需要展示的数据") private Map need2ShowMap; + @ApiParam("重构map") + private Map> showMap; + public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index be1fccc..01fd23c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -49,6 +49,7 @@ public class SysLocaleResource extends BaseBean { @Column(name="language_code") @ApiParam(value = "语言编码",example = "浏览器语言编码") + @AnnoOutputColumn private String languageCode; @Column(name="language_name_rdd") @@ -57,6 +58,7 @@ public class SysLocaleResource extends BaseBean { @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") + @AnnoOutputColumn private String resourceKey; @Lob diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 83788f2..99eb8af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -99,6 +99,7 @@ public class WmsDocMovementMaster extends BaseBean { public Integer isTask; @Column(name = "PRIORITY") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRIORITY.class, refForeignKey = "value", value = "description") @ApiParam(value = "优先级", example = "1") public Integer priority; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index 09f05c2..b2e4e34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") - private String woekorderNo; + private String wrokorderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") @@ -47,8 +47,8 @@ public class WmsPullTaskDetails extends BaseBean{ private String locateNo; @Column(name="LOCATE_CAPACITY") - @ApiParam("库位容量") - private String locateCapacity; + @ApiParam(value = "库位容量", example = "0") + private Integer locateCapacity = 0; @Column(name="PART_NO") @ApiParam("零件编号") @@ -58,49 +58,53 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam("零件名称") private String partNameRdd; + @Column(name="PLAN_PACK_QTY") + @ApiParam(value = "计划数量", example = "0d") + private Double planPackQty = 0d; + @Column(name="PLAN_PACK_COUNT") - @ApiParam(value = "计划容器数", example = "0") - private Integer planPackCount = 0; + @ApiParam(value = "计划容器数", example = "0d") + private Double planPackCount = 0d; @Column(name="FIRST_BATCH_QTY") - @ApiParam(value = "首批批量", example = "0") - private Integer firstBatchQty = 0; + @ApiParam(value = "首批批量", example = "0d") + private Double firstBatchQty = 0d; @Column(name="FIRST_PACK_COUNT") - @ApiParam(value = "首批容器数", example = "0") - private Integer firstPackCount = 0; + @ApiParam(value = "首批容器数", example = "0d") + private Double firstPackCount = 0d; @Column(name="REQUEST_QTY") - @ApiParam(value = "补货批量", example = "0") - private Integer requestQty = 0; + @ApiParam(value = "补货批量", example = "0d") + private Double requestQty = 0d; @Column(name="REQUEST_PACK_COUNT") - @ApiParam(value = "补货容器数", example = "0") - private Integer requestPackCount = 0; + @ApiParam(value = "补货容器数", example = "0d") + private Double requestPackCount = 0d; @Column(name="REQUEST_LOT_NO") - @ApiParam(value = "补货批次", example = "0") - private Integer requestLotNo = 0; + @ApiParam(value = "补货批次", example = "0d") + private Double requestLotNo = 0d; @Column(name="REQUEST_TOTAL_COUNT") - @ApiParam(value = "补货累加次数", example = "0") - private Integer requestTotalCount = 0; + @ApiParam(value = "补货累加次数", example = "0d") + private Double requestTotalCount = 0d; @Column(name="LAST_REQUEST_TIME") @ApiParam("上一次补货时间") private String lastRequestTtime; @Column(name="BOOT_QTY") - @ApiParam(value = "尾箱批量", example = "0") - private Integer bootQty = 0; + @ApiParam(value = "尾箱批量", example = "0d") + private Double bootQty = 0d; @Column(name="BOOT_PACK_COUNT") - @ApiParam(value = "尾箱容器数", example = "0") - private Integer bootPackCount = 0; + @ApiParam(value = "尾箱容器数", example = "0d") + private Double bootPackCount = 0d; @Column(name="BOOT_LOT_NO") - @ApiParam(value = "尾箱批次", example = "0") - private Integer bootLotNo = 0; + @ApiParam(value = "尾箱批次", example = "0d") + private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") @@ -110,48 +114,56 @@ public class WmsPullTaskDetails extends BaseBean{ return orderStatus == null ? 0 : this.orderStatus.intValue(); } - public Integer getBootLotNo() { - return bootLotNo == null ? 0 : this.bootLotNo.intValue(); + public Double getBootLotNo() { + return bootLotNo == null ? 0d : this.bootLotNo.doubleValue(); } - public Integer getBootPackCount() { - return bootPackCount == null ? 0 : this.bootPackCount.intValue(); + public Double getBootPackCount() { + return bootPackCount == null ? 0d : this.bootPackCount.doubleValue(); } - public Integer getBootQty() { - return bootQty == null ? 0 : this.bootQty.intValue(); + public Double getBootQty() { + return bootQty == null ? 0d : this.bootQty.doubleValue(); } - public Integer getRequestTotalCount() { - return requestTotalCount == null ? 0 : this.requestTotalCount.intValue(); + public Double getRequestTotalCount() { + return requestTotalCount == null ? 0d : this.requestTotalCount.doubleValue(); } - public Integer getRequestLotNo() { - return requestLotNo == null ? 0 : this.requestLotNo.intValue(); + public Double getRequestLotNo() { + return requestLotNo == null ? 0d : this.requestLotNo.doubleValue(); } - public Integer getRequestPackCount() { - return requestPackCount == null ? 0 : this.requestPackCount.intValue(); + public Double getRequestPackCount() { + return requestPackCount == null ? 0d : this.requestPackCount.doubleValue(); } - public Integer getRequestQty() { - return requestQty == null ? 0 : this.requestQty.intValue(); + public Double getRequestQty() { + return requestQty == null ? 0d : this.requestQty.doubleValue(); } - public Integer getFirstPackCount() { - return firstPackCount == null ? 0 : this.firstPackCount.intValue(); + public Double getFirstPackCount() { + return firstPackCount == null ? 0d : this.firstPackCount.doubleValue(); } - public Integer getFirstBatchQty() { - return firstBatchQty == null ? 0 : this.firstBatchQty.intValue(); + public Double getFirstBatchQty() { + return firstBatchQty == null ? 0d : this.firstBatchQty.doubleValue(); } - public Integer getPlanPackCount() { - return planPackCount == null ? 0 : this.planPackCount.intValue(); + public Double getPlanPackCount() { + return planPackCount == null ? 0d : this.planPackCount.doubleValue(); } public Integer getItem() { return item == null ? 0 : this.item.intValue(); } + public Double getLocateCapacity() { + return locateCapacity == null ? 0d : this.locateCapacity.doubleValue(); + } + + public Double getPlanPackQty() { + return planPackQty == null ? 0d : this.planPackQty.doubleValue(); + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4eb8948..17c8805 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2610,4 +2610,39 @@ public class WmsHqlPack { return result; } + /** + * 拉动计划主表信息分页查询条件 + * + * @param wmsPullTaskMaster + * @return + */ + public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getInPack(statusList, "orderStatus", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); + DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); + DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result); + + getStringBuilderPack(wmsPullTaskMaster, result); + + return result; + } + + /** + * 拉动计划明细表信息分页查询条件 + * + * @param wmsPullTaskDetails + * @return + */ + public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsPullTaskDetails, result); + + return result; + } + }