From 0e72ea3464172a231b350fd7e1b3fa7e7097446b Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 28 Feb 2020 10:00:18 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/RuleGroupProgress.java | 2 +- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 57 ++++++++++++++++++++++ .../i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 48 ++++++++++++++++++ .../pojo/ptl/repository/PtlMainTaskRepository.java | 16 ++++++ .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 4 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 + 7 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java index 6a67f59..7344176 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -12,5 +12,5 @@ import lombok.Data; @Data public class RuleGroupProgress { private String message; - private Long progress; + private Integer progress; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index a465d80..d9de4d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -953,4 +953,61 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_主任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_MAIN_TASK_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "执行中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), + CANCELLED(40, "CANCELLED", "已取消"); + + private int value; + private String code; + private String description; + + PTL_MAIN_TASK_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + 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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java new file mode 100644 index 0000000..e532265 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.ptl.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; + +/** + * @author adair.song + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MAIN_TASK_DETAIL") +@EqualsAndHashCode(callSuper = true) +@Api("主任务明细") +public class PtlMainTaskDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 7144785793974319897L; + + @Column(name = "TASK_NO") + @ApiParam("主任务编号") + private String taskNo; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.java new file mode 100644 index 0000000..3d9b98d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModule; +import cn.estsh.i3plus.pojo.ptl.bean.PtlMainTask; + +/** + * @author jessica.chen + * @date 2020/2/27 14:41 + * @desc + */ + +public interface PtlMainTaskRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index de87da0..456348c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -75,4 +75,8 @@ public class WmsSnOperateRecord extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") private Integer operateType; + @Column(name = "ref_sn") + @ApiParam(value = "关联二维码") + private String refSN; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 8a53a3d..f72a66b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -295,6 +295,14 @@ public class WmsStockSn extends BaseBean { private String parentReturnPart; @Transient + @ApiParam("保质期开始时间") + private String qualityDateTimeStart; + + @Transient + @ApiParam("保质期结束时间") + private String qualityDateTimeEnd; + + @Transient @ApiParam(value = "预计完成时间") private String planCompleteTime; 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 6b4788b..5d86cfd 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 @@ -1301,6 +1301,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart(), + wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false); if (wmsStockSn.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); } From 5b92cae5d1b65ff5b6fbaf0c3974b8b6b057e0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 15 Mar 2020 17:58:21 +0800 Subject: [PATCH 02/17] =?UTF-8?q?3D=E4=BB=93=E5=BA=93=EF=BC=9A=E8=81=94?= =?UTF-8?q?=E8=B0=83=E4=BC=98=E5=8C=96+=E6=94=B6=E8=B4=A7=E7=9C=8B?= =?UTF-8?q?=E6=9D=BFBUG#7308?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 10 ++++++---- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index 929b274..f64bf33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -65,8 +65,10 @@ public class WmsFurniture extends BaseBean { public WmsFurniture() { } - public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo, + public WmsFurniture(Long id,String organizeCode, String whNo, String zoneNo, String typeCode, String furnitureNo, Integer isSaveGoods, String position, Integer storey, Integer fntCol) { + this.id = id; + this.organizeCode = organizeCode; this.whNo = whNo; this.zoneNo = zoneNo; this.typeCode = typeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a5b6221..ee6babb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -178,7 +178,7 @@ public class WmsLocate extends BaseBean { @Transient @ApiParam(value = "移动频次") - private Integer frequency; + private Long frequency; @Transient @ApiParam(value = "库龄") @@ -197,7 +197,8 @@ public class WmsLocate extends BaseBean { this.partQty=partQty; this.locateNo=locateNo; } - public WmsLocate(String locateNo,Integer frequency,String organizeCode, + //3D仓库-库位移动频率热力图 + public WmsLocate(String locateNo,Long frequency,String organizeCode, String whNo,String zoneNo,String furnitureNo, Integer x,Integer y,Integer z){ this.locateNo=locateNo; @@ -210,6 +211,7 @@ public class WmsLocate extends BaseBean { this.y=y; this.z=z; } + //3D仓库-库龄热力图 public WmsLocate(String locateNo,String age,String organizeCode, String whNo,String zoneNo,String furnitureNo, Integer x,Integer y,Integer z){ @@ -244,8 +246,8 @@ public class WmsLocate extends BaseBean { return this.locateType== null ? 0 : this.locateType.intValue(); } - public Integer getFrequencyVal() { - return this.frequency == null ? 0 : this.frequency.intValue(); + public Long getFrequencyVal() { + return this.frequency == null ? 0 : this.frequency.longValue(); } public Integer getLcLengthVal() { 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 abff614..551d6d6 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 @@ -545,7 +545,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { - DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result); + DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result); } // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); From 8b9d8fd16d801898ada9246e0484e26cfd561c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 16 Mar 2020 11:49:31 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=81=E7=95=8C=E9=9D=A2=E5=85=83=E7=B4=A0=E3=80=81=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=85=83=E7=B4=A0=E5=B1=9E=E6=80=A7=E3=80=81RFID?= =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E6=B8=85=E5=8D=95=E3=80=81=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=A7=82=E5=AF=9F=E8=80=85=E4=BA=8B=E4=BB=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=81=E5=8C=BA=E5=9F=9F=E6=B5=81=E7=A8=8B=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 59 ++++++++++++++++++++ .../pojo/ptl/bean/PtlAreaRouteModuleParam.java | 64 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java | 59 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java | 59 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java | 47 ++++++++++++++++ .../i3plus/pojo/ptl/bean/PtlWindowElement.java | 44 +++++++++++++++ .../pojo/ptl/bean/PtlWindowElementAttribute.java | 55 +++++++++++++++++++ 7 files changed, 387 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java new file mode 100644 index 0000000..f6dc79a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_ACTOR_ACTION") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_区域观察者事件配置") +public class PtlAreaActorAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596837642283797995L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String areaNo; + + @Column(name = "ACTOR_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("观察者编码") + private String actorCode; + + @Column(name = "MT_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "OTHER_WHERE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("特定条件") + private String otherWhere; + + @Column(name = "AMG_ID") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("组件集编号") + private Long amgId; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java new file mode 100644 index 0000000..e879275 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_区域流程组件调用参数") +public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596829442283797995L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String areaNo; + + @Column(name = "ROUTE_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java new file mode 100644 index 0000000..3471aee --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_IF") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_接口清单") +public class PtlIf extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596882732758197995L; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String ifCode; + + @Column(name = "IF_NAME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("接口名称") + private String ifName; + + @Column(name = "IF_CONNECT_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("交互方式") + private String ifConnectType; + + @Column(name = "IF_CLASS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("接口实现类") + private String ifClass; + + @Column(name = "IF_CALL_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("接口调用方向") + private String ifCallType; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java new file mode 100644 index 0000000..9bf3380 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_RFID") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_RFID") +public class PtlRfid extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596837642758197995L; + + @Column(name = "RFID_CONTROL_NO") + @ApiParam("RFID读写器代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String rfidControlNo; + + @Column(name = "IP") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("IP") + private String ip; + + @Column(name = "PORT") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("端口号") + private String port; + + @Column(name = "AREA_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "RFID_VALUE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("rfid内容") + private String rfidValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java new file mode 100644 index 0000000..3961a36 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_WINDOW") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_界面") +public class PtlWindow extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443842758197995L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String windowNo; + + @Column(name = "WINDOW_NAME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("界面名称") + private String windowName; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java new file mode 100644 index 0000000..818bc4b --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_WINDOW_ELEMENT") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_界面元素") +public class PtlWindowElement extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596427582758197995L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String windowNo; + + @Column(name = "ELEMENT_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("元素代码") + private String elementNo; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java new file mode 100644 index 0000000..f5f98d4 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_界面元素属性") +public class PtlWindowElementAttribute extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596427582758285995L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String windowNo; + + @Column(name = "ELEMENT_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "ATTRIBUTE_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("属性代码") + private String attributeNo; + + @Column(name = "ATTRIBUTE_VALUE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("属性值") + private String attributeValue; + +} From b28c092ade6b08887e9e9ff786a6fe5ed753d228 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 16 Mar 2020 14:38:06 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 180 ++++++++++++++------- 1 file changed, 126 insertions(+), 54 deletions(-) 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 2861293..80c65f6 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 @@ -83,6 +83,72 @@ public class MesEnumUtil { } /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_PROD_SEQ_FLAG { + PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), + CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), + OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + + private int value; + private String code; + private String description; + + CHECK_PROD_SEQ_FLAG(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 codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + 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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** * JIS发运是否按主队列顺序扫描 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4110,6 +4176,7 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"); + private int value; private String description; @@ -4251,7 +4318,6 @@ public class MesEnumUtil { MM(10, "MM"), MS(20, "MS"); - private int value; private String description; @@ -4281,17 +4347,18 @@ public class MesEnumUtil { /** - * 工位监听组件类型 + * mes生产队列是否锁定 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_CELL_MONITOR_TYPE { - MONITOR(10, "监听组件"), - SHOW(20, "展示组件"); + public enum QUEUE_ORDER_IS_LOCK { + + TRUE(1, "是"), + FALSE(2, "否"); private int value; private String description; - WORK_CELL_MONITOR_TYPE(int value, String description) { + QUEUE_ORDER_IS_LOCK(int value, String description) { this.value = value; this.description = description; } @@ -4303,20 +4370,31 @@ public class MesEnumUtil { 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } } /** - * 工位监听组件触发类型 + * 查询散件BOM关键物料号工步对应的物料分类的值 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_MODULE_TRIGGER_TYPE { - BY_SN(10, "根据条码加载工步"), - BY_PART(20, "根据零件号加载工步"); + public enum PART_TYPE_THREE_STATION_BOM { + + MM(10, "MM"), + NLX(20, "NLX"); private int value; private String description; - WORK_MODULE_TRIGGER_TYPE(int value, String description) { + PART_TYPE_THREE_STATION_BOM(int value, String description) { this.value = value; this.description = description; } @@ -4328,17 +4406,31 @@ public class MesEnumUtil { 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } } + + /** + * 工位监听组件类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_MODULE_PARAM_TYPE { - NUMBER(10, "数值"), - STRING(20, "字符串"); + public enum WORK_CELL_MONITOR_TYPE { + MONITOR(10, "监听组件"), + SHOW(20, "展示组件"); private int value; private String description; - WORK_MODULE_PARAM_TYPE(int value, String description) { + WORK_CELL_MONITOR_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -4353,22 +4445,18 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 工位监听组件触发类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CHECK_PROD_SEQ_FLAG { - PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), - CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), - OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), - ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + public enum WORK_MODULE_TRIGGER_TYPE { + BY_SN(10, "根据条码加载工步"), + BY_PART(20, "根据零件号加载工步"); private int value; - private String code; private String description; - CHECK_PROD_SEQ_FLAG(int value, String code, String description) { + WORK_MODULE_TRIGGER_TYPE(int value, String description) { this.value = value; - this.code = code; this.description = description; } @@ -4379,43 +4467,27 @@ public class MesEnumUtil { public String getDescription() { return description; } + } - public String getCode() { - return code; - } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_PARAM_TYPE { + NUMBER(10, "数值"), + STRING(20, "字符串"); - 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; - } + private int value; + private String description; - public static String codeOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; + WORK_MODULE_PARAM_TYPE(int value, String description) { + this.value = value; + this.description = description; } - 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; + public int getValue() { + return value; } - public static String valueOfDescription(int val) { - return valueOf(val); + public String getDescription() { + return description; } } } From 3d28840bae726bb7ad374473655013772b89cf7e Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 16 Mar 2020 17:02:06 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=EF=BC=8Cpojo=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesCachaQueue.java | 45 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesPartFormula.java | 45 +++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesCachaQueue.java | 45 +++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartFormula.java | 45 +++++++++++++ .../mes/repository/MesCachaQueueRepository.java | 15 +++++ .../mes/repository/MesPartFormulaRepository.java | 15 +++++ 7 files changed, 283 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java 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 acd5453..037f318 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 @@ -2878,4 +2878,77 @@ public class MesPcnEnumUtil { return description; } } + + /** + * 缓存类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CACHA_TYPE { + DATA_REVIEW(10, "数据复核"); + + private int value; + private String description; + + CACHA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 缓存队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CACHA_QUEUE_STATUS { + CREATE(10, "创建"); + + private int value; + private String description; + + CACHA_QUEUE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + + /** + * 配方类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_FORMULA_TYPE { + DEVICE_SEMAPHORE(10, "设备信号"); + + private int value; + private String description; + + PART_FORMULA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java new file mode 100644 index 0000000..fd9c366 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg + * @Date : 2020/3/16 0016 - 15:09 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CACHA_QUEUE") +@Api("MES缓存队列") +public class MesCachaQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8272649623030195332L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CACHA_TYPE") + @ApiParam("缓存类型") + private String cachaType; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java new file mode 100644 index 0000000..94f495f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg + * @Date : 2020/3/16 0016 - 15:50 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FORMULA") +@Api("MES_物料配方") +public class MesPartFormula extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3120650997069271308L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "FORMULA_TYPE") + @ApiParam("配方类型") + private Integer formulaType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java new file mode 100644 index 0000000..34e21f9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java @@ -0,0 +1,45 @@ +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 : zcg + * @Date : 2020/3/16 0016 - 14:52 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CACHA_QUEUE") +@Api("MES缓存队列") +public class MesCachaQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6875307024103023380L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CACHA_TYPE") + @ApiParam("缓存类型") + private String cachaType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java new file mode 100644 index 0000000..63b5871 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java @@ -0,0 +1,45 @@ +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 : zcg + * @Date : 2020/3/16 0016 - 15:45 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FORMULA") +@Api("MES_物料配方") +public class MesPartFormula extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4905294092563287950L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "FORMULA_TYPE") + @ApiParam("配方类型") + private Integer formulaType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java new file mode 100644 index 0000000..24f6cd2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCachaQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:05 + */ +@Repository +public interface MesCachaQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java new file mode 100644 index 0000000..9a0d707 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartFormula; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:59 + */ +@Repository +public interface MesPartFormulaRepository extends BaseRepository { +} From 0b8c3317b8bb9f8c5fce1236598634a329b81106 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 17 Mar 2020 10:02:23 +0800 Subject: [PATCH 06/17] ptlpcn enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 84 +++++++++++----------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 1205a9c..614df60 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1457,16 +1457,6 @@ public class PtlPcnEnumUtil { 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; - } - public static String valueOfDescription(int val) { return valueOf(val); } @@ -1514,16 +1504,6 @@ public class PtlPcnEnumUtil { 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; - } - public static String valueOfDescription(int val) { return valueOf(val); } @@ -1569,16 +1549,6 @@ public class PtlPcnEnumUtil { 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; - } - public static String valueOfDescription(int val) { return valueOf(val); } @@ -1625,11 +1595,47 @@ public class PtlPcnEnumUtil { return tmp; } - public static int descOf(String desc) { - int tmp = 1; + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 主任务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MAIN_TASK_TYPE { + CREATE(10, "JIT_TASK", "JIT任务"), + RECEIPT(20, "DOCUMENT_TASK", "单据任务"), + RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + + private int value; + private String code; + private String description; + + MAIN_TASK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value == val) { + tmp = values()[i].description; } } return tmp; @@ -1678,15 +1684,5 @@ public class PtlPcnEnumUtil { } return tmp; } - - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } } From 313a0acfb8b7d1a2b79f299d64736d47b269fe9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 17 Mar 2020 10:42:52 +0800 Subject: [PATCH 07/17] test --- .../estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index f87e945..dd2b411 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -14,8 +14,6 @@ import lombok.Data; @Api("未完成订单模型") public class WmsMoveUnfinishedOrderModel extends BaseBean{ - - @ApiParam("物料编码") private String partNo; @@ -26,7 +24,6 @@ public class WmsMoveUnfinishedOrderModel extends BaseBean{ private Double destQty; - @ApiParam("交易类型") private String transTypeCode; From e8f48bcb04a806024df574431f08cc11547e2ece Mon Sep 17 00:00:00 2001 From: joke lin Date: Tue, 17 Mar 2020 13:38:30 +0800 Subject: [PATCH 08/17] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index cd951ae..122b4a5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * @Description :生产数据 @@ -112,7 +114,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private String lineData; + private List lineData; @Lob @Transient From 3b928c6ddc44fa9680887811b01da4e984a0c51f Mon Sep 17 00:00:00 2001 From: joke lin Date: Tue, 17 Mar 2020 16:08:28 +0800 Subject: [PATCH 09/17] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index d78860d..6c6aeec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -14,6 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -126,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") - private String opcValue; + private List opcValue; } From 8881bafecf91331a6e97d19ff0dcfcf74bc12aca Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 17 Mar 2020 17:05:51 +0800 Subject: [PATCH 10/17] ptl pcn --- .../cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index 32bbe43..f423f60 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -47,4 +47,22 @@ public class LightOnModel implements Serializable { @ApiParam("状态") private Integer status; + @ApiParam("控制器ip") + private String ip; + + @ApiParam("端口") + private String port; + + @ApiParam("控制器编号") + private String controlNo; + + public LightOnModel() { + } + + public LightOnModel(Integer tagNo, String ip, String port, String controlNo) { + this.tagNo = tagNo; + this.ip = ip; + this.port = port; + this.controlNo = controlNo; + } } From 03f1c4fddfabf05cce531c50b5e0d122f51f51e3 Mon Sep 17 00:00:00 2001 From: luweihao Date: Tue, 17 Mar 2020 18:02:24 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index cd951ae..5db7e04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description :生产数据 From 6cfc2c550147e00b404a8aad72405b54e9a758b6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 17 Mar 2020 18:45:49 +0800 Subject: [PATCH 12/17] ptl --- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index bbb4564..9a1598e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.ptl.bean.*; import org.springframework.util.StringUtils; @@ -228,10 +227,10 @@ public class PtlHqlPack { public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result); - DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result); - if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart()) - && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) { + DdlPreparedPack.getStringLikerPack(ptlAreaTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringLikerPack(ptlAreaTask.getPartNo(), "partNo", result); + if (!StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeStart()) + || !StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() , "createDatetime", result, true); } @@ -253,10 +252,10 @@ public class PtlHqlPack { public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result); - DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result); - if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart()) - && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) { + DdlPreparedPack.getStringLikerPack(ptlMainTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringLikerPack(ptlMainTask.getPartNo(), "partNo", result); + if (!StringUtils.isEmpty(ptlMainTask.getCreateDateTimeStart()) + || !StringUtils.isEmpty(ptlMainTask.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd() , "createDatetime", result, true); } @@ -276,15 +275,16 @@ public class PtlHqlPack { public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result); - DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result); - if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart()) - && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) { + DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result); + DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getPartNo(), "partNo", result); + if (!StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeStart()) + || !StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd() , "createDatetime", result, true); } DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result); DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getStatus(), "status", result); DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); From 2da53135a8a2c6e08c921f1e6d20021b3b53a9e2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 18 Mar 2020 10:04:03 +0800 Subject: [PATCH 13/17] =?UTF-8?q?bug7761=E3=80=907761=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E9=85=8D=E6=96=99=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=B8=8E=E6=97=A0=E5=BA=93=E5=AD=98=E6=9C=AA?= =?UTF-8?q?=E5=81=9A=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=B7=B2=E9=85=8D=E7=BD=AE=E5=A5=BD=E3=80=91?= =?UTF-8?q?=20bug=E3=80=907766=20=E6=8B=86=E5=88=86=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=88=90=E5=90=8E?= =?UTF-8?q?=E4=B8=8B=E6=96=B9=E9=9C=80=E8=A6=81=E5=9B=9E=E6=98=BE=EF=BC=8C?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=87=BA=E7=9A=84=E6=9D=A1=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=8C=E5=BA=93=E4=BD=8D=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index d707fe8..2e3cffa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -54,7 +54,7 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 来源表的查询条件 */ - @Column(name = "SRC_WHERE", length = 255) + @Column(name = "SRC_WHERE", length = 500) public String srcWhere; /** From e3b6f03dd8656dfd545dab2a431dfb8a0bbc1a72 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 18 Mar 2020 10:17:59 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3WMS#511=E3=80=90511=20=E5=8C=97=E4=BA=AC=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3-NC=E6=8A=A5=E5=BA=9FNC=E5=86=BB=E7=BB=93-?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8D=E8=89=AF=E5=93=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=91=20=E5=8C=97=E4=BA=AC=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3WMS#510=E3=80=90510=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E6=8B=A3=E8=B4=A7-=E9=A2=86?= =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E3=80=91=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS#50?= =?UTF-8?q?8=E3=80=90508=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7-=E6=A0=B9=E6=8D=AE=E6=9C=80=E7=9F=AD?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=8E=A8=E8=8D=90=E6=9D=A1=E7=A0=81=E3=80=91?= =?UTF-8?q?=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS#507?= =?UTF-8?q?=E3=80=90507=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93=EF=BC=88=E9=9B=B6?= =?UTF-8?q?=E6=98=9F=E5=85=A5=E5=BA=93=EF=BC=89=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=89=B9=E6=AC=A1=E4=B8=BA=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=91=20=E5=8C=97=E4=BA=AC=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3WMS#505=E3=80=90505=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7-=E6=8E=A8=E9=80=81=E6=94=B6=E8=B4=A7=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=E9=82=AE=E4=BB=B6=E3=80=91=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS#509=E3=80=90509=20=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E5=93=81=E8=87=AA=E5=8A=A8=E6=8A=A5=E8=AD=A6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 33453b8..8b79c72 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -311,4 +311,14 @@ public class WmsDocMovementDetails extends BaseBean { this.orderNo = orderNo; } + public WmsDocMovementDetails (String orderNo,String partNo,Double qty, Double pickQty, int itemStatus, String createDatetime, String modifyDatetime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.qty = qty; + this.pickQty = pickQty; + this.itemStatus = itemStatus; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + } + } From 5291d5d13dcd81a225d1781d4eeca81855a01d9c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 19 Mar 2020 10:13:04 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E3=80=907838=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E7=BB=84=E7=AE=A1=E7=90=86=E4=B8=AD=E7=9A=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=90=8D=E7=A7=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 44f3039..d4f1b26 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 @@ -4406,10 +4406,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PACKAGE_OPERATE_TYPE { - PACKAGE_ADD("PACKAGE_ADD", "新增"), - PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"), - PACKAGE_DELETE("PACKAGE_DELETE", "删除"), - PACKAGE_CLEAR("PACKAGE_CLEAR", "清空"); + PACKAGE_ADD("PACKAGE_ADD", "新建组号"), + PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "增添条码"), + PACKAGE_DELETE("PACKAGE_DELETE", "移除条码"), + PACKAGE_CLEAR("PACKAGE_CLEAR", "删除组号"); private String value; private String description; From 5bf7133ff1fac92556797ee02a7d7d0ac8d8088d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Mar 2020 14:43:04 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9ABUG#7845=EF=BC=9BBUG#7676=EF=BC=9BBUG#7675?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 ++++++++-- .../i3plus/pojo/model/wms/WmsListSearchModel.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 28 +++++++++++----------- .../pojo/wms/bean/dynamictable/WmsFieldInfo.java | 6 ++++- .../wms/bean/dynamictable/WmsSearchElement.java | 2 +- 5 files changed, 33 insertions(+), 18 deletions(-) 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 44f3039..cf02110 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 @@ -4169,7 +4169,7 @@ public class WmsEnumUtil { } } - /** + /**分类 * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4890,10 +4890,18 @@ public class WmsEnumUtil { } return tmp; } + public static FIELD_TYPE codeOf(Integer value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value==value) { + return values()[i]; + } + } + return null; + } } /** - * 推送类型 + * 推送类型单位 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java index 43e219f..88d4883 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java @@ -31,4 +31,7 @@ public class WmsListSearchModel { @ApiParam(value = "有效性") public Integer isValid; + + @ApiParam(value = "工厂代码") + public String organizeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 378144b..0157775 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -50,7 +50,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class) private String partType; @Column(name = "PART_TYPE_DESC") @@ -80,7 +80,7 @@ public class WmsPart extends BaseBean { @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC") private String abc; @Column(name = "BUY_UNIT") @@ -146,8 +146,8 @@ public class WmsPart extends BaseBean { @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @@ -162,12 +162,12 @@ public class WmsPart extends BaseBean { @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_CLOSE_FLAG") private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_CLOSE_TYPE") private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @@ -222,7 +222,7 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; - @Column(name="verb_num") + @Column(name = "verb_num") @ApiParam(value = "单次拆包数") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @@ -252,11 +252,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; - public int getIqcVal(){ + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); } - public int getCycleRquestPeriod(){ + public int getCycleRquestPeriod() { return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue(); } @@ -264,23 +264,23 @@ public class WmsPart extends BaseBean { } public Double getQty() { - return qty == null? 0:qty; + return qty == null ? 0 : qty; } public Double getMin() { - return min == null? 0: min; + return min == null ? 0 : min; } public Double getMax() { - return max == null? 0:max; + return max == null ? 0 : max; } public Double getCycleRquestQty() { - return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue(); + return this.cycleRquestQty == null ? 0d : this.cycleRquestQty.doubleValue(); } public Double getCuringTime() { - return this.curingTime == null? 0d:this.curingTime.doubleValue(); + return this.curingTime == null ? 0d : this.curingTime.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index 0321169..813e15b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -43,7 +43,7 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "FIELD_TYPE") @ApiParam(value = "字段类型") - private String fieldType; + private Integer fieldType; @Column(name = "ENUM_NAME") @ApiParam(value = "字段枚举名称") @@ -77,6 +77,10 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") private Integer isWider; + @Column(name = "IS_QUERY") + @ApiParam(value = "是否可选作查询条件:默认1-可选，2-不可选") + private Integer isQuery; + @Column(name = "IS_SELECT") @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") private Integer isSelect; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java index 99b223f..7a9cbbb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java @@ -43,7 +43,7 @@ public class WmsSearchElement extends BaseBean { @Column(name = "FIELD_TYPE") @ApiParam(value = "字段类型") - private String fieldType; + private Integer fieldType; @Column(name = "CONDITION_EXPRE") @ApiParam(value = "条件表达式:>,<,>=等") From 3d913456af98eb9d4770ac6b21f28d974f9a05b7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 19 Mar 2020 20:17:13 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E3=80=907863=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=A4=E6=AD=A5=E6=B3=95=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8D=95=E6=8D=AE=E6=9D=A1=E7=A0=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=9B=B4=E6=8E=A5=E5=8F=98=E4=B8=BA=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index b2119ad..892ea6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -119,6 +119,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的库位") private String destMoveType; + @Column(name = "DEST_MOVE_SN_STATUS") + @ApiParam(value = "目的单据条码状态") + private Integer destMoveSnStatus; + public WmsRoutingRule(){} }