diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index d537b55..c6e3a32 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -15,6 +15,7 @@ import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; +import java.util.LinkedHashMap; /** * @Description : @@ -142,13 +143,18 @@ public abstract class BaseBean implements Serializable { public transient Integer ascOrDesc = 1; public int getIsValidVal() { - return this.isValid == null ? 0 : this.isValid.intValue(); + return this.isValid == null ? 0 : this.isValid; } public int getIsDeletedVal() { - return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + return this.isDeleted == null ? 0 : this.isDeleted; } +// @Transient +// @ApiParam(value = "多列排序") +// @AnnoOutputColumn(hidden = true) +// public LinkedHashMap sortParamMap; + //排序方式 public String orderBy(){ String result = ""; @@ -162,4 +168,5 @@ public abstract class BaseBean implements Serializable { } return result; } + } 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 e4c358a..1d991da 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 @@ -6246,19 +6246,21 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WEEK_TYPE { - MONDAY(20, "星期一"), - TUESDAY(30, "星期二"), - WEDNESDAY(40, "星期三"), - THURSDAY(50, "星期四"), - FRIDAY(60, "星期五"), - SATURDAY(70, "星期六"), - SUNDAY(10, "星期日"); + MONDAY(20, 1, "星期一"), + TUESDAY(30, 2, "星期二"), + WEDNESDAY(40, 3, "星期三"), + THURSDAY(50, 4, "星期四"), + FRIDAY(60, 5, "星期五"), + SATURDAY(70, 6, "星期六"), + SUNDAY(10, 0, "星期日"); private final int value; + private final int code; private final String description; - WEEK_TYPE(int value, String description) { + WEEK_TYPE(int value, int code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -6266,6 +6268,10 @@ public class WmsEnumUtil { return value; } + public int getCode() { + return code; + } + public String getDescription() { return description; } @@ -6288,6 +6294,15 @@ public class WmsEnumUtil { } return tmp; } + + public static int getValByCode(int code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code == code) { + return values()[i].value; + } + } + return 0; + } } /** @@ -8854,6 +8869,52 @@ public class WmsEnumUtil { } /** + * 收货看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_BOARD_STATUS { + FINISH(10, "已完成(绿色)"), + OVER_TIME(20, "已超时（红色）"), + UNRECEIVED(30, "未收货（蓝色）"), + VARIANT(40, "有差异（黄色）"); + + private int value; + private String description; + + RC_BOARD_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static RC_BOARD_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + 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; + } + } + + /** * 循环规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java new file mode 100644 index 0000000..b746ee9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java @@ -0,0 +1,50 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CURRENT_STATUS") +@Api("工位实时状态表") +public class MesWcCurrentStatus extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4224360275760211780L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "VIN_CODE") + @ApiParam("当前VIN号") + private String vinCode; + + @Column(name = "LAST_VIN_CODE") + @ApiParam("上一VIN号") + private String lastVinCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d4c880d..29a1729 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -135,7 +135,7 @@ public class StationRequestBean implements Serializable { private MesStateMachineStatus curFsmState; @ApiParam("是否重选进入") - private boolean isRechoose; + private boolean isReselect; @JsonIgnore @ApiParam("展示组件") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java index 3d2a2da..50c2935 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -30,4 +30,7 @@ public class TorqueReviewModel { @ApiParam("是否大枪") private Integer isPf; + @ApiParam("对象代码") + private String objectCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java new file mode 100644 index 0000000..134273f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWcCurrentStatus; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCurrentStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 9d1de96..1294aa0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -90,6 +90,10 @@ public class SysLogTaskTime extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; + public int getTaskStatusVal() { + return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; + } + @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java index 3086942..61a450f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -93,7 +93,7 @@ public class WmsAutoForkCallBackDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String robotCode; - @Column(name = "STATUS", nullable = false, columnDefinition = "default 10") + @Column(name = "STATUS", nullable = false, columnDefinition = "int default 10") @ApiParam("处理标准") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index c1b1a4d..eb834de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -161,6 +161,18 @@ public class WmsPOMaster extends BaseBean { private String planDateEnd; @Transient + @ApiParam("计划日期") + private String planDate; + + @Transient + @ApiParam("计划时间") + private String planTime; + + @Transient + @ApiParam("看板状态") + private Integer boardStatus; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -197,6 +209,15 @@ public class WmsPOMaster extends BaseBean { this.createDatetime = createDateTime; this.createDateTimeStart = receiveDateTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, + String dockCode, String planDate, String planTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + } public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; 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 2f5c2fb..9cc690d 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 @@ -128,6 +128,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; @@ -185,9 +189,6 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("结束时间") private String planEndDate; - @Column(name = "REMARK") - @ApiParam("备注") - private String remark; public Double getSnpVal() { return snp; @@ -245,4 +246,14 @@ public class WmsPOMasterDetails extends BaseBean { this.modifyDatetime = modifyDatetime; this.remark = remark; } + + public WmsPOMasterDetails(String partNo,String partNameRdd,String planDate, + Double snp,Long totalBoxes,Double qty){ + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.planDate = planDate;//批次号（yyyyMMdd） + this.snp=snp; + this.totalBoxes = totalBoxes.intValue(); + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java index 78913f6..3b1566e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库区物料 @@ -87,4 +88,24 @@ public class WmsZonePart extends BaseBean{ @ApiParam(value = "安全量", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double safetyQty; + + @Transient + @ApiParam(value = "总件数") + private Double totalSnQty ; + + @Transient + @ApiParam(value = "库存是否正常") + private Integer isNormal ; + + public WmsZonePart() { + } + + public WmsZonePart(String zoneNo, String partNo, String partNameRdd, Double min, Double max, Double totalSnQty) { + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.min = min; + this.max = max; + this.totalSnQty = totalSnQty; + } } \ 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 5419a1b..3a2d468 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 @@ -572,7 +572,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); if (wmsLocate.getZoneNo() != null) { - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); + DdlPreparedPack.getInPackArray(wmsLocate.getZoneNo().split(","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { DdlPreparedPack.getInPackArray(wmsLocate.getLocateNoArr(), "locateNo", result);