From d7c9647ca50abba2ad320d86ece7e2a63b42fb3b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Mar 2020 14:36:06 +0800 Subject: [PATCH 001/107] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 116 --------------------- 1 file changed, 116 deletions(-) delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java deleted file mode 100644 index 9e7722d..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ /dev/null @@ -1,116 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.sqlpack; - -import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; -import com.mongodb.BasicDBObject; -import org.bson.conversions.Bson; - -/** - * @Description : Bson对象封装 - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-11-08 13:15 - * @Modify: - **/ -public class CoreBsonPack { - - /** - * 日志复杂查询 - * - * @param logSystem - * @return - */ - public static Bson packBsonByLogSystem(SysLogSystem logSystem) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson); - bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false); - bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson); - - return bson; - } - - /** - * 系统操作日志 - * - * @param logOperate - * @return - */ - public static Bson packBsonByLogOperate(SysLogOperate logOperate) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson); - bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false); - bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson); - - return bson; - } - - /** - * 系统异常日志复杂查询 - * - * @param sysLogException - * @return - */ - public static Bson packBsonBySysLogException(SysLogException sysLogException) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson); - bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false); - - return bson; - } - - /** - * 定时任务日志复杂查询 - * - * @param sysLogTaskTime - * @return - */ - public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson); - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson); - bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false); - - return bson; - } - - /** - * 区间 - * - * @param colName - * @param min - * @param max - * @return - */ - public static Bson packBsonByInterval(String colName, Object min, Object max) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumBiggerPack(min, colName, bson); - bson = BsonPackTool.getNumSmallerPack(max, colName, bson); - - return bson; - } - - /** - * 指定日期之后 - * @param dateTime 日期 - * @return - */ - public static Bson packBsonByDateTimeAfter(String dateTime){ - return BsonPackTool.timeLess(dateTime, "createDatetime", null, true); - } -} From 262edb9fec111c7a6445aa5c4f6d274f854840ed Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 13 Mar 2020 17:33:52 +0800 Subject: [PATCH 002/107] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96,=20Es=20Tool=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E8=81=9A=E5=90=88=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 57bb047..c9d392c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -54,6 +54,10 @@ public class SysLogOperate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") private Integer operateType; + public String getOperateTypeName(){ + return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType); + } + @Column(name="OPERATE_MESSAGE") @ApiParam(value ="操作信息" , access ="操作信息") private String operateMessage; From 4c199ce8bad46531ba0edc3ef6e930bf6e63d3f1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 20 Mar 2020 09:39:35 +0800 Subject: [PATCH 003/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A11470=E3=80=90=201470?= =?UTF-8?q?=20504=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7--=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E3=80=91=20=E4=BB=BB=E5=8A=A11467=E3=80=901467=20506=20?= =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E5=85=A5=E5=BA=93-=E6=96=B0=E5=A2=9E=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E5=8A=A8=E6=80=81=E5=BA=93=E4=BD=8D=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=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/WmsLocate.java | 10 ++++++++++ .../estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java | 7 +++++++ 2 files changed, 17 insertions(+) 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 ee6babb..a69e24b 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; @@ -47,6 +48,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") private Integer locateType; @@ -192,6 +194,14 @@ public class WmsLocate extends BaseBean { this.destBoxQty = destBoxQty; } + public WmsLocate(String locateNo,Integer destBoxQty, Integer y, Integer x, Integer z) { + this.locateNo = locateNo; + this.destBoxQty = destBoxQty; + this.y = y; + this.x = x; + this.z = z; + } + public WmsLocate(Integer boxQty , Double partQty,String locateNo){ this.boxQty=boxQty; this.partQty=partQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java index 480fb35..c9fcfd4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java @@ -48,4 +48,11 @@ public class GenerateLocateRule { * 物料名称 */ private String partNo; + + /** + * 按照坐标排序 + */ + private boolean orderByAxle; + + } From 549f2ff7979a6d655f730daa09aad36892fc6dd1 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 23 Mar 2020 18:43:46 +0800 Subject: [PATCH 004/107] =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index fff23d9..302aa0f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1871,4 +1871,50 @@ public class CommonEnumUtil { } } + /** + * 变量类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LICENSE_SOURCE { + LOCAL_SYSTEM_FILE(1, "本地文件"), + NETWORK_ESTSH(2, "网络-官方授权"), + SENSE_HARDWARE_USB_LOCK(3, "硬件锁"), + SENSE_SOFTWARE_CODE_LOCK(4, "软锁"); + + private int value; + private String description; + + private LICENSE_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + 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; + } + } } From f005489b61a2cd2fff9d2e7e20bcdf6cbbf38044 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 24 Mar 2020 13:15:35 +0800 Subject: [PATCH 005/107] ptl --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 41fc4d0..05b54f6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -33,6 +33,10 @@ public class PtlMainTask extends BaseBean implements Serializable { @ApiParam("主任务编号") private String taskNo; + @Column(name = "ORDER_NO") + @ApiParam("业务单号") + private String orderNo; + @Column(name = "SEQ") @ApiParam("主任务顺序号") private Integer seq; From 0c3d14a3f95d54dce29f506353cf0bb304b9e3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 24 Mar 2020 14:22:35 +0800 Subject: [PATCH 006/107] =?UTF-8?q?wms=E6=8F=92=E4=BB=B6=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE=E5=A2=9E=E5=BC=BA=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B?= 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 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 309bdcc..02f71d3 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 @@ -5152,13 +5152,14 @@ public class WmsEnumUtil { } /** - * 插件类型 10-PDA插件，20-交易处理插件 + * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLUGIN_TYPE { PDA_PLUGIN(10, "PDA_PLUGIN", "PDA插件"), - TRANS_PLUGIN(20, "TRANS_PLUGIN", "交易处理插件"); + BTN_PLUGIN(20, "BTN_PLUGIN", "按钮增强插件"), + TRANS_PLUGIN(30, "TRANS_PLUGIN", "交易处理插件"); private int value; private String code; From 0ca85027516f957fe3b946dd29356a5dab451b56 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 24 Mar 2020 18:52:29 +0800 Subject: [PATCH 007/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A1518?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 18 ++--- .../i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 18 ++++- .../estsh/i3plus/pojo/ptl/model/MesQueueOrder.java | 91 ++++++++++++++++++++++ .../i3plus/pojo/ptl/model/MesQueueOrderDetail.java | 90 +++++++++++++++++++++ .../estsh/i3plus/pojo/ptl/model/MesStationBom.java | 83 ++++++++++++++++++++ 5 files changed, 290 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java 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 86e527d..4a4bb65 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 @@ -1469,9 +1469,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_TYPE { - CREATE(10, "CREATE", "JIT任务"), - RECEIPT(20, "IN_PROGRESS", "单据任务"), - RECEIPT_FINISH(30, "COMPLETED", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; @@ -1560,9 +1560,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_TYPE { - CREATE(10, "JIT_TASK", "JIT任务"), - RECEIPT(20, "DOCUMENT_TASK", "单据任务"), - RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; @@ -1606,9 +1606,9 @@ public class PtlPcnEnumUtil { */ @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", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; 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 index ba3146c..a0eb09b 100644 --- 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 @@ -38,9 +38,17 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable { private String partNo; @Column(name = "PART_NAME") - @ApiParam("产品物料名称") + @ApiParam("产品物料号名称") private String partName; + @Column(name = "ITEM_PART_NO") + @ApiParam("拣选物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("拣选物料名称") + private String itemPartName; + @Column(name = "QTY") @ApiParam("数量") private Integer qty; @@ -49,4 +57,12 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable { @ApiParam("物料种类") private Integer partCategory; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java new file mode 100644 index 0000000..167a62d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 生产队列主表 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@ApiModel("生产队列主表") +public class MesQueueOrder implements Serializable { + + private static final long serialVersionUID = -3124113504001270712L; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("Vin") + private String vinCode; + + @ApiParam("客户标识号") + private String custFlagNo; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + + @ApiParam("排序") + private Double seq; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("状态") + private Integer status; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("锁定标识") + private Integer isLock; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("工单类型") + private String workType; + + @ApiParam("队列类型") + private Integer queueType; + + @ApiParam("生产组代码") + private String pgCode; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java new file mode 100644 index 0000000..48d66be --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 生产队列明细 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@ApiModel("生产队列明细") +public class MesQueueOrderDetail implements Serializable { + + private static final long serialVersionUID = 1945173626511595078L; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("队列明细序号") + private Double seq; + + @ApiParam("数量") + private Double qty; + + @ApiParam("状态") + private Integer status; + + @ApiParam("生产类型") + private String workType; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; + + @ApiParam("产品类型名称") + private String pptCode; + + @ApiParam("分组队列编号") + private String queueGroupNo; + + @ApiParam("组内编号") + private Integer groupNo; + + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; + + @ApiParam("已生产数量") + private Double finsihQty; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java new file mode 100644 index 0000000..fdfb332 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.ptl.model; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :工位物料清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@ApiModel("工位物料清单") +public class MesStationBom implements Serializable { + + private static final long serialVersionUID = -2658812944873600461L; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("产品物料名称") + private String partName; + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("子零件") + private String itemPartNo; + + @ApiParam("原材料物料名称") + private String itemPartName; + + @ApiParam(value = "子零件数量") + private Double qty; + + @ApiParam(value = "是否可重复") + private Integer isRepeat; + + @ApiParam(value = "是否检查") + private Integer isCheck; + + @ApiParam(value = "是否投料配置") + private Integer isFeed; + + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @ApiParam(value = "匹配规则") + private Integer matchRule; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + +} From 8b750e6a769066153f99dc050f09d09f642dd62f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 25 Mar 2020 11:28:36 +0800 Subject: [PATCH 008/107] =?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=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 8 ++- .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesRouteStatus.java | 78 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 8 +++ 4 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index befec26..5dd8c97 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -55,9 +55,9 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("数据下限") private Double lowerLimit; - @Column(name = "TERMINAL_ID") + @Column(name = "WORK_CELL_CODE") @ApiParam("工位") - private Integer terminalId; + private String workCellCode; @Column(name = "TORQUE_GROUP") @ApiParam("扭矩组") @@ -79,6 +79,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("JOB_ID") private Integer jobId; + @Column(name = "LAST_TIGHTENING_ID") + @ApiParam("最后一次扭矩id") + private Long lastTighteningId; + @Transient @ApiParam("扭矩值") private Double torqueValue; 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 8590fbb..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 @@ -113,7 +113,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private List lineData; + private String lineData; @Lob @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java new file mode 100644 index 0000000..780af83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java @@ -0,0 +1,78 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_ROUTE_STATUS") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态") +public class MesRouteStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 4988786372428896721L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Long actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入状态调用") + private Long inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开状态调用") + private Long outAmgId; + + @Column(name = "STATUS_TYPE") + @ApiParam("状态类型") + private Integer statusType; + + +} 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 6fcf819..5ff5cdc 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -98,6 +100,12 @@ public class StationRequestBean implements Serializable { @ApiParam("数据map") private Map dataMap; + @ApiParam("流程状态集合") + private List routeStatusList; + + @ApiParam("当前流程状态") + private MesRouteStatus curRouteStatus; + @Override public String toString() { return "StationRequestBean{" + From 98787953ec9e951fe8b60e497a31c5a5bfd95cf2 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 25 Mar 2020 14:25:45 +0800 Subject: [PATCH 009/107] =?UTF-8?q?=E3=80=90MesPcnEnum=20=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E4=BF=AE=E6=94=B9=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/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 371e3aa..3e0e184 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 @@ -202,7 +202,7 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); From e3a9defdab15291ba671f3f4df341b19447b644f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 25 Mar 2020 15:07:05 +0800 Subject: [PATCH 010/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A11528=EF=BC=8C?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B9=B6=E6=89=93=E5=8D=B0=E9=97=A8=E9=94=81?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 41 ++-------------------- .../i3plus/pojo/mes/model/StepPrintSnModel.java | 5 +++ 3 files changed, 11 insertions(+), 39 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 e42d084..ad2e0e4 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 @@ -1239,7 +1239,9 @@ public class MesEnumUtil { public enum MES_PRODUCE_SN_TYPE { NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); + FIRST_INSPECTION(20, "首检件"), + HALF_PRODUCT(30, "半成品"), + KP(40, "关键件"); 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 371e3aa..ce35b5b 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 @@ -418,7 +418,9 @@ public class MesPcnEnumUtil { public enum MES_PRODUCE_SN_TYPE { NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); + FIRST_INSPECTION(20, "首检件"), + HALF_PRODUCT(30, "半成品"), + KP(40, "关键件"); private int value; private String description; @@ -2215,43 +2217,6 @@ public class MesPcnEnumUtil { } /** - * 条码类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PCN_SN_TYPE { - - NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); - - private int value; - private String description; - - PCN_SN_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int 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 == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - - /** * MesPlanOrder实体对应的source值 计划来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 91cd118..9685268 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; + /** * @Description: 打印条码工步， 打印信息模板 * @Reference: @@ -18,6 +20,9 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("打印描述") private String printDesc; + @ApiParam(value = "打印时间") + private String printTime; + @ApiParam("条码") private String barCode; From 06551fdd66ac04a8444079411fc2e264f0bf3506 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 25 Mar 2020 18:04:10 +0800 Subject: [PATCH 011/107] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4fa7c5a..1414885 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..0db7b7d 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2ffb2ae..bca9cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 56c1bf8c443a29b649ff5c810c6eff920280354d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 25 Mar 2020 18:33:39 +0800 Subject: [PATCH 012/107] =?UTF-8?q?=E3=80=907648=20=E5=9C=A8=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=8D=95=E6=8D=AE=E6=8C=89=E9=92=AE=E3=80=82?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8b79c72..10e116b 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 @@ -105,7 +105,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; /** From 3a7d7a79248e646326239ebfdc4e9a4287a17202 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 25 Mar 2020 18:36:08 +0800 Subject: [PATCH 013/107] =?UTF-8?q?bug7754=E3=80=907754=20=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=B8=80=E4=B8=AA=E6=8E=A5=E6=94=B6=E5=AF=B9=E6=96=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=9C=A8=E6=88=91=E4=BB=AC=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E8=A7=A6=E5=8F=91=E6=8A=A5=E5=B7=A5=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=BD=93=E6=8E=A5=E6=94=B6=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E7=84=B6=E5=90=8E=E8=87=AA=E5=8A=A8=E5=AF=B9?= =?UTF-8?q?=E8=AF=A5=E6=A0=87=E7=AD=BE=E8=BF=9B=E8=A1=8C=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=B8=AD=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E4=BA=86=E6=9D=A1=E7=A0=81=EF=BC=8C=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 5 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++ 4 files changed, 72 insertions(+) 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..d7b4c19 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 @@ -139,6 +139,15 @@ public class WmsEnumUtil { } return tmp; } + 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; + } } @@ -2977,6 +2986,16 @@ public class WmsEnumUtil { } return tmp; } + + 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; + } } /** @@ -5150,4 +5169,45 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_TYPE(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 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; + } + } } \ No newline at end of file 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 74d1911..b807a04 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 @@ -170,6 +170,10 @@ public class WmsDocMovementMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description") private Integer isSingleStep; + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") + @ApiParam(value = "QAD发运单据类型") + private String erpSrcType; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 741493d..2833b2f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -183,6 +183,11 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否预收货") public Integer priorRC = 2; + + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") + @ApiParam(value = "QAD发运单据类型") + private String erpSrcType; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; 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 793e485..68b8086 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 @@ -1908,6 +1908,9 @@ public class WmsHqlPack { if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); } + if (wmsTransModule.getId() != null) { + DdlPreparedPack.getNumEqualPack(wmsTransModule.getId(), "id", packBean); + } if (StringUtils.isNotBlank(wmsTransModule.orderBy())) { packBean.setOrderByStr(wmsTransModule.orderBy()); } From 048419d82365e6ded93f3bd4b589138e60b6b13c Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 25 Mar 2020 19:21:51 +0800 Subject: [PATCH 014/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=97=B6=E7=89=88=E6=9C=AC=E5=8F=B7=E7=9A=84=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87?= =?UTF-8?q?mvn=20clean=20install=20Pdev=20=E5=91=BD=E4=BB=A4=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=89=93=E5=8C=85,=E6=9C=80=E5=90=8Edev=E8=BF=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9B=B4=E6=8D=A2=E4=B8=BAtest=E3=80=81prod?= =?UTF-8?q?=E3=80=81docker=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-aps/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-base/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-form/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-hardswitch/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-jobflow/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-lac/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-mes-pcn/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-mes/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-model/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-platform/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-ptl/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-report/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-softswitch/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-sweb/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-wms/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-workflow/pom.xml | 35 ++++++++++++++++++++++++++++++++-- pom.xml | 35 ++++++++++++++++++++++++++++++++-- 18 files changed, 594 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..2bb8b09 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,5 +19,37 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4fa7c5a..4591fe3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -23,5 +23,37 @@ hibernate-validator + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..0e3621b 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -41,7 +41,38 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..4d0a808 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -20,4 +20,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..ecf48ed 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,44 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..2241e93 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,13 +5,44 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..c9fd4ee 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,5 +19,37 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..27731be 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..2ba9ddd 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..3fd87ac 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -60,6 +60,37 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..c0524de 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..4b73b1a 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,4 +19,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..4ebc2f7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -20,4 +20,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..b3c4fc8 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -20,4 +20,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..b601666 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..2d56516 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -23,6 +23,37 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..4395f3c 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,13 +5,44 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2ffb2ae..96a06e4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -222,5 +222,36 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file From d8779f42fbe1b3469df0eaaba43dfee872d24d85 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Mar 2020 16:00:55 +0800 Subject: [PATCH 015/107] =?UTF-8?q?=E4=BB=8Edev=E6=8B=89=E5=8F=96=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 141 ++++++++++++++++++++- .../estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 4 + .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 51 ++++++++ .../i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 4 + .../i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 8 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 15 +++ .../pojo/wms/modelbean/WmsPullOrderModel.java | 39 ++++++ .../pojo/wms/repository/WmsPullRuleRepository.java | 16 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 +++ 12 files changed, 306 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java 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 4fd1ad6..a0dd0ef 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 @@ -4512,7 +4512,9 @@ public class WmsEnumUtil { SAFETY_STOCK_PULL(10, "安全库存拉动"), ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"), LINE_PULL(30, "巡线拉动"), - PLANNED_PULL(40, "计划拉动"); + PLANNED_PULL(40, "计划拉动"), + ANDON_PULL(50, "安灯拉动"), + EXTERNAL_PULL(60, "手工拉动"); private int value; private String description; @@ -4551,6 +4553,53 @@ public class WmsEnumUtil { } /** + * 尾数计算方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAIL_QTY_MODE { + NONE(1, "不处理"), + ORIGIN_NUMBER(10, "原数值"), + UP_ROUND(20, "向上取整"), + DOWN_ROUND(30, "向下取整"); + + private int value; + private String description; + + TAIL_QTY_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static TAIL_QTY_MODE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** * 收货看板状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -5301,4 +5350,94 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 存储区-补货方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ZONE_PULL_WAY { + JOB_CYCLE(10, "JOB周期"), + FIXED_CYCLE(20, "固定周期"); + + private int value; + private String description; + + ZONE_PULL_WAY(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static ZONE_PULL_WAY codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** + * 拉动任务-任务类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_TYPE { + NORMAL_PULL(10, "普通拉动"), + GROUP_PULL(20, "组合拉动"); + + private int value; + private String description; + + PULL_TASK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PULL_TASK_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index b87c776..04436ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -52,6 +52,10 @@ public class MesPpDetails extends BaseBean{ @ApiParam(value = "工单数量", example = "0") public Double qty; + @Column(name="PART_GROUP_NO") + @ApiParam("零件组号") + public String partGroupNo; + public Integer getItem() { return item == null ? 0 : this.item.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index e9d4e61..8ec1cae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -58,6 +58,10 @@ public class MesPpMaster extends BaseBean{ @ApiParam(value = "单据状态", example = "0") private Integer orderStatus = 0; + @Column(name="SEQ") + @ApiParam(value = "排序号", example = "0") + private Integer seq = 0; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index a0ea3cb..c4b5956 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -62,6 +62,10 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "安全库存", example = "0") private Double safetyStock; + @Column(name = "MOQ", columnDefinition = "decimal(18,8)") + @ApiParam(value = "起订量", example = "0") + private Double moq; + @Transient @ApiParam("库位类型") private Integer locateType; 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 85ec609..ca95598 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 @@ -244,6 +244,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "拉动方式") private String pullWay; + @Column(name = "TAIL_QTY_MODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @ApiParam(value = "尾数计算方式", example = "1") + private Integer tailQtyMode; + @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java new file mode 100644 index 0000000..90b3a58 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.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.Index; +import javax.persistence.Table; + +/** + * @Description 拉动规则实体 + * @Author Jason + * @Date 2020-03-20 + * @ModifyDate 2020-03-20 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PULL_RULE") +@Api("拉动规则") +public class WmsPullRule extends BaseBean { + @Column(name = "PULL_WAY") + @ApiParam(value = "拉动类型", example = "10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS") + private Integer pullWay; + + @Column(name = "CONTAIN_UNFINISH_ORDER") + @ApiParam(value = "考虑未完成的移库单", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + private Integer containUnfinishOrder; + + @Column(name = "CONTAIN_EXIST_PERIOD") + @ApiParam(value = "考虑现有库存", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + private Integer containExistStock; + + @Column(name = "TAIL_QTY_MODE") + @ApiParam(value = "尾数计算方式", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + private Integer tailQtyMode; +} 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 0a41d3e..4eaabf1 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 @@ -110,6 +110,10 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam(value = "明细状态", example = "0") private Integer orderStatus = 0; + @Column(name="PART_GROUP_NO") + @ApiParam("零件组号") + public String partGroupNo; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index f7d6c15..aa9559c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -62,6 +62,14 @@ public class WmsPullTaskMaster extends BaseBean{ @ApiParam(value = "是否暂停", example = "0") private Integer isSuspend = 2; + @Column(name="PULL_TASK_TYPE") + @ApiParam(value = "拉动任务类型", example = "10") + private Integer pullTaskType; + + @Column(name="SEQ") + @ApiParam(value = "排序号", example = "0") + private Integer seq; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index e11133a..f916604 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -117,6 +117,21 @@ public class WmsZones extends BaseBean { @ApiParam(value = "三维位置") private String position; + @Column(name = "ZONE_PULL_WAY") + @ApiParam(value = "补货方式", example = "10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY") + private Integer zonePullWay; + + @Column(name = "PULL_CYCLE") + @ApiParam(value = "固定拉动周期", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer pullCycle; + + @Column(name = "LAST_PULL_TIME") + @ApiParam(value = "上次拉动时间") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String lastPullTime; + @Transient @ApiParam(value = "子存储区列表") private List childList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java new file mode 100644 index 0000000..6a41bbc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @description + * @author jason.niu + * @date 2020/03/25 + */ +@Data +@Api("外部拉动单模型") +public class WmsPullOrderModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("车间") + private String workShopCode; + + @ApiParam("产线") + private String lineNo; + + @ApiParam("库位") + private String locateNo; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("供应商") + private String vendorNo; + + @ApiParam("数量") + private Double qty; + + @ApiParam("业务类型") + private Integer busiType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java new file mode 100644 index 0000000..efb40b5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullRule; +import org.springframework.stereotype.Repository; + +/** + * @Description :拉动规则Repository的方法接口 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-23 15:38 + * @Modify: + **/ +@Repository +public interface WmsPullRuleRepository extends BaseRepository { +} 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 68b8086..09eaafe 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 @@ -559,6 +559,22 @@ public class WmsHqlPack { } /** + * 拉动规则 分页查询 + * @param rule + * @return + */ + public static DdlPackBean packHqlWmsPullRule(WmsPullRule rule) { + //查询参数封装 + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(rule.getPullWay(), "pullWay", result); + + getStringBuilderPack(rule, result); + return result; + } + + /** * 根据类型查询库位分页 * * @param wmsLocate From 320969f2f0dbe47adb451c95a9b65582e921671c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Mar 2020 09:37:31 +0800 Subject: [PATCH 016/107] =?UTF-8?q?=E3=80=901527=20=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E6=A0=87=E7=AD=BE=E8=87=AA=E5=8A=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=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/mes/bean/MesProdBindRecord.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 9d048c0..61a2dc8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -29,8 +29,6 @@ import java.io.Serializable; @Index(columnList = "KP_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "ITEM_PART_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "KP_SN"}) }) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean implements Serializable { From 7a6e9b9e218d06692a39352ea60bd895a3c2312a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 26 Mar 2020 14:33:16 +0800 Subject: [PATCH 017/107] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1479=20?= =?UTF-8?q?=E6=96=99=E6=9E=B6=E6=89=93=E5=8D=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesLabelTemplate.java | 3 ++ ...EsProductData.java => EsProductDataModule.java} | 7 +++-- .../i3plus/pojo/mes/model/QueueOrderModel.java | 2 ++ .../i3plus/pojo/mes/model/StationRequestBean.java | 3 ++ .../i3plus/pojo/mes/model/StepPrintSnModel.java | 4 +++ 6 files changed, 53 insertions(+), 2 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{EsProductData.java => EsProductDataModule.java} (89%) 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 d48d6ad..81a11c6 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 @@ -3138,4 +3138,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 表格颜色 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TABLE_COLOR { + + GREEN("green", "绿色"), + YELLOW("Yellow", "黄色"); + + private String code; + private String description; + + TABLE_COLOR(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 7555717..f11ae4d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -42,6 +42,9 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam(value = "模板内容") private String templateContent; + @ApiParam(value = "第二个模板内容") + private String otherTemplateContent; + // 参数拼接，多参数都好分隔，后台在做处理 @ApiParam(value = "模板参数拼接") @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index eaba2fa..b04492c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,12 +3,15 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; +import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Map; /** * @Description: @@ -20,7 +23,7 @@ import java.io.Serializable; @AllArgsConstructor @NoArgsConstructor @ElasticSearch -public class EsProductData extends BaseBean implements Serializable { +public class EsProductDataModule extends BaseBean implements Serializable { private static final long serialVersionUID = 4514407617515827040L; @@ -80,7 +83,7 @@ public class EsProductData extends BaseBean implements Serializable { @Json4Es @ApiParam("生产数据") - private String lineData; + private ArrayList lineData; @ApiParam("字段总数") private Integer fieldNum; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 195d0d4..f230fa8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -66,6 +66,8 @@ public class QueueOrderModel implements Serializable { private Integer groupNo; @ApiParam("产品配置代码") private String prodCfgCode; + @ApiParam("是否已扫描") + private int isScan; public QueueOrderModel() { } 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 5ff5cdc..0aef82a 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 @@ -97,6 +97,9 @@ public class StationRequestBean implements Serializable { @ApiParam("生产主队列编号") private String orderNo; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("数据map") private Map dataMap; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 9685268..0bc1675 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -96,5 +96,9 @@ public class StepPrintSnModel extends MesProduceSn { private String jitCarNo; @ApiParam("车型代码") private String carModuleCode; + @ApiParam("上一个序列号") + private Double lastQueDetailSeq; + @ApiParam("包装数量") + private Integer pgCodeNum; } From 35351607f8984555d342b61eb8ca8fab902c07ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Mar 2020 15:17:35 +0800 Subject: [PATCH 018/107] =?UTF-8?q?=E3=80=90MES=5F=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E7=AE=B1=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A=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/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d48d6ad..61cd451 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 @@ -2928,7 +2928,7 @@ public class MesPcnEnumUtil { BARCODE_RULE_MATCHING(10, "条码规则匹配"), PROCESS_BARCODE_MATCHING(20, "过程条码匹配"), - BAR_CODE_MATCHING(20, "条码匹配"); + BAR_CODE_MATCHING(30, "箱条码匹配"); private int value; private String description; From e2a7bc43afe0fbf4743a6dbc359893b75e601de6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Mar 2020 15:48:34 +0800 Subject: [PATCH 019/107] =?UTF-8?q?bug7918=E3=80=907918=20=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=9C=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E7=BC=BA=E5=B0=91=E4=B8=80?= =?UTF-8?q?=E8=A1=8C=E5=85=B3=E8=81=94=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=EF=BC=88=E6=9B=B4=E6=96=B0=E5=90=8E=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 41 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) 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 4fd1ad6..3d0ef18 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 @@ -5301,4 +5301,45 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_TYPE(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 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; + } + } } \ No newline at end of file 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 8688652..468634a 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 @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } From bf427bbb31034a718bd50a9ea2b2f45c3196ae21 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Mar 2020 16:08:05 +0800 Subject: [PATCH 020/107] =?UTF-8?q?bug7918=E3=80=907918=20=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=9C=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E7=BC=BA=E5=B0=91=E4=B8=80?= =?UTF-8?q?=E8=A1=8C=E5=85=B3=E8=81=94=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=EF=BC=88=E6=9B=B4=E6=96=B0=E5=90=8E=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 8688652..468634a 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 @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } From 0502f6d736eaed5556e7a010e7ed93a8840015a1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Mar 2020 17:27:32 +0800 Subject: [PATCH 021/107] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A152?= =?UTF-8?q?9=EF=BC=8C=E6=96=99=E6=9E=B6=E5=88=86=E7=BB=84=E9=98=9F?= =?UTF-8?q?=E5=88=97=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 25 ++++++ .../pojo/mes/bean/MesWorkCellPointGroup.java | 89 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 15 ++++ .../MesWorkCellPointGroupRepository.java | 16 ++++ 4 files changed, 145 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.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 81a11c6..4f212ba 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 @@ -1963,6 +1963,31 @@ public class MesPcnEnumUtil { } /** + * 工站分组队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_POINT_GROUP_STATUS { + CREATE(10, "创建"), + COMPLETE(20, "完成"); + + private int value; + private String description; + + WORK_CELL_POINT_GROUP_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * MesPartCategory实体对应的categoryType值 条码表条码质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java new file mode 100644 index 0000000..9b36072 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : 工站分组队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT_GROUP") +@Api("工站分组队列") +public class MesWorkCellPointGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = -6817903235638554748L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "ORDER_NO") + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private Double queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private Double queueDetailSeq; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Transient + @ApiParam("显示颜色") + private String color; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0 : this.queueSeq; + } + + public double getQueueDetailSeqVal() { + return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f230fa8..60b7948 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -69,6 +69,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("是否已扫描") private int isScan; + @ApiParam("队列编号") + private String orderNo; + public QueueOrderModel() { } @@ -126,4 +129,16 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; } + + public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.orderNo = orderNo; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.java new file mode 100644 index 0000000..921dcb6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPointGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description :工站分组队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 14:40 + * @Modify: + **/ +@Repository +public interface MesWorkCellPointGroupRepository extends BaseRepository { +} From 1cf4943751cdc4b8fc25a37f92e32d38f1a0ada3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Mar 2020 18:15:06 +0800 Subject: [PATCH 022/107] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 87a1750..4591fe3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,12 +5,12 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 - i3plus-pojo-andon + i3plus-pojo-aps jar @@ -18,6 +18,10 @@ i3plus.pojo i3plus-pojo-base + + org.hibernate.validator + hibernate-validator + From 5e2c592bbd5356485746f13829c446537551cfcb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Mar 2020 18:15:36 +0800 Subject: [PATCH 023/107] =?UTF-8?q?=E3=80=90IOT=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4591fe3..2bb8b09 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - i3plus-pojo-aps + i3plus-pojo-andon jar @@ -18,10 +18,6 @@ i3plus.pojo i3plus-pojo-base - - org.hibernate.validator - hibernate-validator - From d80b341620329dc83ff48146a7b144f027b3033f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 27 Mar 2020 10:23:33 +0800 Subject: [PATCH 024/107] =?UTF-8?q?=E8=BF=98=E5=8E=9Ftest=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- .../i3plus/pojo/mes/model/StepDispatchModel.java | 5 +++- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 34 +--------------------- 19 files changed, 22 insertions(+), 51 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index a616b12..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4591fe3..5ad51a1 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0e3621b..e74f5ed 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 4d0a808..aa8f7a2 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index ecf48ed..7e87d1a 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 2241e93..062455e 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index c9fd4ee..a6258be 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 27731be..e958e79 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 2ba9ddd..d5ed765 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index bf9d485..7585012 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -18,12 +18,15 @@ public class StepDispatchModel { private String cellParamKey; + private String requestBeanKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; this.scanInfo = scanInfo; } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3fd87ac..1c2fd71 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index c0524de..12f9ad0 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4b73b1a..27e1b60 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4ebc2f7..91d3fdd 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b3c4fc8..756086b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index b601666..770ace5 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 2d56516..c4dbbbe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 4395f3c..6f974d5 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 96a06e4..37371d2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -222,36 +222,4 @@ - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${profileActive}-${project.version} - \ No newline at end of file From c8c7c733362e7a986c6b7d13e4690ff8a642876c Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Mar 2020 11:28:50 +0800 Subject: [PATCH 025/107] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E5=B8=83=E5=B1=80,=E5=85=83=E7=B4=A0,=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockReportEnumUtil.java | 10 +- .../pojo/model/report/BrDynamicPageModel.java | 37 +++++ .../cn/estsh/i3plus/pojo/report/bean/BrLayout.java | 33 +---- .../i3plus/pojo/report/bean/BrLayoutColumn.java | 160 ++++++++++----------- .../i3plus/pojo/report/bean/BrLayoutElement.java | 76 ++++++++++ .../estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 132 ++++++++--------- .../{BrRefReportTypeset.java => BrRefReport.java} | 50 +++---- .../cn/estsh/i3plus/pojo/report/bean/BrReport.java | 39 ++--- .../i3plus/pojo/report/bean/BrReportTemplate.java | 2 +- .../repository/BrLayoutColumnRepository.java | 28 ++-- ...ository.java => BrLayoutElementRepository.java} | 4 +- .../report/repository/BrLayoutRowRepository.java | 28 ++-- .../report/repository/BrRefReportRepository.java | 14 ++ .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 46 ++++-- 14 files changed, 380 insertions(+), 279 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/{BrRefReportTypeset.java => BrRefReport.java} (60%) rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/{BrRefReportTypesetRepository.java => BrLayoutElementRepository.java} (58%) create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index f012813..8f6a2f2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -785,20 +785,20 @@ public class BlockReportEnumUtil { /** * 报表排版枚举 - * ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + * ELEMENT(1,"元素"),TEMPLATE(2,"对象视图"); */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPORT_TYPESET_TYPE{ + public enum REPORT_REF_TYPE{ - ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + ELEMENT(1,"元素"),TEMPLATE(2,"对象视图"); private int value; private String description; - REPORT_TYPESET_TYPE() { + REPORT_REF_TYPE() { } - REPORT_TYPESET_TYPE(int value, String description) { + REPORT_REF_TYPE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java new file mode 100644 index 0000000..9dc5df5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.model.report; + +import cn.estsh.i3plus.pojo.report.bean.BrElement; +import cn.estsh.i3plus.pojo.report.bean.BrLayout; +import cn.estsh.i3plus.pojo.report.bean.BrRefReport; +import cn.estsh.i3plus.pojo.report.bean.BrReport; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-3-24 下午3:28 + * @Modify: + **/ +@Data +public class BrDynamicPageModel { + + @ApiParam(value ="报表信息") + private BrReport report; + + @ApiParam(value ="布局信息") + private BrLayout layout; + + @ApiParam(value = "报表排版关系") + private List refReportList; + + @ApiParam(value ="页面元素内容") + private List elementList; + + @ApiParam(value ="页面元素内容") + private List templateModelList; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java index 8f74c2a..0c06f20 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java @@ -28,41 +28,16 @@ import java.util.List; @Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1") public class BrLayout extends BaseBean { + private static final long serialVersionUID = -3790563562881742852L; @Column(name="LAYOUT_NAME") - @ApiParam(value ="名称") + @ApiParam(value ="布局名称") private String layoutName; - @Column(name="LAYOUT_WIDTH") - @ApiParam(value ="布局宽度") - private Double layoutWidth; - - @Column(name="LAYOUT_HEIGHT") - @ApiParam(value ="布局高度") - private Double layoutHeight; - - @Column(name="LAYOUT_ROW_COUNT") - @ApiParam(value ="行数") - private Integer layoutRowCount; - - @Column(name="LAYOUT_COLUMN_COUNT") - @ApiParam(value ="列数") - private Integer layoutColumnCount; - - @Column(name="LAYOUT_REPORT_COUNT") - @ApiParam(value ="引用报表数量") - private Integer layoutReportCount; - -// @Lob -// @Column(name="LAYOUT_HTML") -// @ApiParam(value ="布局html") -// private String layoutHtml; -// -// @Lob @Column(name = "LAYOUT_DESCRIPTION") @ApiParam(value ="布局描述") private String layoutDescription; @Transient - @ApiParam(value ="模板行列表") - private List brLayoutRows; + @ApiParam(value ="行所包含的元素") + private List elementList; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index 19ca013..5df1631 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -1,80 +1,80 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -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 org.hibernate.annotations.Type; - -import javax.persistence.*; -import java.util.List; - -/** - * @Description : 自定义报表布局 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-25 19:54 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_LAYOUT_COLUMN") -@Api(value="自定义报表布局-列",description = "一行包含多列") -public class BrLayoutColumn extends BaseBean { - - @Column(name="LAYOUT_ID") - @ApiParam(value ="布局主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutId; - - @Column(name="LAYOUT_ROW_ID") - @ApiParam(value ="行主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutRowId; - - @Column(name="COLUMN_COLSPAN") - @ApiParam(value ="跨列数") - private Integer columnColspan; - - @Column(name="COLUMN_ROWSPAN") - @ApiParam(value ="跨行数") - private Integer columnRowspan; - - @Column(name="COLUMN_WIDTH") - @ApiParam(value ="列宽") - private Integer columnWidth; - - @Column(name="COLUMN_HEIGHT") - @ApiParam(value ="列高") - private Integer columnHeight; - - @Column(name="COLUMN_STYLE") - @ApiParam(value ="列样式") - private String columnStyle; - - @Column(name="COLUMN_SEQ") - @ApiParam(value ="序列") - private Integer columnSeq; - - @Column(name="COLUMN_SORT") - @ApiParam(value ="排序，降序") - private Integer columnSort; - -// @Lob - @Column(name = "COLUMN_DESCRIPTION") - @ApiParam(value ="列描述") - private String columnDescription; - -// @Lob -// @Column(name="COLUMN_HTML") -// @ApiParam(value ="列html") -// private String columnHtml; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//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 org.hibernate.annotations.Type; +// +//import javax.persistence.*; +//import java.util.List; +// +///** +// * @Description : 自定义报表布局 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-25 19:54 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_LAYOUT_COLUMN") +//@Api(value="自定义报表布局-列",description = "一行包含多列") +//public class BrLayoutColumn extends BaseBean { +// +// @Column(name="LAYOUT_ID") +// @ApiParam(value ="布局主键") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long layoutId; +// +// @Column(name="LAYOUT_ROW_ID") +// @ApiParam(value ="行主键") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long layoutRowId; +// +// @Column(name="COLUMN_COLSPAN") +// @ApiParam(value ="跨列数") +// private Integer columnColspan; +// +// @Column(name="COLUMN_ROWSPAN") +// @ApiParam(value ="跨行数") +// private Integer columnRowspan; +// +// @Column(name="COLUMN_WIDTH") +// @ApiParam(value ="列宽") +// private Integer columnWidth; +// +// @Column(name="COLUMN_HEIGHT") +// @ApiParam(value ="列高") +// private Integer columnHeight; +// +// @Column(name="COLUMN_STYLE") +// @ApiParam(value ="列样式") +// private String columnStyle; +// +// @Column(name="COLUMN_SEQ") +// @ApiParam(value ="序列") +// private Integer columnSeq; +// +// @Column(name="COLUMN_SORT") +// @ApiParam(value ="排序，降序") +// private Integer columnSort; +// +//// @Lob +// @Column(name = "COLUMN_DESCRIPTION") +// @ApiParam(value ="列描述") +// private String columnDescription; +// +//// @Lob +//// @Column(name="COLUMN_HTML") +//// @ApiParam(value ="列html") +//// private String columnHtml; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java new file mode 100644 index 0000000..deb7fed --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-3-24 下午2:39 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BR_LAYOUT_ELEMENT") +@Api(value = "自定义报表布局元素") +public class BrLayoutElement extends BaseBean { + + @Column(name = "LAYOUT_ID") + @ApiParam(value = "布局主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long layoutId; + + @Column(name = "PARENT_ID") + @ApiParam(value = "父节点主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + + @Column(name = "ELEMENT_TEXT") + @ApiParam(value ="元素描述") + private String elementText; + + @Column(name="ELEMENT_SEQ") + @ApiParam(value ="序列") + private Integer elementSeq = 0; + + @Column(name="ELEMENT_WIDTH") + @ApiParam(value ="列宽") + private Integer elementWidth; + + @Column(name="ELEMENT_HEIGHT") + @ApiParam(value ="列高") + private Integer elementHeight; + + @Column(name="ELEMENT_STYLE") + @ApiParam(value ="列样式") + private String elementStyle; + + @Column(name="ELEMENT_CSS_CLASS") + @ApiParam(value ="列样式") + private String elementCssClass; + + @Column(name = "ELEMENT_DESCRIPTION") + @ApiParam(value ="元素描述") + private String elementDescription; + + @Transient + @ApiParam(value ="行所包含的元素") + private List elementList; +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index bf6eaa1..784a9d5 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -1,67 +1,67 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -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 org.hibernate.annotations.Type; - -import javax.persistence.*; -import java.util.List; - -/** - * @Description : 自定义报表布局 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-25 19:54 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_LAYOUT_ROW") -@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列") -public class BrLayoutRow extends BaseBean { - - @Column(name="LAYOUT_ID") - @ApiParam(value ="布局主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutId; - - @Column(name="ROW_WIDTH") - @ApiParam(value ="行宽") - private Integer rowWidth; - - @Column(name="ROW_HEIGHT") - @ApiParam(value ="行高") - private Integer rowHeight; - - @Column(name="ROW_SORT") - @ApiParam(value ="排序") - private Integer rowSort; - - @Lob - @Column(name="ROW_STYLE") - @ApiParam(value ="行样式") - private String rowStyle; - - @Column(name="ROW_COL_NUM") - @ApiParam(value ="行所关联列数") - private Integer rowColNum; - +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//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 org.hibernate.annotations.Type; +// +//import javax.persistence.*; +//import java.util.List; +// +///** +// * @Description : 自定义报表布局 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-25 19:54 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_LAYOUT_ROW") +//@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列") +//public class BrLayoutRow extends BaseBean { +// +// @Column(name="LAYOUT_ID") +// @ApiParam(value ="布局主键") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long layoutId; +// +// @Column(name="ROW_WIDTH") +// @ApiParam(value ="行宽") +// private Integer rowWidth; +// +// @Column(name="ROW_HEIGHT") +// @ApiParam(value ="行高") +// private Integer rowHeight; +// +// @Column(name="ROW_SORT") +// @ApiParam(value ="排序") +// private Integer rowSort; +// // @Lob -// @Column(name="ROW_HTML") -// @ApiParam(value ="行html") -// private String rowHtml; - - @Transient - @ApiParam(value ="行所包含的列") - private List brLayoutColumns; -} +// @Column(name="ROW_STYLE") +// @ApiParam(value ="行样式") +// private String rowStyle; +// +// @Column(name="ROW_COL_NUM") +// @ApiParam(value ="行所关联列数") +// private Integer rowColNum; +// +//// @Lob +//// @Column(name="ROW_HTML") +//// @ApiParam(value ="行html") +//// private String rowHtml; +// +// @Transient +// @ApiParam(value ="行所包含的列") +// private List brLayoutColumns; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java similarity index 60% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java index 286e9ef..76cfc25 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java @@ -12,8 +12,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 元素和报表关联表，多对多 @@ -27,46 +28,41 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_REPORT_TYPESET") +@Table(name="BR_REF_REPORT") @Api(value="元素&模板&报表",description = "报表，元素和模板的关联表 * -》 *") -public class BrRefReportTypeset extends BaseBean { +public class BrRefReport extends BaseBean { + private static final long serialVersionUID = 7860212457391123584L; @Column(name = "REPORT_ID") @ApiParam(value = "报表主键") @JsonSerialize(using = ToStringSerializer.class) private Long reportId; - @Column(name = "REPORT_NAME_RDD") - @ApiParam(value = "报表名称") - private String reportNameRdd; - - @Column(name = "REPORT_TYPESET_TYPE") - @ApiParam(value = "报表列类型") - private Integer reportTypesetType; + @Column(name="LAYOUT_ID") + @ApiParam(value ="布局主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long layoutId; - @Column(name = "LAYOUT_COLUMN_ID") - @ApiParam(value = "布局列主键") + @Column(name = "LAYOUT_ELEMENT_ID") + @ApiParam(value = "布局元素主键") @JsonSerialize(using = ToStringSerializer.class) - private Long layoutColumnId; + private Long layoutElementId; + + @Column(name="REF_TYPE_ID") + @ApiParam(value ="序列") + private Integer refTypeId; - /** - * 关联id，元素或模板id - */ @Column(name = "REF_ID") @ApiParam(value = "关联id") @JsonSerialize (using = ToStringSerializer.class) private Long refId; -// /** -// * 关联元素或模板html -// */ -// @Lob -// @Column(name = "REF_HTML") -// @ApiParam(value = "关联对象html") -// private String refHtml; + @Column(name = "REF_NAME_RDD") + @ApiParam(value = "关联对象名称") + private String refNameRdd; + + @Transient + @ApiParam(value = "关联对象") + private Object refObject; - @Lob - @Column(name = "TYPESET_DESCRIPTION") - @ApiParam(value ="排版描述") - private String typesetDescription; } \ No newline at end of file diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java index f424ef0..057c231 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java @@ -10,7 +10,10 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -29,6 +32,7 @@ import java.util.List; @Api(value="自定义报表",description = "所有报表实例，生成最后的报表") public class BrReport extends BaseBean { + private static final long serialVersionUID = 1987404021291348713L; @Column(name="REPORT_NAME") @ApiParam(value ="报表名称") private String reportName; @@ -38,46 +42,19 @@ public class BrReport extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; - //get单独处理 - public Long getLayoutId() { - if(layoutId != null) { - return layoutId.longValue(); - }else{ - return layoutId; - } - } - @Column(name="LAYOUT_NAME_RDD") @ApiParam(value ="布局名称") private String layoutNameRdd; - @Lob - @Column(name="LAYOUT_HTML") - @ApiParam(value ="报表html") - private String reportHtml; - - @Column(name="SEQ") - @ApiParam(value ="排序") - private Integer seq; - - @Column(name="TEMPLATE_NUM") - @ApiParam(value ="模板数量") - private Integer templateNum; - - @Column(name="ELEMENT_NUM") - @ApiParam(value ="元素数量") - private Integer elementNum; - - @Lob @Column(name = "REPORT_DESCRIPTION") @ApiParam(value ="报表描述") private String reportDescription; @Transient - @ApiParam(value = "报表关联布局对象") - private BrLayout brLayout; + @ApiParam(value = "报表排版关系") + private BrLayout layout; @Transient @ApiParam(value = "报表排版关系") - private List brRefReportTypesetList; + private List brRefReportList; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java index 5fb16dc..15b43da 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java @@ -48,7 +48,7 @@ // // @Transient // @ApiParam(value ="报表模板列表") -// private List brRefReportTypesetList; +// private List brRefReportList; // // @Transient // @ApiParam(value ="元素所在的列") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java index 83eab7d..d354521 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-26 20:23 - * @Modify: - **/ -public interface BrLayoutColumnRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn; +// +///** +// * @Description : +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-26 20:23 +// * @Modify: +// **/ +//public interface BrLayoutColumnRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java similarity index 58% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java index 15695f9..be95592 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.report.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset; +import cn.estsh.i3plus.pojo.report.bean.BrLayoutElement; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset; * @CreateDate : 2018-12-26 20:23 * @Modify: **/ -public interface BrRefReportTypesetRepository extends BaseRepository { +public interface BrLayoutElementRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java index 78fa134..2588317 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-26 20:23 - * @Modify: - **/ -public interface BrLayoutRowRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow; +// +///** +// * @Description : +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-26 20:23 +// * @Modify: +// **/ +//public interface BrLayoutRowRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java new file mode 100644 index 0000000..40aa7b1 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrRefReport; + +/** + * @Description : + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-12-26 20:23 + * @Modify: + **/ +public interface BrRefReportRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 5d5ce2b..e485855 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -99,14 +99,14 @@ public class ReportHqlPack { * @param brElement * @return */ - public static String packHqlBrElement(BrElement brElement){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBrElement(BrElement brElement){ + DdlPackBean result = DdlPackBean.getDdlPackBean(brElement); // 查询参数封装 - HqlPack.getNumEqualPack(brElement.getElementType(),"elementType",result); - HqlPack.getStringLikerPack(brElement.getElementName(),"elementName",result); + DdlPreparedPack.getNumEqualPack(brElement.getElementType(),"elementType",result); + DdlPreparedPack.getStringLikerPack(brElement.getElementName(),"elementName",result); - return result.toString(); + return result; } /** @@ -158,14 +158,32 @@ public class ReportHqlPack { * @param brReport * @return */ - public static String packHqlBrReport(BrReport brReport){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBrReport(BrReport brReport){ + DdlPackBean result = DdlPackBean.getDdlPackBean(brReport); // 查询参数封装 - HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result); - HqlPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result); + DdlPreparedPack.getStringLikerPack(brReport.getReportName(),"reportName",result); + DdlPreparedPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result); - return result.toString(); + return result; + } + + /** + * 报表查询 + * @param refReport + * @return + */ + public static DdlPackBean packHqlBrRefReport(BrRefReport refReport){ + DdlPackBean result = DdlPackBean.getDdlPackBean(refReport); + + // 查询参数封装 + DdlPreparedPack.getNumEqualPack(refReport.getReportId(),"reportId",result); + DdlPreparedPack.getNumEqualPack(refReport.getLayoutId(),"layoutId",result); + DdlPreparedPack.getNumEqualPack(refReport.getLayoutElementId(),"layoutElementId",result); + DdlPreparedPack.getNumEqualPack(refReport.getRefTypeId(),"refTypeId",result); + DdlPreparedPack.getNumEqualPack(refReport.getRefId(),"refId",result); + + return result; } /** @@ -225,4 +243,12 @@ public class ReportHqlPack { return result; } + + public static DdlPackBean packHqlBrLayoutElement(BrLayoutElement bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getLayoutId(),"layoutId",result); + + return result; + } } From a887aa12362467509047e66022112910900437ef Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Mar 2020 11:56:33 +0800 Subject: [PATCH 026/107] =?UTF-8?q?1454=20=E5=9F=BA=E4=BA=8E=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E5=8C=BA=E5=9F=9F=E5=92=8C=E7=8F=AD=E6=AC=A1=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index 153aeff..a852b02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -62,6 +62,10 @@ public class WmsAreaOwner extends BaseBean { @ApiParam(value = "是否预分配人员") private Integer isPreAssign; + @Column(name="SHIFT_NO") + @ApiParam("班次编码") + private String shiftNo; + @Transient @ApiParam(value = "供应商名称") private String vendorName; @@ -81,4 +85,8 @@ public class WmsAreaOwner extends BaseBean { @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; + + @Transient + @ApiParam(value = "分配次数") + private Integer count; } 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 8688652..468634a 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 @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } From c37809d5b78d170e306f38ca0690f31e2cfb62ea Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 27 Mar 2020 13:47:14 +0800 Subject: [PATCH 027/107] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=BA=90=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index b04492c..4ac20ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,7 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; -import com.sun.tools.javac.util.List; +//import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; From 6e1961c9d8b22a65ff39ac8a94a6e57231ad529a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Mar 2020 14:21:21 +0800 Subject: [PATCH 028/107] =?UTF-8?q?=E3=80=90mes=5F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=8DBOM=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=B1=BB=E5=9E=8B=E6=9E=9A=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 | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) 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 ad2e0e4..c594693 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 @@ -4560,4 +4560,42 @@ public class MesEnumUtil { return description; } } + + /** + * 工位BOM表中的匹配类型 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_BOM_MATCH_RULE { + + BARCODE_RULE_MATCHING(10, "条码规则匹配"), + PROCESS_BARCODE_MATCHING(20, "过程条码匹配"), + BAR_CODE_MATCHING(30, "箱条码匹配"); + + private int value; + private String description; + + STATION_BOM_MATCH_RULE(int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 02b5fc715a72a0e99633ba6a3baf45ae21b580fc Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Mar 2020 14:51:11 +0800 Subject: [PATCH 029/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java | 1 + 10 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java index 6a28634..961eabb 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java @@ -29,6 +29,7 @@ import java.util.List; @Api(value="数据元素",description = "数据元素绑定对应的列") public class BrElement extends BaseBean { + private static final long serialVersionUID = -4332881435058594175L; @Column(name="ELEMENT_NAME") @ApiParam(value ="元素名称") private String elementName; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java index deb7fed..8fd65cc 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value = "自定义报表布局元素") public class BrLayoutElement extends BaseBean { + private static final long serialVersionUID = 3684811659039862857L; @Column(name = "LAYOUT_ID") @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java index 9958379..e580eab 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value="报表目录",description = "报表目录") public class BrMenu extends BaseBean { + private static final long serialVersionUID = -247488761545602540L; @Column(name="NAME") @ApiParam(value ="功能名称") private String name; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java index b114e73..7e9ef1c 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java @@ -34,6 +34,7 @@ import java.util.List; @Api(value="报表对象",description = "报表对象") public class BrPojo extends BaseBean { + private static final long serialVersionUID = -8490788183629516155L; @Column(name="MASTER_ID") @ApiParam(value ="主对象ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 9a055dd..5387dcd 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="对象属性",description = "对象属性") public class BrPojoAttr extends BaseBean { + private static final long serialVersionUID = -9025365832485707583L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板编号" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java index bd1739c..b6f96b4 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="对象筛选器",description = "对象筛选器") public class BrPojoFilter extends BaseBean { + private static final long serialVersionUID = -6375751397050043457L; @Column(name="MASTER_ID") @ApiParam(value ="主对象ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index cec0847..48971a1 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -33,6 +33,7 @@ import javax.persistence.Transient; @Api(value="对象筛选器",description = "对象筛选器") public class BrPojoFilterAttr extends BaseBean { + private static final long serialVersionUID = 7949763397771577851L; @Column(name="FILTER_ID") @ApiParam(value ="筛选器ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java index 58ce06c..e77eb9d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java @@ -34,6 +34,7 @@ import java.util.List; @Api(value="对象视图",description = "对象视图") public class BrPojoView extends BaseBean { + private static final long serialVersionUID = 3796940669579576121L; @Column(name="POJO_ID") @ApiParam(value ="主对象ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java index 2b6ccaa..bc22d2d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java @@ -32,6 +32,7 @@ import javax.persistence.Transient; @Api(value = "对象视图", description = "对象视图") public class BrPojoViewAttr extends BaseBean { + private static final long serialVersionUID = -3080081514595597936L; @Column(name = "VIEW_ID") @ApiParam(value = "视图ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java index 5b2cb10..d94ec61 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-角色目录",description = "关系-角色目录") public class BrRefRoleMenu extends BaseBean { + private static final long serialVersionUID = 4474890758490483265L; @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) From 4cb3d89ad6b49e2443514e3d787cf9435ce1a3f5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 27 Mar 2020 18:00:14 +0800 Subject: [PATCH 030/107] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AEees=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index b04492c..151b5ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; -import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +10,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; -import java.util.Map; /** * @Description: From 3b763b45cd9a143dfae6862b3b460442b6db71c3 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 27 Mar 2020 18:31:40 +0800 Subject: [PATCH 031/107] =?UTF-8?q?=E3=80=901432=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91=E3=80=90=E5=B7=A5=E4=BD=8D=E6=89=AB?= =?UTF-8?q?=E6=8F=8F-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 37 ++++++++- .../i3plus/pojo/mes/bean/IfQueueShipping.java | 91 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 1 + .../pojo/mes/bean/MesQueueJitActualDetail.java | 13 ++++ .../i3plus/pojo/mes/model/QueueShippingModel.java | 42 ++++++++++ .../mes/repository/IfQueueShippingRepository.java | 14 ++++ 6 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.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 472efe8..9b37512 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 @@ -2473,7 +2473,7 @@ public class MesPcnEnumUtil { IMAGE("image", "图片"), BUTTON("button", "按钮"), TABLES("tables", "多个表格"), - DATA("data", "表格"); + FORM("form", "文本按钮"); private String value; private String description; @@ -3199,4 +3199,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 客户发运JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHIPPING_ACTUAL_STATUS { + CREATE(10, "创建"), + CANCEL(20, "已发运"); + + private int value; + private String description; + + SHIPPING_ACTUAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java new file mode 100644 index 0000000..d239828 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -0,0 +1,91 @@ +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; +import java.util.Date; + +/** + * @Description :JIT发运数据同步 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "if_queue_shipping") +@Api("JIT发运数据同步") +public class IfQueueShipping extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851667690154L; + @Column(name = "JIT_NO") + @ApiParam("JIT队列编号") + private String jitNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("操作人") + private String supplierCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private Date actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private Integer ifCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index c839b14..84375d0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -33,6 +33,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { private static final long serialVersionUID = 655875369308810110L; + @Column(name = "JIS_ACTUAL_NO") @ApiParam("队列编号") private String jisActualNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 89cf68d..654cc56 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -11,6 +11,7 @@ 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; /** @@ -47,6 +48,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCtgyCode; + @Transient + @ApiParam("产品位置") + private String prodCfgName; + @Column(name = "PART_NAME") @ApiParam("产品名称") private String partName; @@ -62,4 +67,12 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "GROUP_SEQ") @ApiParam("分组序号") private String groupSeq; + + @Column(name = "status") + @ApiParam("状态") + private Integer status; + + @Column(name = "seq") + @ApiParam("主序编号") + private String seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java new file mode 100644 index 0000000..47b326f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : JIT发运队列列表Model + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT发运队列列表Model") +public class QueueShippingModel implements Serializable { + private Long id; + + @ApiParam("显示颜色") + private String color; + + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("产品位置") + private String prodCfgName; + + @ApiParam("起始vin") + private String vin; + + @ApiParam("结束vin") + private String endVin; + + @ApiParam("料架号") + private String queueGroupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java new file mode 100644 index 0000000..1130943 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfQueueShipping; + +/** + * @Description :IF_JIT发运数据 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface IfQueueShippingRepository extends BaseRepository { +} From a32d4b3b002f1315c47b653cccdb31628fbfdaff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Mar 2020 18:32:55 +0800 Subject: [PATCH 032/107] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8C=96=20=E8=B5=84=E6=BA=90=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/SysLabelTemplate.java | 5 +++ .../pojo/platform/bean/SysLocaleResource.java | 5 +++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 45 ++++++++-------------- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index f52be12..fc4acd3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -54,6 +54,11 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板内容") private String templateContent; + @Lob + @Column(name="OTHER_TEMPLATE_CONTENT") + @ApiParam(value ="其他模板内容") + private String otherTemplateContent; + // 参数拼接，多参数都好分隔，后台在做处理 @Transient @ApiParam(value ="模板参数拼接") 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 5555d83..f8b4f4e 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 @@ -37,6 +37,9 @@ public class SysLocaleResource extends BaseBean { private Integer resourceType; @Transient + private String resourceTypes; + + @Transient private String resourceTypeTxt; public String getResourceTypeTxt(){ @@ -56,6 +59,7 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "语言名称",example = "浏览器语言名称") private String languageNameRdd; + @Lob @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") @AnnoOutputColumn @@ -82,4 +86,5 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "是否系统参数",example = "2") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isSystem; + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 44ddce3..51429a6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -4,32 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; -import cn.estsh.i3plus.pojo.platform.bean.SysConfig; -import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; -import cn.estsh.i3plus.pojo.platform.bean.SysFile; -import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; -import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.bean.SysMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; -import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import cn.estsh.i3plus.pojo.platform.bean.SysPosition; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; -import cn.estsh.i3plus.pojo.platform.bean.SysRole; -import cn.estsh.i3plus.pojo.platform.bean.SysTask; -import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle; -import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; -import cn.estsh.i3plus.pojo.platform.bean.SysTool; -import cn.estsh.i3plus.pojo.platform.bean.SysToolType; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import cn.estsh.i3plus.pojo.platform.bean.*; +import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.StringUtils; + import java.util.List; import java.util.stream.Collectors; @@ -42,6 +20,10 @@ import java.util.stream.Collectors; **/ public class CoreHqlPack { + private CoreHqlPack() { + throw new IllegalStateException("Utility class"); + } + /** * In 参数封装 * @param columnName @@ -81,6 +63,11 @@ public class CoreHqlPack { if(resource != null){ DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + // 是否多类型查询 + if(StringUtils.isNotBlank(resource.getResourceTypes())){ + DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); + } + DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); @@ -630,7 +617,7 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); - if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){ HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); } @@ -653,7 +640,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); - if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){ DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); } @@ -677,7 +664,7 @@ public class CoreHqlPack { // And HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - if(idList != null && idList.size() > 0){ + if(idList != null && !idList.isEmpty()){ HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); } @@ -977,7 +964,7 @@ public class CoreHqlPack { */ public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean); return packBean; } From 6ed34b9e5f6ee8c7f532c3742328330df22ffc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Mar 2020 18:35:58 +0800 Subject: [PATCH 033/107] =?UTF-8?q?FTP=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index da17aec..629d207 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -135,7 +135,8 @@ public class BlockSoftSwitchEnumUtil { CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"), /* FTP */ - CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"); + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"), + SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"); private int value; private String description; From eed24e0297ecec6c18db3a5ee173db279ed70ff7 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Fri, 27 Mar 2020 21:43:48 +0800 Subject: [PATCH 034/107] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9pom?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 3 ++- modules/i3plus-pojo-aps/pom.xml | 3 ++- modules/i3plus-pojo-base/pom.xml | 3 ++- modules/i3plus-pojo-form/pom.xml | 3 ++- modules/i3plus-pojo-hardswitch/pom.xml | 3 ++- modules/i3plus-pojo-jobflow/pom.xml | 3 ++- modules/i3plus-pojo-lac/pom.xml | 3 ++- modules/i3plus-pojo-mes-pcn/pom.xml | 3 ++- modules/i3plus-pojo-mes/pom.xml | 3 ++- modules/i3plus-pojo-model/pom.xml | 3 ++- modules/i3plus-pojo-platform/pom.xml | 3 ++- modules/i3plus-pojo-ptl/pom.xml | 3 ++- modules/i3plus-pojo-report/pom.xml | 3 ++- modules/i3plus-pojo-softswitch/pom.xml | 3 ++- modules/i3plus-pojo-sweb/pom.xml | 3 ++- modules/i3plus-pojo-wms/pom.xml | 3 ++- modules/i3plus-pojo-workflow/pom.xml | 3 ++- pom.xml | 2 +- 18 files changed, 35 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 2bb8b09..fe8e4eb 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-andon jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4591fe3..f1e9991 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-aps jar + 1.0-${profileActive}-SNAPSHOT @@ -53,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0e3621b..2183cdf 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-base jar + 1.0-${profileActive}-SNAPSHOT @@ -71,7 +72,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 4d0a808..65c6554 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-form jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index ecf48ed..a1664bf 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-hardswitch jar + 1.0-${profileActive}-SNAPSHOT dev @@ -42,7 +43,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 2241e93..6a55282 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-jobflow jar + 1.0-${profileActive}-SNAPSHOT dev @@ -42,7 +43,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index c9fd4ee..232becd 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-lac jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 27731be..e65f727 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-mes-pcn jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 2ba9ddd..552f97e 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-mes jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3fd87ac..beba8ba 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-model jar + 1.0-${profileActive}-SNAPSHOT @@ -90,7 +91,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index c0524de..8f191db 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-platform jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4b73b1a..f0a5b7e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-ptl jar + 1.0-${profileActive}-SNAPSHOT @@ -49,6 +50,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4ebc2f7..d9d461d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-report jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b3c4fc8..309d149 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-softswitch jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index b601666..f34bc03 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-sweb jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 2d56516..f9e982f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-wms jar + 1.0-${profileActive}-SNAPSHOT @@ -53,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 4395f3c..e2918a0 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-workflow jar + 1.0-${profileActive}-SNAPSHOT dev @@ -42,7 +43,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 96a06e4..06660e0 100644 --- a/pom.xml +++ b/pom.xml @@ -252,6 +252,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file From bcb8dee045544a7e3495a3c264dd9821e9c9b0f5 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 30 Mar 2020 10:48:02 +0800 Subject: [PATCH 035/107] =?UTF-8?q?=E3=80=901558=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86-=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesContainer.java | 43 +++++++++++++++++ .../i3plus/pojo/mes/bean/MesContainerType.java | 55 ++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java new file mode 100644 index 0000000..12e6ad0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -0,0 +1,43 @@ +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; + +/** + * @Description : MES_容器 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-27 14:29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER") +@Api("MES_容器类型") +public class MesContainer extends BaseBean { + private static final long serialVersionUID = -3843389042411645111L; + + @Column(name = "CT_NO") + @ApiParam(value = "容器编号") + private String ctNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "USE_STATUS") + @ApiParam(value = "使用状态") + private String useStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java new file mode 100644 index 0000000..b317f3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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; + +/** + * @Description : MES_容器类型 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-27 14:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_TYPE") +@Api("MES_容器类型") +public class MesContainerType extends BaseBean { + + private static final long serialVersionUID = 2831600566482383573L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_NAME") + @ApiParam(value = "容器类型名称") + private String ctName; + + @Column(name = "USE_LIMIT") + @ApiParam(value = "使用期限") + private Integer useLimit; + + @Column(name = "IS_RECYCLE") + @ApiParam(value = "是否回收") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + private Integer isRecycle; + + @Column(name = "LIMIT_UOM") + @ApiParam(value = "期限单位") + private String limitUom; +} From b12cb90c0da2c47bdd98069f5c005fd429978e73 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Mar 2020 11:12:12 +0800 Subject: [PATCH 036/107] dev-pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06660e0..c7523d4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 75832427e87b5f8c5ebd2781b201e5764235f715 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 30 Mar 2020 12:30:21 +0800 Subject: [PATCH 037/107] =?UTF-8?q?=E3=80=90task=201539=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=89=AB=E6=8F=8F-=E6=8C=89=E9=92=AE=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=BB=93=E6=9E=84=E6=90=AD=E5=BB=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesWindowModule.java | 45 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesWindowModuleParam.java | 47 ++++++++++++++++++ .../pojo/mes/model/ButtonComponentReqModel.java | 55 ++++++++++++++++++++++ .../pojo/mes/model/ButtonComponentResultModel.java | 38 +++++++++++++++ .../estsh/i3plus/pojo/mes/model/ButtonModel.java | 28 +++++++++++ .../repository/MesWindowModuleParamRepository.java | 15 ++++++ .../mes/repository/MesWindowModuleRepository.java | 15 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 43 +++++++++++++++++ 8 files changed, 286 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java new file mode 100644 index 0000000..f51864f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.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/20 0020 - 16:21 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW_MODULE") +@Api("MES_界面组件配置") +public class MesWindowModule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -634938009999201410L; + + @Column(name = "WINDOW_NO") + @ApiParam("菜单编号") + private String windowNo; + + @Column(name = "MODULE_CODE") + @ApiParam("按钮组件代码") + private String moduleCode; + + @Column(name = "WINDOW_MODULE_BACK") + @ApiParam("回调界面方法") + private String windowModuleBack; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java new file mode 100644 index 0000000..4add812 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java @@ -0,0 +1,47 @@ +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/20 0020 - 16:25 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW_MODULE_PARAM") +@Api("MES_界面组件参数配置") +public class MesWindowModuleParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5834883080240684524L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面编号") + private String windowNo; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java new file mode 100644 index 0000000..46dcdbd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 工位扫描中，按钮组件之间传输的model + * @Reference : + * @Author : zcg + * @Date : 2020/3/23 0023 - 13:14 + */ +@Data +@Api("按钮组件传输请求Model") +public class ButtonComponentReqModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("确认码") + private String confirmNo; + + @ApiParam("组件代码") + private String moduleCode; + + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("父界面编号") + private String parentWindowNo; + + @ApiParam("客户标识号") + private String custFlagNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java new file mode 100644 index 0000000..5553485 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/25 0025 - 19:41 + */ +@Data +@Api("按钮组件传输响应Model") +public class ButtonComponentResultModel { + + @ApiParam("成功信号") + private boolean isSuccess; + + @ApiParam("提示信息") + private String msg; + + @ApiParam("动态按钮组") + private List buttonModels; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码信息") + private MesProduceSn produceSn; + + @ApiParam("主队列编号") + private String orderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java new file mode 100644 index 0000000..dc5d7a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : 按钮model + * @Reference : + * @Author : zcg + * @Date : 2020/3/25 0025 - 5:02 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("按钮组件") +public class ButtonModel { + @ApiParam("组件代码") + private String moduleCode; + + @ApiParam("组件名称") + private String moduleName; + + @ApiParam("界面回调方法") + private String windowModuleBack; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java new file mode 100644 index 0000000..4392957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.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.MesWindowModuleParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:37 + */ +@Repository +public interface MesWindowModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java new file mode 100644 index 0000000..c96dff8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.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.MesWindowModule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:36 + */ +@Repository +public interface MesWindowModuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 15b53e4..0fbed4b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2237,4 +2237,47 @@ public class MesHqlPack { } return packBean; } + + /** + * 界面组件配置 + * @param windowModule + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode); + if(!StringUtils.isEmpty(windowModule.getWindowNo())){ + DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean); + } + if(!StringUtils.isEmpty(windowModule.getModuleCode())){ + DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean); + } + if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){ + DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean); + } + return packBean; + } + + /** + * 界面组件参数配置 + * @param windowModuleParam + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode); + if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean); + } + return packBean; + } } From 44696061eeabd78ff330cdc008aede293428cdf7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 30 Mar 2020 13:48:36 +0800 Subject: [PATCH 038/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=BA=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 3 +- modules/i3plus-pojo-aps/pom.xml | 3 +- modules/i3plus-pojo-base/pom.xml | 4 +- modules/i3plus-pojo-form/pom.xml | 3 +- modules/i3plus-pojo-hardswitch/pom.xml | 4 +- modules/i3plus-pojo-jobflow/pom.xml | 4 +- modules/i3plus-pojo-lac/pom.xml | 3 +- modules/i3plus-pojo-mes-pcn/pom.xml | 3 +- modules/i3plus-pojo-mes/pom.xml | 3 +- .../i3plus/pojo/mes/bean/MesActionModuleGroup.java | 42 ++++++++++++ .../i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 16 +++++ .../i3plus/pojo/mes/bean/MesRouteProcess.java | 4 ++ .../i3plus/pojo/mes/bean/MesSmRouteOptParam.java | 62 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesStateMachine.java | 48 ++++++++++++++ .../pojo/mes/bean/MesStateMachineStatus.java | 75 ++++++++++++++++++++++ modules/i3plus-pojo-model/pom.xml | 3 +- modules/i3plus-pojo-platform/pom.xml | 3 +- modules/i3plus-pojo-ptl/pom.xml | 3 +- modules/i3plus-pojo-report/pom.xml | 3 +- modules/i3plus-pojo-softswitch/pom.xml | 3 +- modules/i3plus-pojo-sweb/pom.xml | 3 +- modules/i3plus-pojo-wms/pom.xml | 3 +- modules/i3plus-pojo-workflow/pom.xml | 5 +- pom.xml | 34 +++++++++- 24 files changed, 318 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 87a1750..a7393ab 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 5ad51a1..83da951 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e74f5ed..c39aa75 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index aa8f7a2..85be1d1 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 7e87d1a..b7d7acb 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar + 1.0-${profileActive}-SNAPSHOT + dev diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 062455e..bee2e15 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar + 1.0-${profileActive}-SNAPSHOT + dev diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index a6258be..598dbbc 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e958e79..93bbef1 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index d5ed765..988d513 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java new file mode 100644 index 0000000..314f526 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java @@ -0,0 +1,42 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:28 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_MODULE_GROUP") +@Api("工步集") +public class MesActionModuleGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 1876053661752102998L; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件集代码") + private String amCode; + + @Column(name = "SEQ") + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 074dea2..c0d1436 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -42,6 +42,18 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工序代码") private String processCode; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -62,6 +74,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "IS_ACTIVE") + @ApiParam("是否执行 1=是 2=否") + private Integer isActive; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index fa6d9dd..70d3b44 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -54,6 +54,10 @@ public class MesRouteProcess extends BaseBean implements Serializable { @ApiParam("是否必须") private Integer isNecessary; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java new file mode 100644 index 0000000..521d413 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java @@ -0,0 +1,62 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:48 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SM_ROUTE_OPT_PARAM") +@Api("产品流程状态机配置操作参数表") +public class MesSmRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5466013923105175070L; + + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程Id") + private Integer prodRouteCfgId; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name="STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name="PARAM_TYPE") + private Integer paramType; + + @Column(name="PARAM_CODE") + private String paramCode; + + @Column(name="PARAM_VALUE") + private String paramValue; + + @Column(name="IS_ACTION") + private Integer isAction; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java new file mode 100644 index 0000000..1672c91 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -0,0 +1,48 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE") +@Api("MES状态机") +public class MesStateMachine extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "SM_NAME") + @ApiParam("状态机名称") + private String smName; + + @Column(name = "SM_TYPE") + @ApiParam("状态机类型") + private String smType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS的位置") + private String position; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java new file mode 100644 index 0000000..90bcbf9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -0,0 +1,75 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE_STATUS") +@Api("MES状态机步骤") +public class MesStateMachineStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型 10=内部触发 20=外部触发") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Integer actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入调用") + private Integer inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开调用") + private Integer outAmgId; + + @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") + @ApiParam("状态类型 10=初始化状态") + private Integer statusType; +} diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1c2fd71..da26f90 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 12f9ad0..ecb3a42 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 27e1b60..ea09b06 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 91d3fdd..52a69ad 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 756086b..a6b12c3 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 770ace5..f3452f8 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index c4dbbbe..9b39050 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 6f974d5..2e098d8 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,13 +5,16 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar + 1.0-${profileActive}-SNAPSHOT + + dev diff --git a/pom.xml b/pom.xml index 37371d2..8b348a9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -221,5 +221,37 @@ + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file From 14cfa5fa47637153ba01cec7b3603a41309c85c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 30 Mar 2020 14:59:48 +0800 Subject: [PATCH 039/107] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=B3=A2=E6=AC=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=A7=84=E5=88=99=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=92=8C=E8=A7=84=E5=88=99=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 189 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java | 109 ++++++++++++ .../i3plus/pojo/wms/bean/WmsWaveRuleDetails.java | 56 ++++++ .../pojo/wms/modelbean/WmsDocMovementModel.java | 84 +++++++++ .../repository/WmsWaveRuleDetailsRepository.java | 16 ++ .../pojo/wms/repository/WmsWaveRuleRepository.java | 16 ++ 6 files changed, 470 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.java 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 4fd1ad6..41728f0 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 @@ -5301,4 +5301,193 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 波次合并规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WAVE_MERGE_RULE { + IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10), + IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10), + IS_SAME_PART("同物料", "isSamePart", 2, 10), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10), + IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10), + IS_COLLECTION("物料整箱归集", "isCollection", 2, 10); + + private String chName; + + private String enName; + + private int waveMergeType; + + private int value; + + WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) { + this.chName = chName; + this.enName = enName; + this.value = value; + this.waveMergeType = waveMergeType; + } + + public String getChName() { + return chName; + } + + public String getEnName() { + return enName; + } + + public int getValue() { + return value; + } + + public int getWaveMergeType() { + return waveMergeType; + } + } + + /** + * 波次合并规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WAVE_MERGE_RANGE { + CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + "custNo, custName", "custNo, custName", "custNo", 20), + WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + "code, name", "code, name", "code", 20), + PRIORITY("优先级", "priority", "PRIORITY_NEW", "", + "", "", 20), + SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + "partNo, partName", "partNo", "partNo", 20), + PART_GROUP_NO("物料组代码", "partGroupNo", "", "", + "", "", 20), + BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", + "", "", 20), + ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", + "", "", 20); + + // 中文名称 + String chName; + // 英文名称 + String enName; + // 下拉枚举名称 + String entityName; + // 下拉列表显示列名称,多个列名需要根据逗号分隔 + String listColumnName; + // 下拉搜索列名称,多个列名需要根据逗号分隔 + String searchColumnName; + // 回显列名 + String explicitColumnName; + // 合并操作类型 + private int waveMergeType; + + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, + String searchColumnName, String explicitColumnName, int waveMergeType) { + this.chName = chName; + this.enName = enName; + this.entityName = entityName; + this.listColumnName = listColumnName; + this.searchColumnName = searchColumnName; + this.explicitColumnName = explicitColumnName; + this.waveMergeType = waveMergeType; + } + + public String getChName() { + return chName; + } + + public String getEnName() { + return enName; + } + + public String getEntityName() { + return entityName; + } + + public String getListColumnName() { + return listColumnName; + } + + public String getSearchColumnName() { + return searchColumnName; + } + + public String getExplicitColumnName() { + return explicitColumnName; + } + + public int getWaveMergeType() { + return waveMergeType; + } + } + + /** + * 插件类型 10-合并规则，20-合并范围 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WAVE_MERGE_TYPE { + WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), + WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); + + private int value; + private String code; + private String description; + + WAVE_MERGE_TYPE(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 WAVE_MERGE_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java new file mode 100644 index 0000000..a9b02e2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.pojo.wms.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.util.List; + +/** + * @Description : 波次规则数据 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-25 10:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_WAVE_RULE") +@Api(value = "波次规则数据表") +public class WmsWaveRule extends BaseBean { + + private static final long serialVersionUID = 8664373854844368961L; + + @Column(name = "RULE_CODE") + @ApiParam(value = "波次规则代码") + public String ruleCode; + + @Column(name = "RULE_DESC") + @ApiParam(value = "波次规则描述") + public String ruleDesc; + + /** + * 分配规则 2-不分配(默认) 1-分配到责任区 + */ + @Column(name = "ALLOCATE_RULE") + @ApiParam(value = "分配规则", example = "1") + public Integer allocateRule; + + @Column(name = "EXTEND_SQL") + @ApiParam(value = "扩展脚本") + public String extendSql; + + @Column(name = "START_EFFECT_DATE") + @ApiParam(value = "开始生效时间") + public String startEffectDate; + + @Column(name = "END_EFFECT_DATE") + @ApiParam(value = "结束生效时间") + public String endEffectDate; + + @Column(name = "SORT_CONDITIONS") + @ApiParam(value = "单据排序条件") + public String sortConditions; + + @Column(name = "ORDER_CONTROL_TIME") + @ApiParam(value = "单据控制时间") + public String orderControlTime; + + @Column(name = "FIXED_ORDER_QTY") + @ApiParam(value = "固定单据数量", example = "0") + public Integer fixedOrderQty; + + @Column(name = "FIXED_PART_QTY") + @ApiParam(value = "固定物料箱数", example = "0") + public Integer fixedPartQty; + + @Column(name = "WAVE_QTY") + @ApiParam(value = "波次数量", example = "0") + public Integer waveQty; + + @Column(name = "ORDER_MAX_QTY") + @ApiParam(value = "最大单据数量", example = "0") + public Integer orderMaxQty; + + @Column(name = "PART_MAX_QTY") + @ApiParam(value = "最大物料数量", example = "0") + public Double partMaxQty; + + @Column(name = "ORDER_TIMEOUT_TIME") + @ApiParam(value = "单据等待时间", example = "0") + public Integer orderTimeOutTime; + + @Column(name = "NEXT_WAVE_TIME") + @ApiParam(value = "下次波次时间") + public String nextWaveTime; + + @Column(name = "IS_CROSS_AREA") + @ApiParam(value = "允许跨区", example = "0") + public Integer isCrossArea; + + @Column(name = "IS_COLLECTION") + @ApiParam(value = "允许整箱归集") + public Integer isCollection; + + @Transient + @ApiParam(value = "波次规则明细信息") + private List waveRuleDetailsList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java new file mode 100644 index 0000000..f2e7cf7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 波次规则明细数据 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-25 10:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_WAVE_RULE_DETAILS") +@Api(value = "波次规则明细数据表") +public class WmsWaveRuleDetails extends BaseBean { + + private static final long serialVersionUID = 8664373954844368961L; + + @Column(name = "RULE_ID") + @ApiParam(value = "波次规则编号", example = "0") + public Long ruleId; + + @Column(name = "FIELD_CH_NAME") + @ApiParam(value = "字段中文名称") + public String fieldChName; + + @Column(name = "FIELD_EN_NAME") + @ApiParam(value = "字段英文名称") + public String fieldEnName; + + @Column(name = "MERGE_OPERATOR_TYPE") + @ApiParam(value = "合并操作类型", example = "0") + public Integer mergeOperatorType; + + @Column(name = "FILED_VALUE") + @ApiParam(value = "字段值") + public String fieldValue; + + public Long getRuleId() { + return ruleId == null ? 0L : ruleId.longValue(); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java new file mode 100644 index 0000000..f59bc69 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; + +/** + * @Description : 移库单数据模型Model + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-26 11:18 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("移库单数据模型") +public class WmsDocMovementModel { + + @ApiParam("订单号") + private String orderNo; + + @ApiParam(value = "业务类型", example = "1") + private Integer busiType; + + @ApiParam("客户代码") + private String custNo; + + @ApiParam("来源仓库代码") + private String srcWhNo; + + @ApiParam("来源存储区代码") + private String srcZoneNo; + + @ApiParam("目标仓库代码") + private String destWhNo; + + @ApiParam("目标存储区代码") + private String destZoneNo; + + @ApiParam("物料组代码") + private String partGroupNo; + + @ApiParam("订单状态") + private String orderStatus; + + @ApiParam(value = "优先级", example = "1") + public Integer priority; + + @ApiParam("物料号") + private String partNo; + + @ColumnDefault("0") + @ApiParam(value = "已拣货数量", example = "1") + private Double pickQty; + + @ColumnDefault("0") + @ApiParam(value = "已出库数量", example = "1") + private Double outQty; + + @ColumnDefault("0") + @ApiParam(value = "已移库数量", example = "1") + private Double moveQty; + + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @ApiParam("源单行号") + public String srcItem; + + @ApiParam(value = "源单号") + private String srcNo; + + @ApiParam("物料号") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam(value = "标准包装", example = "1") + private Double snp; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.java new file mode 100644 index 0000000..75e9542 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsWaveRuleDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-25 11:29 + * @Modify: + **/ +@Repository +public interface WmsWaveRuleDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.java new file mode 100644 index 0000000..44d5332 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsWaveRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-25 11:29 + * @Modify: + **/ +@Repository +public interface WmsWaveRuleRepository extends BaseRepository { +} From cb8a090aea918ec19e838e5c26ce4365d41619e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 30 Mar 2020 15:01:54 +0800 Subject: [PATCH 040/107] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=A2=E6=AC=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java | 7 ++++++- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index 781c348..f235943 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -48,5 +48,10 @@ public class WmsBusiType extends BaseBean { @ApiParam("移动类型") public Integer moveType; - + /** + * 是否启用波次计划 10-是，20-否 + */ + @Column(name = "IS_ENABLE_WAVE") + @ApiParam("是否启用波次计划") + public Integer isEnableWave; } 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 10e116b..88f3576 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 @@ -140,6 +140,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "已移库数量", example = "1") private Double moveQty; + @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "任务生成数量", example = "1") + private Double taskGenerateQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; 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 68b8086..b9071f3 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 @@ -2877,4 +2877,18 @@ public class WmsHqlPack { return result; } + /** + * 插件信息分页查询条件 + * @param rule + * @return + */ + public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result); + DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result); + DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result); + getStringBuilderPack(rule, result); + return result; + } + } From a4d32d6612a7138fbba477e00dd43961fd2aebbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 30 Mar 2020 18:20:38 +0800 Subject: [PATCH 041/107] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B3=A2=E6=AC=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A0=B9=E6=8D=AE=E8=A7=84=E5=88=99=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=AE=A1=E5=88=92=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java index f59bc69..d7129a5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -81,4 +81,7 @@ public class WmsDocMovementModel { @ApiParam(value = "标准包装", example = "1") private Double snp; + + @ApiParam(value = "一步法/两步法") + private Integer isSingleStep; } From 1b0d0f8c6b19b31c00f47a35f0f7548e22b1d0f7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 30 Mar 2020 20:10:16 +0800 Subject: [PATCH 042/107] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1576=20?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8C=89=E9=92=AE=E5=8A=A0=E8=BD=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ButtonDynamicModel.java | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index c98a3f4..4a8aec6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -24,12 +24,31 @@ public class ButtonDynamicModel { @ApiParam("按钮代码") private String buttonCode; - @ApiParam("调用类") - private String callClass; + @ApiParam("回调界面方法") + private String windowModuleBack; - public ButtonDynamicModel(Long id, String buttonName, String buttonCode) { + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数值") + private String paramValue; + + + public ButtonDynamicModel(Long id, String buttonCode, String buttonName){ this.id = id; + this.buttonCode = buttonCode; this.buttonName = buttonName; + } + + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ + this.id = id; this.buttonCode = buttonCode; + this.windowNo = windowNo; + this.windowModuleBack = windowModuleBack; + this.paramCode = paramCode; + this.paramValue = paramValue; } } From 7106c06221c31b2c68dbac2ff7a062f8562f5368 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Tue, 31 Mar 2020 12:06:47 +0800 Subject: [PATCH 043/107] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9pom?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=980331?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index a7393ab..fe8e4eb 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -50,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 83da951..f1e9991 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -54,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index c39aa75..9f54aca 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -71,7 +71,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 85be1d1..65c6554 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -51,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7d7acb..0f73e78 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -44,7 +44,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index bee2e15..7e73285 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -44,7 +44,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 598dbbc..232becd 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -50,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 93bbef1..e65f727 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -50,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 988d513..552f97e 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -50,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index da26f90..beba8ba 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -91,7 +91,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ecb3a42..8f191db 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -50,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index ea09b06..f0a5b7e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -50,6 +50,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 52a69ad..d9d461d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -51,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index a6b12c3..309d149 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -51,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f3452f8..f34bc03 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -50,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9b39050..f9e982f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -54,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 2e098d8..3b96564 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -45,7 +45,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 794b599..ae3bdca 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -251,7 +251,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file From ec1d52e7dd416655fa96a61baddfe07c5b772635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Mar 2020 15:16:14 +0800 Subject: [PATCH 044/107] =?UTF-8?q?MAVEN=20=E7=89=88=E6=9C=AC=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 14 +++++++------- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index fe8e4eb..335f882 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f1e9991..7d63653 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f54aca..284f019 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 65c6554..63c691b 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0f73e78..35c0762 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 7e73285..cbdf688 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 232becd..51958ba 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e65f727..a0cbb85 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 552f97e..1c38fc4 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index beba8ba..9c029b3 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8f191db..876096e 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index f0a5b7e..c56e1c6 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index d9d461d..4e4a397 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 309d149..442875c 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f34bc03..8573c4e 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index f9e982f..a578bda 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 3b96564..067d448 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ae3bdca..d90bca1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -77,23 +77,23 @@ - i3plus.platform - i3plus-platform-common + i3plus.pojo + i3plus-pojo-base ${project.version} + - i3plus.pojo - i3plus-pojo-model + i3plus.platform + i3plus-platform-common ${project.version} i3plus.pojo - i3plus-pojo-base + i3plus-pojo-model ${project.version} - i3plus.pojo i3plus-pojo-mes From 5de3c0bd7b4bb82a657e472c60dda5727518e19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 31 Mar 2020 15:35:03 +0800 Subject: [PATCH 045/107] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java index d7129a5..8f0336a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -84,4 +84,7 @@ public class WmsDocMovementModel { @ApiParam(value = "一步法/两步法") private Integer isSingleStep; + + @ApiParam(value = "创建时间") + private String createDateTime; } From 6925ce3b18bb325cc6d82ff8a49060485a3b735e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Mar 2020 18:20:24 +0800 Subject: [PATCH 046/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901483?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E6=96=B0=E5=A2=9E=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E8=A7=84=E5=88=99=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901484?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E7=89=A9=E6=96=99=E8=A1=A8=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901485?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=901486=E3=80=91=EF=BC=9ALES-=E5=AD=98=E5=82=A8=E5=8C=BA?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=901487=E3=80=91=EF=BC=9ALES-=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901488=E3=80=91=EF=BC=9ALES-=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901489=E3=80=91=EF=BC=9ALES-=E5=85=A5?= =?UTF-8?q?=E5=9C=BA=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901490?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E5=B7=A1=E7=BA=BF=E6=8B=89=E5=8A=A8=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901491=E3=80=91=EF=BC=9ALES-=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901492?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901493=E3=80=91=EF=BC=9ALES-=E6=89=8B?= =?UTF-8?q?=E5=B7=A5=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901494?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E9=A2=84=E7=95=99=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 98 +++++++++++++++++++++- .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 4 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 51 +++++++++++ .../i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 72 ++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDockWindowTime.java | 42 ++++++++++ .../pojo/wms/modelbean/DockDashboardModel.java | 32 +++++++ .../pojo/wms/modelbean/WmsPullOrderModel.java | 33 ++++++-- .../wms/repository/WmsDockOrderInfoRepository.java | 16 ++++ .../pojo/wms/repository/WmsDockRepository.java | 16 ++++ .../repository/WmsDockWindowTimeRepository.java | 16 ++++ 12 files changed, 378 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java 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 a0dd0ef..81a5477 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 @@ -713,7 +713,8 @@ public class WmsEnumUtil { KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), - TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"); + TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), + EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"); private int value; private String code; @@ -5440,4 +5441,99 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 道口预约订单状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DOCK_ORDER_STATUS { + WAIT_SEND(10, "待送货"), + ARRIVED(20, "已到达"), + RECEIVED(30, "已收货"), + CANCELED(40, "已取消"); + + private int value; + private String description; + + DOCK_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static DOCK_ORDER_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 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; + } + } + + /** + * 道口预约订单状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DOCK_APPOINTMENT_STATUS { + WAIT_SEND(10, "待送货"), + HAS_SENDED(20, "已送达"), + RECEIVING(30, "收货中"), + COMPLETED(40, "已完成"), + OVERTIME(50, "供货超时"); + + private int value; + private String description; + + DOCK_APPOINTMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static DOCK_APPOINTMENT_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 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index d940955..ebf9603 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -89,6 +89,10 @@ public class BasVendor extends BaseBean{ @Column(name = "VENDOR_TYPE") private Integer vendorType; + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; + public BasVendor() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 30d7725..2bbb7c8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -68,6 +68,10 @@ public class WareHouse extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double baseUnit; + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; + @Transient @ApiParam(value = "存储区列表") private List zoneList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index d60df26..6c8b97a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -61,4 +61,8 @@ public class WmsCar extends BaseBean { @Transient @ApiParam(value = "供应商名称") private String vendorNameRdd; + + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java new file mode 100644 index 0000000..8e638b7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 道口 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOCK") +@Api("道口预约信息") +public class WmsDock extends BaseBean { + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockCode; + + @Column(name="DOCK_ADDRESS") + @ApiParam("道口发运地址") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockAddress; + + @Column(name="DOCK_DESC") + @ApiParam("道口发运地址描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockDesc; + + @Column(name="DOCK_TYPE") + @ApiParam("道口类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java new file mode 100644 index 0000000..e26a736 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 道口预约信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOCK_ORDER_INFO") +@Api("道口预约信息") +public class WmsDockOrderInfo extends BaseBean { + + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockCode; + + @Column(name="ORDER_DATE") + @ApiParam("预约日期") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + private String orderDate; + + @Column(name="WINDOW_TIME") + @ApiParam("窗口时间") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + private String windowTime; + + @Column(name="ORDER_STATUS") + @ApiParam("预约状态") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS") + private Integer orderStatus; + + @Column(name="SUPPLIER_CODE") + @ApiParam("供应商编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String supplierCode; + + @Column(name="CAR_NO") + @ApiParam("车辆编号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String carNo; + + @Column(name="DRIVER_NAME") + @ApiParam("驾驶员") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String driverName; + + @Column(name="ORDER_NO") + @ApiParam("单据号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String orderNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java new file mode 100644 index 0000000..0084679 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 道口窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOCK_WINDOW_TIME") +@Api("道口窗口时间") +public class WmsDockWindowTime extends BaseBean { + + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String dockCode; + + @Column(name="WINDOW_TIME") + @ApiParam("窗口时间") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + private String windowTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java new file mode 100644 index 0000000..4910ff6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @description 道口看板数据模型 + * @author jason.niu + * @date 2020/03/31 + */ +@Data +@Api("道口看板数据模型") +public class DockDashboardModel { + @ApiParam("预约时间") + private String orderDate; + + @ApiParam("预约状态") + private Integer appointmentStatus; + + @ApiParam("供应商编码") + private String supplierCode; + + @ApiParam("单号") + private String orderNo; + + @ApiParam("车牌号") + private String carNo; + + @ApiParam("驾驶员") + private String driverName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java index 6a41bbc..57be8ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; /** - * @description + * @description 外部拉动数据结构 * @author jason.niu * @date 2020/03/25 */ @@ -16,24 +16,39 @@ public class WmsPullOrderModel { @ApiParam("工厂代码") private String organizeCode; - @ApiParam("车间") - private String workShopCode; - @ApiParam("产线") private String lineNo; + @ApiParam("仓库代码") + public String WhNo; + + @ApiParam("存储区代码") + public String ZoneNo; + + @ApiParam("目标库位代码") + public String destLocateNo; + @ApiParam("库位") private String locateNo; - @ApiParam("零件号") + @ApiParam("物料编码") private String partNo; - @ApiParam("供应商") - private String vendorNo; + @ApiParam("物料名称") + public String partName; + + @ApiParam("源仓库代码") + public String srcWhNo; + + @ApiParam("源存储区代码") + public String srcZoneNo; @ApiParam("数量") private Double qty; - @ApiParam("业务类型") - private Integer busiType; + @ApiParam("单位") + public String unit; + + @ApiParam("批次") + public String lotNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java new file mode 100644 index 0000000..d6681f7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDockOrderInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description :道口预约信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Repository +public interface WmsDockOrderInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java new file mode 100644 index 0000000..757e006 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDock; +import org.springframework.stereotype.Repository; + +/** + * @Description :道口 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-30 + * @Modify: + **/ +@Repository +public interface WmsDockRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java new file mode 100644 index 0000000..6cc4a8c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDockWindowTime; +import org.springframework.stereotype.Repository; + +/** + * @Description :道口窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Repository +public interface WmsDockWindowTimeRepository extends BaseRepository { +} From 3b987436d85fc8e62f4c8671f1e0fafbc3770fb0 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Mar 2020 19:10:47 +0800 Subject: [PATCH 047/107] =?UTF-8?q?=E6=96=B0=E5=A2=9ELES=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 335f882..fe8e4eb 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 7d63653..f1e9991 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 284f019..9f54aca 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 63c691b..65c6554 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 35c0762..0f73e78 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index cbdf688..7e73285 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 51958ba..232becd 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 From 82d53328615b34c0d4114df631224017f8f0b7c7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Mar 2020 19:11:30 +0800 Subject: [PATCH 048/107] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPOM=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 3 +-- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a0cbb85..e65f727 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 1c38fc4..552f97e 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 9c029b3..beba8ba 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 876096e..8f191db 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c56e1c6..f0a5b7e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4e4a397..d9d461d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 442875c..309d149 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 8573c4e..f34bc03 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index a578bda..f9e982f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 067d448..d561047 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -14,7 +14,6 @@ jar 1.0-${profileActive}-SNAPSHOT - dev From 3069c5bf1818c9909271520bf0379d94c2fc00bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Mar 2020 19:36:49 +0800 Subject: [PATCH 049/107] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 33 ++++++++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 15 ++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 94 +++++++++++++--------- .../pojo/softswitch/bean/BsSuitDataDetail.java | 2 + .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 2 + .../pojo/softswitch/bean/BsSuitRequestRecord.java | 1 + .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 3 + 7 files changed, 111 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 0d1249d..2ec710e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -179,6 +179,7 @@ public final class FormHqlPack { DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); ddlPackBean.setOrderByStr(bfIntercept.orderBy()); @@ -324,6 +325,9 @@ public final class FormHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean); + DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(source.getSourceCode(), "sourceCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(source.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean); DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean); DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean); @@ -383,4 +387,33 @@ public final class FormHqlPack { return ddlPackBean; } + /** + * 数据对象查询条件拼接 + * @param bfDataObject + * @return + */ + public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean); + + return ddlPackBean; + } + + + /** + * 数据对象查询条件拼接 + * @param bfCascade + * @return + */ + public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean); + + return ddlPackBean; + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 1a691aa..a315c8c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -73,6 +73,7 @@ public class LacHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bean.getTemplateName(), "templateName", ddlPackBean); return ddlPackBean; } @@ -163,6 +164,10 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean); + DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true); + + return ddlPackBean; } @@ -190,4 +195,14 @@ public class LacHqlPack { DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean); + + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 51429a6..7891cdb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -306,18 +306,19 @@ public class CoreHqlPack { * @param config * @return */ - public static String packHqlSysConfig(SysConfig config) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysConfig(SysConfig config) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(config.getName(),"name",result); - HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result); - HqlPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getStringLikerPack(config.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result); + DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result); // 添加默认排序 - HqlPack.getOrderDefault(config); + DdlPreparedPack.getOrderDefault(config); - return result.toString(); + return result; } /** @@ -337,7 +338,8 @@ public class CoreHqlPack { DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); - DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); + DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -407,7 +409,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean); - ddlPackBean.setOrderByStr(message.orderBy()); + DdlPreparedPack.getOrderDefault(message); return ddlPackBean; } @@ -417,19 +419,21 @@ public class CoreHqlPack { * @param file * @return */ - public static String packHqlSysFile(SysFile file) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysFile(SysFile file) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result); - HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result); - HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result); - HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false); + DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result); + DdlPreparedPack.getNumEqualPack(file.getFileTypeId(), "fileTypeId", result); + DdlPreparedPack.getStringLikerPack(file.getCreateUser(), "createUser", result); + DdlPreparedPack.getNumEqualPack(file.getFileSoftType(), "fileSoftType", result); + DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); + DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); // 添加默认排序 - HqlPack.getOrderDefault(file); + DdlPreparedPack.getOrderDefault(file); - return result.toString(); + return result; } /** @@ -455,20 +459,22 @@ public class CoreHqlPack { * @param sysTaskPlan * @return */ - public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); - HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); - HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); - HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); - HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result); + DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true); // 添加默认排序 - HqlPack.getOrderDefault(sysTaskPlan); + DdlPreparedPack.getOrderDefault(sysTaskPlan); - return result.toString(); + return result; } /** @@ -738,18 +744,23 @@ public class CoreHqlPack { * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); - HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result); - HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); - HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); + if (orderNoRule.getSerialNo() != null) { + DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result); + } // 添加默认排序 - HqlPack.getOrderDefault(orderNoRule); + DdlPreparedPack.getOrderDefault(orderNoRule); - return result.toString(); + return result; } /** @@ -779,13 +790,18 @@ public class CoreHqlPack { * @param sysTask * @return */ - public static String packHqlSysTask(SysTask sysTask){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysTask(SysTask sysTask){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); - HqlPack.getStringLikerPack(sysTask.getName(),"name",result); - HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result); + DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result); - return result.toString(); + DdlPreparedPack.getOrderDefault(sysTask); + + return result; } public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index 23db18b..8dcb4f6 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -68,11 +68,13 @@ public class BsSuitDataDetail extends BaseBean { @ApiParam(value = "获取报文时间") private String getDateTime; + // 移动至记录数据表 @Lob @Column(name = "ORGIN_DATA") @ApiParam(value = "原始报文数据") private String orginData; + // 移动至记录数据表 @Lob @Column(name = "TRANS_DATA") @ApiParam(value = "转换后的报文数据") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 7757888..66d428a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -90,6 +90,7 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "认证结果") private Integer suitSslKeyResult; + // 移动至记录数据表 @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE") @ApiParam(value = "认证信息") private String suitSslKeyResultMessage; @@ -111,6 +112,7 @@ public class BsSuitRecord extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; + // 移动至记录数据表 @Lob @Column(name = "SUIT_MESSAGE") @ApiParam(value = "适配信息") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index b699e9b..e89b27e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -44,6 +44,7 @@ public class BsSuitRequestRecord extends BaseBean { @ApiParam(value = "请求来源(枚举)") private Integer requestSource; + // 移动至记录数据表 @Lob @Column(name = "REQUEST_ORGIN_PARAM") @ApiParam(value = "请求原始参数") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 6bf3024..a4d0bb7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -325,6 +325,8 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); @@ -343,6 +345,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true); From f8405b87d9c3c32ac54013ee5f40e4938bd8f2eb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Apr 2020 09:29:31 +0800 Subject: [PATCH 050/107] =?UTF-8?q?bug7940=E3=80=907940=20=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E5=85=A5=E5=BA=93-=E6=9C=AA=E6=8C=89=E6=9C=80?= =?UTF-8?q?=E8=BF=91=E8=B7=9D=E7=A6=BB=E6=8E=A8=E8=8D=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) 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 4fd1ad6..9eab3f2 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 @@ -5301,4 +5301,44 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_TYPE(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 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; + } + } } \ No newline at end of file From 078e1a77a4732fa86e27d736bdc091f25d1ccf1f Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 13:18:19 +0800 Subject: [PATCH 051/107] =?UTF-8?q?=E3=80=90bug=207895=20PLC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E9=A1=B5=E9=9D=A2=E9=9C=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=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/mes/model/MesPlcModel.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 1ad0189..9ea903c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -92,6 +93,9 @@ public class MesPlcModel implements Serializable { @ApiParam("对象代码") private String objectCode; + @ApiParam("OPCUA路径") + private String opcUrl; + public MesPlcModel() { } @@ -99,7 +103,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -126,5 +130,6 @@ public class MesPlcModel implements Serializable { this.isAnalysis = isAnalysis; this.device = device; this.objectCode = objectCode; + this.opcUrl = opcUrl; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 15b53e4..d217cfb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1079,6 +1079,9 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); + if (!StringUtils.isEmpty(workCellParamCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } From 73f647e3b4300471d23bd047895eb687c0cba83a Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 14:06:50 +0800 Subject: [PATCH 052/107] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c594693..2b86276 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 @@ -3052,7 +3052,8 @@ public class MesEnumUtil { ATTEMPT_ORDER(30, "试制工单"), BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), - STOCK_ORDER(60, "库存工单"); + STOCK_ORDER(60, "库存工单"), + REPAIR(70,"返修插单"); private int value; private String description; From aeda8d8287c333704e82318b23973cecbd9ae864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 1 Apr 2020 14:07:09 +0800 Subject: [PATCH 053/107] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 335f882..fe8e4eb 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 7d63653..f1e9991 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 284f019..9f54aca 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 63c691b..65c6554 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 35c0762..0f73e78 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index cbdf688..7e73285 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 51958ba..232becd 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a0cbb85..e65f727 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 1c38fc4..552f97e 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 9c029b3..beba8ba 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 876096e..8f191db 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c56e1c6..f0a5b7e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4e4a397..d9d461d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 442875c..309d149 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 8573c4e..f34bc03 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index a578bda..f9e982f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 067d448..3b96564 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 From 3654d602146cec06338c0e197807f07880c50022 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 1 Apr 2020 15:12:26 +0800 Subject: [PATCH 054/107] =?UTF-8?q?=E3=80=90bug7947=E3=80=91PLC=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=B7=A5=E6=AD=A5=E8=A3=85=E9=98=9F=E5=88=97=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 0aef82a..d1e1299 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 @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,7 +102,7 @@ public class StationRequestBean implements Serializable { private String queueGroupNo; @ApiParam("数据map") - private Map dataMap; + private Map dataMap=new HashMap<>(); @ApiParam("流程状态集合") private List routeStatusList; From 83d7a618bf59d91d71f585c9a63f243b72c0a968 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 18:05:05 +0800 Subject: [PATCH 055/107] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6mod?= =?UTF-8?q?el=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java index 5553485..257d5ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java @@ -20,6 +20,9 @@ public class ButtonComponentResultModel { @ApiParam("成功信号") private boolean isSuccess; + @ApiParam("是否跳过工序") + private boolean isJumpProcess; + @ApiParam("提示信息") private String msg; From 8c4cb0748b2b33f042659f8817b592eb0897669b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 1 Apr 2020 20:29:23 +0800 Subject: [PATCH 056/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901483?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E6=96=B0=E5=A2=9E=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E8=A7=84=E5=88=99=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901484?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E7=89=A9=E6=96=99=E8=A1=A8=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901485?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=901486=E3=80=91=EF=BC=9ALES-=E5=AD=98=E5=82=A8=E5=8C=BA?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=901487=E3=80=91=EF=BC=9ALES-=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901488=E3=80=91=EF=BC=9ALES-=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901489=E3=80=91=EF=BC=9ALES-=E5=85=A5?= =?UTF-8?q?=E5=9C=BA=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901490?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E5=B7=A1=E7=BA=BF=E6=8B=89=E5=8A=A8=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901491=E3=80=91=EF=BC=9ALES-=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901492?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901493=E3=80=91=EF=BC=9ALES-=E6=89=8B?= =?UTF-8?q?=E5=B7=A5=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901494?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E9=A2=84=E7=95=99=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 6e21241..7ccc46c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -115,6 +115,10 @@ public class WmsASNMaster extends BaseBean { @ApiParam("备注") public String remark; + @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @ApiParam("道口") + public String dock; + @Transient @ApiParam("供应商电话") private String vendorCall; From 3529d1b8451401a3ed44edd5c5458b08cc720e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 1 Apr 2020 20:30:46 +0800 Subject: [PATCH 057/107] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=A7=84=E5=88=99=E8=8C=83=E5=9B=B4=E5=92=8C=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 69 +++++++++++++--------- 1 file changed, 41 insertions(+), 28 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 0fde085..fc12b72 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 @@ -5357,18 +5357,18 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10), - IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10), - IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10), - IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10), - IS_SAME_PART("同物料", "isSamePart", 2, 10), - IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10), - IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10), - IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10), - IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10), - IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10), - IS_COLLECTION("物料整箱归集", "isCollection", 2, 10); + IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10), + IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10), + IS_SAME_PART("同物料", "isSamePart", "2", 10), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10), + IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10), + IS_COLLECTION("物料整箱归集", "isCollection", "2", 10); private String chName; @@ -5376,12 +5376,12 @@ public class WmsEnumUtil { private int waveMergeType; - private int value; + private String fieldValue; - WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) { + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; - this.value = value; + this.fieldValue = fieldValue; this.waveMergeType = waveMergeType; } @@ -5393,8 +5393,8 @@ public class WmsEnumUtil { return enName; } - public int getValue() { - return value; + public String getFieldValue() { + return fieldValue; } public int getWaveMergeType() { @@ -5408,23 +5408,29 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", 20), + "custNo, custName", "custNo, custName", "custNo", + 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", 20), + "code, name", "code, name", "code", + 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", - "", "", 20), + "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", 20), - PART_GROUP_NO("物料组代码", "partGroupNo", "", "", - "", "", 20), + "partNo, partName", "partNo", "partNo", + 20, ""), + PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", + "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", - "", "", 20), + "", "", 20, ""), ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", - "", "", 20); + "", "", 20, ""); // 中文名称 String chName; @@ -5441,8 +5447,10 @@ public class WmsEnumUtil { // 合并操作类型 private int waveMergeType; + private String fieldValue; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, - String searchColumnName, String explicitColumnName, int waveMergeType) { + String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; this.enName = enName; this.entityName = entityName; @@ -5450,6 +5458,7 @@ public class WmsEnumUtil { this.searchColumnName = searchColumnName; this.explicitColumnName = explicitColumnName; this.waveMergeType = waveMergeType; + this.fieldValue = fieldValue; } public String getChName() { @@ -5479,6 +5488,10 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getFieldValue() { + return fieldValue; + } } /** From 1d0030330662298de3bb57fdb0a7658d22a2c2df Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 1 Apr 2020 20:38:59 +0800 Subject: [PATCH 058/107] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-=E6=8A=98=E7=BA=BF=E5=9B=BE,=E9=A5=BC=E5=9B=BE,?= =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE,=E7=9F=A9=E5=BD=A2=E5=9B=BE=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 21 +++++++++++++++++++++ .../i3plus/pojo/model/report/TemplateModel.java | 2 +- .../i3plus/pojo/platform/platbean/SysLogSystem.java | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index 98dcfd7..f355b4b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -6,6 +6,7 @@ import com.mongodb.Block; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Sorts; +import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.bson.conversions.Bson; import org.springframework.data.mongodb.core.MongoOperations; @@ -14,6 +15,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.regex.Pattern; /** @@ -248,6 +250,25 @@ public class BsonPackTool { } /** + * 查询方位分装 + * @param columnName 列名称 + * @param bson + * @param startTime 开始值 + * @param endTime 结束之 + * @return + */ + public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) { + if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){ + bson = Filters.and( + bson, + Filters.gte(columnName, startTime), //大于等于开始日期 + Filters.lte(columnName, endTime) //小于等于结束日期 + ); + } + return bson; + } + + /** * 大于日期 * @param dateTime 日期 * @param columnName HQL里对应的时间字段 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index 2a28c0f..c29a77b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -70,7 +70,7 @@ public class TemplateModel implements Serializable { private List> rows; @ApiParam(value = "跨服务调用解析后数据") - private Object option; + private String option; @ApiParam(value = "分页参数") private Pager pager; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 51447d5..5d81ed5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -91,4 +91,5 @@ public class SysLogSystem extends BaseBean { @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; + } From 6a36ad7601599e33f29e9a78a6495fa84c0b61f4 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 1 Apr 2020 21:17:43 +0800 Subject: [PATCH 059/107] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 104 ++++++++++++++++++++- modules/i3plus-pojo-mes/pom.xml | 9 +- .../pojo/mes/bean/MesStateMachineStatus.java | 22 ++++- ...MesActionModuleGroup.java => MesStepGroup.java} | 8 +- .../i3plus/pojo/mes/model/FsmStatusModel.java | 27 ++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 11 ++- .../pojo/mes/model/StationRequestCmdBean.java | 17 ++++ .../cn/estsh/i3plus/pojo/mes/model/StepModel.java | 2 + .../cn/estsh/i3plus/pojo/mes/model/StepResult.java | 51 ++++++++-- .../MesStateMachineStatusRepository.java | 15 +++ pom.xml | 2 +- 11 files changed, 247 insertions(+), 21 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesActionModuleGroup.java => MesStepGroup.java} (83%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FsmStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestCmdBean.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.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 9b37512..e213ca8 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 @@ -3091,7 +3091,7 @@ public class MesPcnEnumUtil { } /** - * mes_设备工装类型 + * mes_设备工装类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EQUIPMENT_TOOLING_TOOLING_TYPE { @@ -3234,4 +3234,106 @@ public class MesPcnEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FSM_EVENT { + TRIGGER(10, "trigger", "触发"), + ENTRY(20, "entry", "进入状态"), + EXIT(30, "exit", "离开状态"); + + private int value; + private String code; + private String description; + + private FSM_EVENT(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return this.value; + } + + public String getCode() { + return this.code; + } + + public String getDescription() { + return this.description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FSM_STATE_TYPE { + BEGIN(10, "begin", "开始状态点"), + END(20, "end", "结束状态点"); + + private int value; + private String code; + private String description; + + private FSM_STATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return this.value; + } + + public String getCode() { + return this.code; + } + + public String getDescription() { + return this.description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TRIGGER_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 STATION_REQUEST_BEAN_CMD { + JUMP_STATUS(10, "跳过状态点"), + FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点"); + + private int value; + private String description; + + STATION_REQUEST_BEAN_CMD(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/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 988d513..00c7035 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,20 +5,25 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-${profileActive}-SNAPSHOT + + 1.0-DEV-SNAPSHOT i3plus.pojo i3plus-pojo-base + + org.springframework + spring-web + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 90bcbf9..421dbcb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -10,8 +10,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -57,19 +57,31 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("触发条件") private String triggerWhere; - @Column(name = "ACTION_AMG_ID") + @Column(name = "TRIGGER_AMG_ID") @ApiParam("触发调用") - private Integer actionAmgId; + private Long triggerAmgId; @Column(name = "IN_AMG_ID") @ApiParam("进入调用") - private Integer inAmgId; + private Long inAmgId; @Column(name = "OUT_AMG_ID") @ApiParam("离开调用") - private Integer outAmgId; + private Long outAmgId; @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") @ApiParam("状态类型 10=初始化状态") private Integer statusType; + + @Transient + @ApiParam("状态点是否完成") + private boolean isComplete; + + @Transient + @ApiParam("状态点是否完成") + private boolean isJump; + + @Transient + @ApiParam("前端显示颜色") + private String color; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java index 314f526..48bfc7a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java @@ -23,18 +23,18 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_MODULE_GROUP") +@Table(name = "MES_STEP_GROUP") @Api("工步集") -public class MesActionModuleGroup extends BaseBean implements Serializable { +public class MesStepGroup extends BaseBean implements Serializable { private static final long serialVersionUID = 1876053661752102998L; @Column(name = "AMG_ID") @ApiParam("组件集编号") private Long amgId; - @Column(name = "AM_CODE") + @Column(name = "STEP_CODE") @ApiParam("组件集代码") - private String amCode; + private String stepCode; @Column(name = "SEQ") @ApiParam("执行顺序") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FsmStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FsmStatusModel.java new file mode 100644 index 0000000..e7e176f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FsmStatusModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/3/30 22:18 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FsmStatusModel { + + private String from; + + private String to; + + private String event; + + private Object context; + + private String status; + +} 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 0aef82a..1a56ab0 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -62,11 +63,17 @@ public class StationRequestBean implements Serializable { @ApiParam("按钮编号") private String buttonCode; + @ApiParam("状态代码") + private String statusCode; + @ApiParam("工步代码") private String stepCode; @ApiParam("强制执行工步代码") private String forceSpecStepCode; + + @ApiParam("强制执行状态点代码") + private String forceSpecStatusCode; /** * doScan-扫描，doModule-处理组件,initModule-初始化组件 */ @@ -104,10 +111,10 @@ public class StationRequestBean implements Serializable { private Map dataMap; @ApiParam("流程状态集合") - private List routeStatusList; + private List fsmStates; @ApiParam("当前流程状态") - private MesRouteStatus curRouteStatus; + private MesStateMachineStatus curFsmState; @Override public String toString() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestCmdBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestCmdBean.java new file mode 100644 index 0000000..244c7f1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestCmdBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/31 18:41 + * @desc + */ +@Data +public class StationRequestCmdBean { + + private StationRequestBean requestBean; + + private MesPcnEnumUtil.STATION_REQUEST_BEAN_CMD cmd; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 7636eae..8adee52 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -66,11 +66,13 @@ public class StepModel implements Serializable { */ @ApiParam("工步是否跳过") private boolean isJump; + /** * 参数代码 */ @ApiParam("参数代码") private String paramCode; + /** * 工作单元代码 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 22d2fa3..77c8985 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -18,26 +18,52 @@ public class StepResult { private String msg; - public static StepResult getSuccessComplete() { - return new StepResult(true,""); - } + private StationRequestBean stationRequestBean; public static StepResult getNonComplete() { - return new StepResult(false,""); + return new StepResult(false, ""); } - public static StepResult getSuccessComplete(String msg) { - return new StepResult(true, msg); + public static StepResult getNonComplete(StationRequestBean requestBean) { + return new StepResult(false, ""); + } + + public static StepResult getNonCompleteData(T data, String msg) { + return new StepResult(false, data, msg); + } + + public static StepResult getNonCompleteReqBean(StationRequestBean reqBean) { + return new StepResult(false, reqBean); + } + + public static StepResult getNonCompleteData(T data) { + return new StepResult(false, data, ""); } public static StepResult getNonComplete(String msg) { return new StepResult(false, msg); } + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getSuccessComplete() { + return new StepResult(true, ""); + } + + public static StepResult getSuccessCompleteReqBean(StationRequestBean reqBean) { + return new StepResult(true, reqBean); + } + public static StepResult getSuccessData(T data, String msg) { return new StepResult<>(true, data, msg); } + public static StepResult getSuccessData(T data) { + return new StepResult<>(true, data, ""); + } + public static StepResult getSuccessData(Collection data, String msg) { return new StepResult(true, data, msg); } @@ -54,6 +80,12 @@ public class StepResult { this.msg = msg; } + + public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) { + this.isCompleted = isCompleted; + this.stationRequestBean = stationRequestBean; + } + public StepResult(boolean isCompleted, T data, String msg) { this.isCompleted = isCompleted; this.data = data; @@ -66,4 +98,11 @@ public class StepResult { this.msg = msg; } + public StepResult(boolean isCompleted, T data, Collection dataCollection, String msg, StationRequestBean stationRequestBean) { + this.isCompleted = isCompleted; + this.data = data; + this.dataCollection = dataCollection; + this.msg = msg; + this.stationRequestBean = stationRequestBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.java new file mode 100644 index 0000000..67c4a3f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.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.MesStateMachineStatus; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate:2019\10\9 + * @Modify: + **/ +public interface MesStateMachineStatusRepository extends BaseRepository { +} diff --git a/pom.xml b/pom.xml index 794b599..11f19cc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-${profileActive}-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 241ec4974ba9b524266b845dd6c0edfde8743d38 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 1 Apr 2020 23:54:54 +0800 Subject: [PATCH 060/107] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 12 ++++ .../i3plus/pojo/mes/model/MesQueueShipping.java | 66 +++++++++++++++++++ .../pojo/mes/model/MesQueueShippingDetail.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 29 +++++++-- .../i3plus/pojo/mes/model/StepDispatchModel.java | 5 +- 5 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index a3f4547..e641bcf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -67,4 +67,16 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java new file mode 100644 index 0000000..45dcf3d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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_JIT发运队列 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING") +@Api("MES_JIT发运队列") +public class MesQueueShipping extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308414110L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java new file mode 100644 index 0000000..2e83143 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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_JIT发运队列明细 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING_DETAIL") +@Api("MES_JIT发运队列明细") +public class MesQueueShippingDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "status") + @ApiParam("状态") + private Integer status; + + @Column(name="SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + + @Column(name = "qty") + @ApiParam("数量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 60b7948..7b12171 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -129,16 +129,33 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; } + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.finsihQty=finsihQty; + this.qty=qty; + this.orderNo=orderNo; + } - public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { - this.queueGroupNo = queueGroupNo; - this.groupNo = groupNo; - this.orderNo = orderNo; + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType) { + this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; this.partNo = partNo; this.partNameRdd = partNameRdd; - this.organizeCode = organizeCode; + this.workType = workType; + this.orderNo=orderNo; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index bf9d485..7585012 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -18,12 +18,15 @@ public class StepDispatchModel { private String cellParamKey; + private String requestBeanKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; this.scanInfo = scanInfo; } } From dce52df770c9452d317f28331c7946af7b3b2baa Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 2 Apr 2020 00:12:43 +0800 Subject: [PATCH 061/107] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E7=BB=99=E5=B7=A5=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index 7585012..ec019ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -20,13 +20,16 @@ public class StepDispatchModel { private String requestBeanKey; + private String moduleDataMapKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; this.requestBeanKey = requestBeanKey; + this.moduleDataMapKey = moduleDataMapKey; this.scanInfo = scanInfo; } } From 851bd1feecac81c16969f6a1ecc7d8685f298e2f Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 2 Apr 2020 00:48:26 +0800 Subject: [PATCH 062/107] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QueueOrderModel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 7b12171..60d0f9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -120,7 +120,39 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + this.finsihQty=finsihQty; + this.qty=qty; + this.orderNo=orderNo; + } + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + this.orderNo=orderNo; + } public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { this.id = id; this.queDetailSeq = queDetailSeq; From 4dae2eea7d7bba7b6455a3f2d9c1588da14f74f3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 09:56:15 +0800 Subject: [PATCH 063/107] =?UTF-8?q?=E3=80=90MES=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=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/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c594693..5f5e21f 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 @@ -18,7 +18,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_MODULE { WORK_ORDER_LANDED(10, "生产工单下达"), - QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"); + QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"), + MES_WORK_ORDER(30, "生产工单导入"); private int value; private String description; From 5fc4c6c025e32879b8bb353abfa84bd4af6ea140 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Apr 2020 10:31:21 +0800 Subject: [PATCH 064/107] mes --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) 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 9b37512..0db0a4c 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 @@ -2651,8 +2651,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"); -// DB(20, "DB"); + PLC(10, "PLC"), + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 2752dac..4dfc1ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -38,13 +38,9 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable { @ApiParam("数据对象编号") private String dataObjectNo; -// @Column(name = "STORE_OBJECT_CODE") -// @ApiParam("存储对象代码") -// private String storeObjectCode; -// -// @Column(name = "STORE_FIELD_CODE") -// @ApiParam("存储字段代码") -// private String storeFieldCode; + @Column(name = "STORE_OBJECT_CODE") + @ApiParam("存储对象代码") + private String storeObjectCode; @Transient @ApiParam("任务名称") From e84d74d7beab0905b8ce3c115c3739fa54d33612 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 10:35:32 +0800 Subject: [PATCH 065/107] =?UTF-8?q?=E3=80=90=E5=86=B2=E7=AA=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=89=BE=E5=9B=9E=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 2dad813..64f03c6 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 @@ -5502,6 +5502,10 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); + int value; + String code; + String description; + WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; this.code = code; @@ -5725,6 +5729,14 @@ public class WmsEnumUtil { } public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From c0e3f1cb4fcf2e94f51ae0acba49962faa0e12bf Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 11:08:28 +0800 Subject: [PATCH 066/107] =?UTF-8?q?=E3=80=90=E6=89=BE=E5=9B=9E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 2dad813..64f03c6 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 @@ -5502,6 +5502,10 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); + int value; + String code; + String description; + WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; this.code = code; @@ -5725,6 +5729,14 @@ public class WmsEnumUtil { } public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From 9b3dd796550e0df399f541c9054563637f6c4454 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 11:10:43 +0800 Subject: [PATCH 067/107] =?UTF-8?q?=E3=80=90=E5=86=B2=E7=AA=81=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 68 +++++++++++++++++------------------------------------------------ 1 file changed, 18 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index d6a60cc..7a083c9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -202,24 +202,24 @@ - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -254,36 +254,4 @@ ${project.artifactId}-${project.version} - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - \ No newline at end of file From a432b77ca0b1c2d53dee65517f6a82e10bbaf3ac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Apr 2020 12:41:53 +0800 Subject: [PATCH 068/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A11536=E3=80=901536=20P?= =?UTF-8?q?DA=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E8=BD=A6=E7=89=8C=E4=BF=A1=E6=81=AF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 + .../i3plus/pojo/wms/bean/WmsTransportRule.java | 91 ++++++++++++++++++++++ .../wms/repository/WmsTransportRuleRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++ 4 files changed, 124 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java 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 b807a04..ead19c3 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 @@ -107,6 +107,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "车牌号") private String carNo; + @Column(name = "DRIVER_NO") + @ApiParam("司机") + public String driverNo; + @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java new file mode 100644 index 0000000..5c91192 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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.*; +import java.util.List; + + +/** + * @Description : 运输规则表 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-03-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TRANSPORT_RULE") +@Api("运输规则表") +public class WmsTransportRule extends BaseBean { + private static final long serialVersionUID = 6120257805546343124L; + + @Column(name = "COMMAND_TYPE") + @ApiParam(value = "指令类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.IMPORT_ORDER_TYPE.class, refForeignKey = "value", value = "description") + private String commandType; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE") + public Integer busiType; + + @Column(name = "BUSI_SCENE_TYPE") + @ApiParam("业务场景") + //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") + public Integer busiSceneType; + + + @Column(name = "SRC_AREA_NO") + @ApiParam("发货库存地") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String srcAreaNo; + + + @Column(name = "DEST_AREA_NO") + @ApiParam("目标库存地") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String destAreaNo; + + @Column(name = "OUT_VENDOR_NO") + @ApiParam("委外供应商编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String outVendorNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String partNo; + + @Column(name = "CUST_NO") + @ApiParam("客户代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String custNo; + + @Column(name = "IS_TRANSPORT") + @ApiParam("是否安排运输") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + public int isTransport; + + @Column(name = "REMARK",length = 255) + @ApiParam("备注") + public String remark; + + @ApiParam("物料编码") + @Transient + public List partNoLst; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java new file mode 100644 index 0000000..4a9acce --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransportRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : 运输规则dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-03-27 10:30 + * @Modify: + **/ +@Repository +public interface WmsTransportRuleRepository extends BaseRepository { +} 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 c92cbc1..6f59761 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 @@ -2907,4 +2907,17 @@ public class WmsHqlPack { return result; } + /** + * 运输规则分页查询条件 + * @param wmsTransportRule + * @return + */ + public static DdlPackBean packHqlBasPlugin(WmsTransportRule wmsTransportRule) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(wmsTransportRule.getBusiType(), "busiType", result); + DdlPreparedPack.getStringLikerPack(wmsTransportRule.getCustNo(), "custNo", result); + DdlPreparedPack.getStringLikerPack(wmsTransportRule.getPartNo(), "partNo", result); + getStringBuilderPack(wmsTransportRule, result); + return result; + } } From d2fb33d88849286575ecedd708d97d98a0572cac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Apr 2020 12:50:16 +0800 Subject: [PATCH 069/107] =?UTF-8?q?bug1536=E3=80=901536=20PDA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=BD=A6=E7=89=8C=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 79 ++++++++++++++++++---- 1 file changed, 66 insertions(+), 13 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 64f03c6..dcc9407 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 @@ -5502,9 +5502,9 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); - int value; - String code; - String description; + private int value; + private String code; + private String description; WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; @@ -5689,6 +5689,16 @@ public class WmsEnumUtil { } return tmp; } + + 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; + } } /** @@ -5728,16 +5738,7 @@ public class WmsEnumUtil { return null; } - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - public static String valueOfDescription(int val) { + public static String valueOfDescription ( int val){ String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5787,4 +5788,56 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 业务场景Supplier + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BUSI_SCENE_TYPE { + YFAS_DELIVERY(10, "YFAS_DELIVERY", "YFAS送货"), + TURN_ZAITU_LOCATE(20, "TURN_ZAITU_LOCATE", "转储到在途库位"), + ORGANIZE_TRUN(30, "ORGANIZE_TRUN", "工厂内转储"), + SUPPLIER_SELF(40, "SUPPLIER_SELF", "供应商自提"), + CUSTOMER_SELF(50, "CUSTOMER_SELF", "客户自提"); + private int value; + private String code; + private String description; + + BUSI_SCENE_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 BUSI_SCENE_TYPE codeOf(String code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + 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; + } + } } \ No newline at end of file From 8a836e340aef6f206962dec77177c372913bac29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 13:26:23 +0800 Subject: [PATCH 070/107] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++--- 1 file changed, 42 insertions(+), 6 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 fc12b72..530863f 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 @@ -5378,6 +5378,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; @@ -5400,6 +5406,18 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public int getValue() { + return value; + } } /** @@ -5408,24 +5426,24 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", + "custNo,custName", "custNo,custName", "custNo", 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", + "code,name", "code,name", "code", 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", + "partNo,partName", "partNo", "partNo", 20, ""), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", - "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo,partGroupName", "partGroupNo", "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", "", "", 20, ""), @@ -5449,6 +5467,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; @@ -5492,6 +5516,18 @@ public class WmsEnumUtil { public String getFieldValue() { return fieldValue; } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } } /** From 57f2177ef64607d8635a10d4603f4ad18e6f3e60 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 13:34:08 +0800 Subject: [PATCH 071/107] =?UTF-8?q?=E3=80=90=E6=B3=A2=E6=AC=A1=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=A7=84=E5=88=99--=E6=9E=9A=E4=B8=BE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=94=99=E8=AF=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++--- 1 file changed, 42 insertions(+), 6 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 64f03c6..4d4e450 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 @@ -5378,6 +5378,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; @@ -5400,6 +5406,18 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public int getValue() { + return value; + } } /** @@ -5408,24 +5426,24 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", + "custNo,custName", "custNo,custName", "custNo", 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", + "code,name", "code,name", "code", 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", + "partNo,partName", "partNo", "partNo", 20, ""), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", - "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo,partGroupName", "partGroupNo", "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", "", "", 20, ""), @@ -5449,6 +5467,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; @@ -5492,6 +5516,18 @@ public class WmsEnumUtil { public String getFieldValue() { return fieldValue; } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } } /** From 032fb350c8ef316b7c53267ff6b34be05173123b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 2 Apr 2020 13:55:58 +0800 Subject: [PATCH 072/107] =?UTF-8?q?queueordermodel=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QueueOrderModel.java | 54 +++++++++++++++------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 60d0f9e..b55e96d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -90,7 +90,7 @@ public class QueueOrderModel implements Serializable { } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -102,8 +102,8 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; + this.finsihQty = finsihQty; + this.qty = qty; } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -120,8 +120,9 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -133,12 +134,12 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; - this.orderNo=orderNo; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -151,8 +152,9 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.orderNo=orderNo; + this.orderNo = orderNo; } + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { this.id = id; this.queDetailSeq = queDetailSeq; @@ -161,8 +163,26 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) { + + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; + } + + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) { + this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -172,12 +192,12 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; - this.orderNo=orderNo; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -188,6 +208,6 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workType = workType; - this.orderNo=orderNo; + this.orderNo = orderNo; } } From cd99a63233d661751bbc7cd0e4e621cd81061e5c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Apr 2020 20:12:59 +0800 Subject: [PATCH 073/107] mes --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 8 +++++ .../i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 4 +++ 3 files changed, 47 insertions(+) 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 0db0a4c..c87401e 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 @@ -13,6 +13,41 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 监听任务明细-采集数据方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_DETAIL_COLLECT_TYPE { + SELF_ADDITION(10, "自增列"), + FEED_FIELD(20, "反馈字段"); + + private int value; + private String description; + + MONITOR_TASK_DETAIL_COLLECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index 7e0b93f..af4d758 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -70,6 +70,14 @@ public class MesDataObject extends BaseBean implements Serializable { @ApiParam("自增列值") private Long selfAdditionValue; + @Column(name = "ORDER_BY_FIELD") + @ApiParam("采集排序字段") + private String orderbyField; + + @Column(name = "ORDER_BY_VALUE") + @ApiParam("采集排序值") + private Integer orderbyValue; + @Transient @ApiParam("操作类型名称") private String operateTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 4dfc1ba..36ff11f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -42,6 +42,10 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable { @ApiParam("存储对象代码") private String storeObjectCode; + @Column(name = "COLLECT_TYPE") + @ApiParam("采集数据方式") + private Integer collectType; + @Transient @ApiParam("任务名称") private String taskName; From 9f918b66649a9537ad4df50a1e8a5bed78f0be4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 20:15:26 +0800 Subject: [PATCH 074/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A2=E6=AC=A1?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=92=8C=E8=8C=83=E5=9B=B4=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E5=AD=97=E6=AE=B5=E5=80=BC=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 125 ++++++++++++--------- 1 file changed, 73 insertions(+), 52 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 d7b809e..d669fdb 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 @@ -5357,24 +5357,36 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10), - IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10), - IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10), - IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10), - IS_SAME_PART("同物料", "isSamePart", "2", 10), - IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10), - IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10), - IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10), - IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10), - IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10), - IS_COLLECTION("物料整箱归集", "isCollection", "2", 10); - - private String chName; - - private String enName; - - private int waveMergeType; + IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10, + 0, "isSameCustomer", "同客户"), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10, + 0, "isSameWareHouse", "同仓库"), + IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10, + 0, "isSamePriority", "同优先级"), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10, + 0, "isSameSrcZone", "同来源存储区"), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10, + 0, "isSameDestZone", "同目标存储区"), + IS_SAME_PART("同物料", "isSamePart", "2", 10, + 0, "isSamePart", "同物料"), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10, + 0, "isSamePartGroup", "同物料组"), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10, + 0, "isSameDeliveryTime", "同发货时间"), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10, + 0, "isSameBusiType", "同业务类型"), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10, + 0, "isSameOrderStatus", "同单据状态"), + IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10, + 0, "isCrossArea", "允许跨区"), + IS_COLLECTION("物料整箱归集", "isCollection", "2", 10, + 0, "isCollection", "物料整箱归集"); + + private String fieldChName; + + private String fieldEnName; + + private int mergeOperatorType; private String fieldValue; @@ -5384,27 +5396,31 @@ public class WmsEnumUtil { private String description; - WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { - this.chName = chName; - this.enName = enName; + WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value, + String code, String description) { + this.fieldChName = fieldChName; + this.fieldEnName = fieldEnName; this.fieldValue = fieldValue; - this.waveMergeType = waveMergeType; + this.mergeOperatorType = mergeOperatorType; + this.value = value; + this.description = description; + this.code = code; } - public String getChName() { - return chName; + public String getFieldChName() { + return fieldChName; } - public String getEnName() { - return enName; + public String getFieldEnName() { + return fieldEnName; } public String getFieldValue() { return fieldValue; } - public int getWaveMergeType() { - return waveMergeType; + public int getMergeOperatorType() { + return mergeOperatorType; } public String getDescription() { @@ -5427,33 +5443,34 @@ public class WmsEnumUtil { public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", "custNo,custName", "custNo,custName", "custNo", - 20, ""), + 20, "", "custNo", 0, "客户代码"), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", "code,name", "code,name", "code", - 20, ""), + 20, "", "srcWhNo", 0, "仓库代码"), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", - "", "", 20, ""), + "", "", 20, "", + "priority", 0, "优先级"), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", "zoneNo,zoneName", "zoneNo", "zoneNo", - 20, ""), + 20, "", "srcZoneNo", 0, "来源存储区代码"), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", "zoneNo,zoneName", "zoneNo", "zoneNo", - 20, ""), + 20, "", "destZoneNo", 0, "目标存储区代码"), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", "partNo,partName", "partNo", "partNo", - 20, ""), + 20, "", "partNo", 0, "物料号"), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", "partGroupNo,partGroupName", "partGroupNo", - "partGroupNo", 20, ""), + "partGroupNo", 20, "", "partGroupNo", 0, "物料组代码"), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", - "", "", 20, ""), + "", "", 20, "", "busiType", 0, "业务类型"), ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", - "", "", 20, ""); + "", "", 20, "", "orderStatus", 0, "单据状态"); // 中文名称 - String chName; + String fieldChName; // 英文名称 - String enName; + String fieldEnName; // 下拉枚举名称 String entityName; // 下拉列表显示列名称,多个列名需要根据逗号分隔 @@ -5463,7 +5480,7 @@ public class WmsEnumUtil { // 回显列名 String explicitColumnName; // 合并操作类型 - private int waveMergeType; + private int mergeOperatorType; private String fieldValue; @@ -5473,24 +5490,28 @@ public class WmsEnumUtil { private String description; - WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, - String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { - this.chName = chName; - this.enName = enName; + WAVE_MERGE_RANGE(String fieldChName, String fieldEnName, String entityName, String listColumnName, + String searchColumnName, String explicitColumnName, int mergeOperatorType, String fieldValue, + String code, int value, String description) { + this.fieldChName = fieldChName; + this.fieldEnName = fieldEnName; this.entityName = entityName; this.listColumnName = listColumnName; this.searchColumnName = searchColumnName; this.explicitColumnName = explicitColumnName; - this.waveMergeType = waveMergeType; + this.mergeOperatorType = mergeOperatorType; this.fieldValue = fieldValue; + this.code = code; + this.value = value; + this.description = description; } - public String getChName() { - return chName; + public String getFieldEnName() { + return fieldEnName; } - public String getEnName() { - return enName; + public String getFieldChName() { + return fieldChName; } public String getEntityName() { @@ -5509,8 +5530,8 @@ public class WmsEnumUtil { return explicitColumnName; } - public int getWaveMergeType() { - return waveMergeType; + public int getMergeOperatorType() { + return mergeOperatorType; } public String getFieldValue() { @@ -5522,7 +5543,7 @@ public class WmsEnumUtil { } public String getDescription() { - return description; + return "description"; } public String getCode() { From 3442fd48011f51885cb76c231ac603cbdad55d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 20:15:58 +0800 Subject: [PATCH 075/107] =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E=E5=BC=80=E7=AA=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java index f2e7cf7..360d029 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java @@ -50,6 +50,22 @@ public class WmsWaveRuleDetails extends BaseBean { @ApiParam(value = "字段值") public String fieldValue; + @Column(name = "ENTITY_NAME") + @ApiParam(value = "实例类名") + public String entityName; + + @Column(name = "LIST_COLUMN_NAME") + @ApiParam(value = "列表列名") + public String listColumnName; + + @Column(name = "SEARCH_COLUMN_NAME") + @ApiParam(value = "搜索列名") + public String searchColumnName; + + @Column(name = "EXPLICIT_COLUMN_NAME") + @ApiParam(value = "回显列名") + public String explicitColumnName; + public Long getRuleId() { return ruleId == null ? 0L : ruleId.longValue(); } 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 6f59761..06bf167 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 @@ -2901,6 +2901,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result); + DdlPreparedPack.getStringEqualPack(rule.getRuleDesc(), "ruleDesc", result); DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result); DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result); getStringBuilderPack(rule, result); From f64a543a4afd5e9da74c59b0081a816a252cc629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 2 Apr 2020 20:37:24 +0800 Subject: [PATCH 076/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=89=B9=E9=87=8F=E9=85=8D=E7=BD=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesRouteCfgModel.java | 27 ++++++++++++++++++++++ .../pojo/mes/model/MesRouteCfgParamModel.java | 25 ++++++++++++++++++++ .../pojo/mes/model/MesRouteCfgStepModel.java | 22 ++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java new file mode 100644 index 0000000..bc4ac3d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 产品流程配置Model + * @Reference : + * @Author : adair + * @CreateDate : 2020-4-2 + * @Modify: + **/ +@Data +public class MesRouteCfgModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("产品生产类型") + private String pptCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java new file mode 100644 index 0000000..94e14e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 产品流程配置参数Model + * @Reference : + * @Author : adair + * @CreateDate : 2020-4-2 + * @Modify: + **/ +@Data +public class MesRouteCfgParamModel { + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("是否执行 1=是 2=否") + private Integer isActive; + + List stepModelList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java new file mode 100644 index 0000000..be57f42 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 产品流程配置Model + * @Reference : + * @Author : adair + * @CreateDate : 2020-4-2 + * @Modify: + **/ +@Data +public class MesRouteCfgStepModel { + + @ApiParam("工步代码") + private String stepCode; + + List routeCfgModelList; +} From 836a4f710dd4af9bc5a53d242311ffe120fcf871 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 3 Apr 2020 00:02:10 +0800 Subject: [PATCH 077/107] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesEquipmentToolingModel.java | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java new file mode 100644 index 0000000..b15294e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesTooling; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : MES_设备工装关系Model + * @Reference : + * @Author :qianhuasheng + * @CreateDate : 2020-04-02 16:34 + * @Modify: + **/ +@Data +@Api("MES_设备工装关系Model") +public class MesEquipmentToolingModel implements Serializable { + + private static final long serialVersionUID = 1947971352179107711L; + + private Long id; + + @ApiParam("显示颜色") + private String color; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("工装编号") + private String toolingNo; + + @ApiParam("工装代码") + private String toolingCode ; + + @ApiParam("工装名称") + private String toolingName; + + @ApiParam("工装类型") + private Integer toolingType; + + @ApiParam("使用次数") + private Integer useCount; + + @ApiParam("更换开始时间") + private String startTime; + + @ApiParam("更换结束时间") + private String endTime; + + @Transient + @ApiParam("最大次数") + private Integer useCountMax; + + public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) { + this.toolingCode = tooling.getToolingCode(); + this.toolingName = tooling.getToolingName(); + this.useCount = useCount; + this.useCountMax = tooling.getUseCountMax(); + } + public MesEquipmentToolingModel() { + } +} From 492dfbff82a09304821c9b00d88c7c36edb912fd Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Fri, 3 Apr 2020 11:59:59 +0800 Subject: [PATCH 078/107] =?UTF-8?q?pom=E9=80=9A=E8=BF=87=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AD=98=E5=9C=A8=E5=8F=AA=E8=83=BD=E5=BC=95?= =?UTF-8?q?=E7=94=A8jar=E4=B8=8D=E8=83=BD=E5=BC=95=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E5=85=88=E8=BF=98=E5=8E=9F=E4=B8=BA?= =?UTF-8?q?=E6=9C=80=E5=88=9D=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 3 +-- modules/i3plus-pojo-aps/pom.xml | 3 +-- modules/i3plus-pojo-base/pom.xml | 3 +-- modules/i3plus-pojo-form/pom.xml | 3 +-- modules/i3plus-pojo-hardswitch/pom.xml | 3 +-- modules/i3plus-pojo-jobflow/pom.xml | 3 +-- modules/i3plus-pojo-lac/pom.xml | 3 +-- modules/i3plus-pojo-mes-pcn/pom.xml | 3 +-- modules/i3plus-pojo-mes/pom.xml | 3 +-- modules/i3plus-pojo-model/pom.xml | 3 +-- modules/i3plus-pojo-platform/pom.xml | 3 +-- modules/i3plus-pojo-ptl/pom.xml | 3 +-- modules/i3plus-pojo-report/pom.xml | 3 +-- modules/i3plus-pojo-softswitch/pom.xml | 3 +-- modules/i3plus-pojo-sweb/pom.xml | 3 +-- modules/i3plus-pojo-wms/pom.xml | 3 +-- modules/i3plus-pojo-workflow/pom.xml | 3 +-- pom.xml | 2 +- 18 files changed, 18 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index fe8e4eb..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f1e9991..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f54aca..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 65c6554..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0f73e78..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 7e73285..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 232becd..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e65f727..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 552f97e..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index beba8ba..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8f191db..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index f0a5b7e..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index d9d461d..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 309d149..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f34bc03..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index f9e982f..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index d561047..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,13 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-${profileActive}-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7a083c9..ff1cd2d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-${profileActive}-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From d9d2113f75334ab1b4f0d22760d9a3ab2fe33109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 3 Apr 2020 13:00:02 +0800 Subject: [PATCH 079/107] =?UTF-8?q?=E3=80=90MES=5F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 +- modules/i3plus-pojo-aps/pom.xml | 4 +- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 45 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 6 +++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index a7393ab..d17e85c 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-${profileActive}-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 83da951..b4d639f 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-${profileActive}-SNAPSHOT + 1.0-DEV-SNAPSHOT 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 c594693..ab29221 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 @@ -4598,4 +4598,49 @@ public class MesEnumUtil { return tmp; } } + + /** + * 容器使用状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_CONTAINER_STATUS { + FREE(10, "空闲"), + OCCUPY(20, "占用"); + + private int value; + private String description; + + MES_CONTAINER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + 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; + } + } } 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 9b37512..4868eb9 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 @@ -3234,4 +3234,49 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 容器使用状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_CONTAINER_STATUS { + FREE(10, "空闲"), + OCCUPY(20, "占用"); + + private int value; + private String description; + + MES_CONTAINER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index ea3a703..fba3a8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -106,6 +106,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("打印缓存id") private String printId; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + public MesPackage() { } 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 b71bdbd..4c9c79d 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 @@ -132,4 +132,10 @@ public class MesPlc extends BaseBean implements Serializable { @Column(name = "TOOLING_CODE ") @ApiParam("工装代码") private String toolingCode; + + + @Transient + @ApiParam("标签数据") + private String tableValue; + } From 965a8d37cd07c61607d64fa69adbd5412dd19299 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Apr 2020 15:20:59 +0800 Subject: [PATCH 080/107] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99mav?= =?UTF-8?q?en=20profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/pom.xml b/pom.xml index d6a60cc..ed5d0a1 100644 --- a/pom.xml +++ b/pom.xml @@ -221,38 +221,6 @@ - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - From ea9457a191274b4b30f0435ab3dcd5b169f6f22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 3 Apr 2020 15:58:48 +0800 Subject: [PATCH 081/107] =?UTF-8?q?=E4=BF=AE=E5=A4=8DWMS=E6=B3=A2=E6=AC=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ef16765..61cb767 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -28,10 +28,10 @@ import java.math.BigDecimal; @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @Index(columnList = "ITEM_STATUS") -}, uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})}) +}) +// uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})} @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { - private static final long serialVersionUID = 2938720878619662102L; @Column(name = "ORDER_NO") @ApiParam(value = "单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java index 8f0336a..5b43149 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; /** @@ -14,6 +15,7 @@ import org.hibernate.annotations.ColumnDefault; * @Modify: **/ @Data +@NoArgsConstructor @AllArgsConstructor @Api("移库单数据模型") public class WmsDocMovementModel { @@ -43,7 +45,7 @@ public class WmsDocMovementModel { private String partGroupNo; @ApiParam("订单状态") - private String orderStatus; + private Integer orderStatus; @ApiParam(value = "优先级", example = "1") public Integer priority; From 45dda6ea57a597acb3fb792649d08238596abcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 3 Apr 2020 17:03:28 +0800 Subject: [PATCH 082/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=A3=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8A=A5=E6=96=87=E5=85=B3=E7=B3=BB=E5=92=8C?= =?UTF-8?q?=E5=B7=A5=E8=A3=85=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesScatterCfgDetail.java | 43 +++++++++++++++++ .../i3plus/pojo/mes/bean/MesToolingDetail.java | 56 ++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java new file mode 100644 index 0000000..cb0457f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java @@ -0,0 +1,43 @@ +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; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:58 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_CFG_DETAIL") +@Api("MES_散件配置报文关系") +public class MesScatterCfgDetail extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java new file mode 100644 index 0000000..2deb16a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java @@ -0,0 +1,56 @@ +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 : qianhuasheng + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING_DETAIL") +@Api("MES_工装明细") +public class MesToolingDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -5033127912653649665L; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} From 4dc2996bdc639e0cfe0203c420cf4c54992c5dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 3 Apr 2020 17:15:52 +0800 Subject: [PATCH 083/107] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=AD=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E6=B3=A2=E6=AC=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index f235943..3657a64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -49,7 +49,7 @@ public class WmsBusiType extends BaseBean { public Integer moveType; /** - * 是否启用波次计划 10-是，20-否 + * 是否启用波次计划 1-是，2-否 */ @Column(name = "IS_ENABLE_WAVE") @ApiParam("是否启用波次计划") From 3fd17208e2022628b1013897e7982a9cfbe1ba8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 3 Apr 2020 17:37:02 +0800 Subject: [PATCH 084/107] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 47 +++++++++++++++++++ .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 44 ++++++++++++++++++ .../pojo/model/form/FormOperateDataModel.java | 41 ++++++++++++++++ .../pojo/model/platform/MissResourceModel.java | 54 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 4 ++ .../pojo/platform/bean/SysLocaleResource.java | 9 ++-- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 7 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index af0d7e3..7a4d706 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2133,4 +2133,51 @@ public class BlockFormEnumUtil { } } + + /** + * 操作触发来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FORM_TRIGGER_SOURCE { + INTERCEPTOR(10, "拦截器"), + BUTTON(20, "按钮"); + + private int value; + private String description; + + private FORM_TRIGGER_SOURCE (int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static FORM_TRIGGER_SOURCE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index fff23d9..4316e3d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1483,6 +1483,50 @@ public class CommonEnumUtil { } /** + * 缺失资源来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MiSS_RESOURCE_SOURCE { + WEB(10, "网页端"), + SERVER(20, "服务端"); + + private int value; + private String description; + + private MiSS_RESOURCE_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static MiSS_RESOURCE_SOURCE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** * 属性类型信息(属性转换器) * *
Form 核心转换器 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java new file mode 100644 index 0000000..edd899b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 表单操作数据模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-02 10:22 + * @Modify: + **/ +@Data +@ApiModel("表单操作数据模型") +@NoArgsConstructor +public class FormOperateDataModel { + + @ApiModelProperty("元素代码") + private Long refId; + + @ApiModelProperty("元素名称") + private String refName; + + @ApiModelProperty("操作来源") + @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TRIGGER_SOURCE.class) + private String triggerSource; + + @ApiModelProperty("来源名称") + private String sourceName; + + @ApiModelProperty("操作数据集合") + private List> operateDataList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java new file mode 100644 index 0000000..aa7c6a6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 缺失资源 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-01 09:31 + * @Modify: + **/ +@Data +public class MissResourceModel implements Serializable { + + private static final long serialVersionUID = 677360677490162891L; + + @ApiParam(value = "主键") + @AnnoOutputColumn + private String key; + + @ApiParam(value = "产品类型", example = "0", access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, required = false) + private Integer softType; + + @AnnoOutputColumn(refClass = CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.class) + @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") + private Integer resourceType; + + @ApiParam(value = "语言编码", example = "浏览器语言编码") + @AnnoOutputColumn + private String languageCode; + + @ApiParam(value = "资源KEY") + @AnnoOutputColumn + private String resourceKey; + + @ApiParam(value = "资源Value") + @AnnoOutputColumn + private String resourceValue; + + @ApiParam(value = "数据来源") + @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class) + private Integer resourceSource; + + @ApiParam(value = "数据来源") + @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class) + private Integer isValid; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 3a9268b..f0f7fb2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -1,12 +1,15 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; 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; @@ -43,6 +46,7 @@ public class SysConfig extends BaseBean { // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP @Column(name="CONFIG_GROUP") @ApiParam(value ="参数组") + @AnnoOutputColumn(refClass = ImppEnumUtil.SYS_CONFIG_GROUP.class) private Integer configGroup; // 枚举 ImppEnumUtil.SYS_VALUE_TYPE 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 f8b4f4e..17ac6d6 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 @@ -37,9 +37,6 @@ public class SysLocaleResource extends BaseBean { private Integer resourceType; @Transient - private String resourceTypes; - - @Transient private String resourceTypeTxt; public String getResourceTypeTxt(){ @@ -87,4 +84,10 @@ public class SysLocaleResource extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isSystem; + /** + * 检索条件 + */ + @Transient + private String resourceTypes; + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7891cdb..cc0e5e9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -754,7 +754,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); if (orderNoRule.getSerialNo() != null) { - DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result); + DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); } // 添加默认排序 From 35023af12c9ff54196fdaa859bc9865b89cdc4a8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:02:54 +0800 Subject: [PATCH 085/107] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A?= =?UTF-8?q?=E7=BA=A7=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=87=BA=E6=9D=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 d7b809e..6b6f2b8 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 @@ -3915,6 +3915,15 @@ public class WmsEnumUtil { } return tmp; } + + public static PRINT_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** From a59a5e532e5cfd7fb5cfd6e2f5e344021b34417b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:04:15 +0800 Subject: [PATCH 086/107] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A?= =?UTF-8?q?=E7=BA=A7=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=87=BA=E6=9D=A5=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/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f59761..482c5a1 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 @@ -2590,7 +2590,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result); DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); +// DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); getStringBuilderPack(wmsPrintingQueue, result); From 46e0f502d077e7db9059c7c647a1c880244e510d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:04:47 +0800 Subject: [PATCH 087/107] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A?= =?UTF-8?q?=E7=BA=A7=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=87=BA=E6=9D=A5=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/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 f9e000a..e048183 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 @@ -314,6 +314,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "集装箱号") private String containerNo; + @Transient + @ApiParam(value = "箱数") + private Integer boxQty; + public WmsStockSn() { } From e2894143632ce5187b3aa5f2fb96ff706fefae8e Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Apr 2020 22:23:33 +0800 Subject: [PATCH 088/107] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev --- .../java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java | 10 +++++++++- .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index 809f29c..d97a57a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -18,8 +18,16 @@ public class CellFeedModel { private String partNo; + private String partName; + private String itemPartNo; - private String qty; + private String itemPartName; + + private String shouldQty; + + private String remainQty; + + private String scanQty; } 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 d1e1299..236115b 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 @@ -110,6 +110,9 @@ public class StationRequestBean implements Serializable { @ApiParam("当前流程状态") private MesRouteStatus curRouteStatus; + @ApiParam("展示组件") + private Object moduleService; + @Override public String toString() { return "StationRequestBean{" + From 7244fb38b17b07010bc2a010f6569bb83ab527e5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sun, 5 Apr 2020 23:16:15 +0800 Subject: [PATCH 089/107] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index b55e96d..784a25d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -197,7 +197,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -209,5 +209,6 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; + this.serialNumber=serialNumber; } } From 8c635c355765bdf1967e7def310229fe1bebaa01 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 6 Apr 2020 11:22:48 +0800 Subject: [PATCH 090/107] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 2 ++ 1 file changed, 2 insertions(+) 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 236115b..0a5b42e 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 @@ -113,6 +113,8 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; + @ApiParam("工步序号") + private Integer stepSeq; @Override public String toString() { return "StationRequestBean{" + From ba90a506216f52b7f76bccd4dc8f4be833ec80a7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 6 Apr 2020 11:45:03 +0800 Subject: [PATCH 091/107] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index ea3a703..0b19a64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -26,7 +26,7 @@ import java.io.Serializable; }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) -@Api("包装规格") +@Api("包装表") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; From ba4b45043723b57351f1fd1e258c14f9698a997a Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 6 Apr 2020 13:39:08 +0800 Subject: [PATCH 092/107] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 784a25d..c9781d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -211,4 +211,16 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.serialNumber=serialNumber; } + //料架分组队列展示组件 + public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.orderNo = orderNo; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.organizeCode = organizeCode; + } } From 14bb71f9f2b486bb30f51a64a028d5ef3ed45421 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 6 Apr 2020 17:10:25 +0800 Subject: [PATCH 093/107] =?UTF-8?q?[=E6=96=99=E6=9E=B6=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java index 05670be..dd891d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -30,7 +30,7 @@ public class ActorMessageModel { } public static ActorMessageModel getFailure() { - return new ActorMessageModel(true, null); + return new ActorMessageModel(false, null); } public static ActorMessageModel getSuccess(Object data) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index c9781d7..2d3d15c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -71,6 +71,8 @@ public class QueueOrderModel implements Serializable { @ApiParam("队列编号") private String orderNo; + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; public QueueOrderModel() { } @@ -155,13 +157,14 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; + this.isGroupPrinted = isGroupPrinted; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, From 7062e7a3831b553be259daccbfe393917f49fc9d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 7 Apr 2020 09:20:27 +0800 Subject: [PATCH 094/107] =?UTF-8?q?bug7935=E3=80=907935=20=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=94=B6=E8=B4=A7-=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=89=B9=E6=AC=A1=E6=A0=BC=E5=BC=8F-=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=E7=B3=BB=E7=BB=9F=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=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/WmsTransportRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 5c91192..d34d0e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -44,7 +44,7 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") - //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") public Integer busiSceneType; From 703a3f2195d5279074243dda29427ee4bc9dbd53 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 7 Apr 2020 10:11:11 +0800 Subject: [PATCH 095/107] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=B6=88=E6=81=AF=20=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java index 05670be..dd891d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -30,7 +30,7 @@ public class ActorMessageModel { } public static ActorMessageModel getFailure() { - return new ActorMessageModel(true, null); + return new ActorMessageModel(false, null); } public static ActorMessageModel getSuccess(Object data) { From 763d72b128eb9037a4208a4eddb22743e2f35517 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 7 Apr 2020 10:28:48 +0800 Subject: [PATCH 096/107] =?UTF-8?q?dev=E5=90=88=E5=B9=B6=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9A=84test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 4a97de5..32eefba 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 @@ -70,6 +70,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步代码") private String stepCode; + @ApiParam("工步序号") + private Integer stepSeq; + @ApiParam("强制执行工步代码") private String forceSpecStepCode; @@ -109,7 +112,7 @@ public class StationRequestBean implements Serializable { private String queueGroupNo; @ApiParam("数据map") - private Map dataMap=new HashMap<>(); + private Map dataMap = new HashMap<>(); @ApiParam("流程状态集合") private List fsmStates; From 8a8c3ee34d37512061950abebdb87437d2ccfe91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 7 Apr 2020 13:42:00 +0800 Subject: [PATCH 097/107] =?UTF-8?q?pom=E7=89=88=E6=9C=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index fe8e4eb..4988f31 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f1e9991..4104107 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f54aca..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 65c6554..9be7e80 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0f73e78..53cfea6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 7e73285..44c0526 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 232becd..122cb94 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e65f727..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 552f97e..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index beba8ba..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8f191db..c94172f 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index f0a5b7e..4dd7471 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index d9d461d..c45f09e 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 309d149..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f34bc03..94fb42a 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index f9e982f..cac0256 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index d561047..af52bb4 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/pom.xml b/pom.xml index a7c1de5..1384ee6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 07d8e1221681abf42012ffff0faa5a3f00bc3fe8 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 7 Apr 2020 14:10:28 +0800 Subject: [PATCH 098/107] commit stationrequestbean --- modules/i3plus-pojo-mes/pom.xml | 1 + .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-mes jar + 1.0-DEV-SNAPSHOT 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 3d3c8a0..21d65dd 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 @@ -123,8 +123,6 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; - @ApiParam("工步序号") - private Integer stepSeq; @Override public String toString() { return "StationRequestBean{" + From 17f6ac66095ae9df640728870061ed71a2601ea9 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 7 Apr 2020 14:14:43 +0800 Subject: [PATCH 099/107] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes/pom.xml | 1 + .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-mes jar + 1.0-TEST-SNAPSHOT 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 3d3c8a0..21d65dd 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 @@ -123,8 +123,6 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; - @ApiParam("工步序号") - private Integer stepSeq; @Override public String toString() { return "StationRequestBean{" + From 2bc62e2444f9ac72dcc4014dd632f621740e7273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 7 Apr 2020 14:23:37 +0800 Subject: [PATCH 100/107] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A#=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=20=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7=E5=92=8C=E6=9B=B4=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B9=9F=E9=9C=80=E8=A6=81=E5=81=9A=E6=88=90=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) 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 249411a..a2420d6 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 @@ -82,7 +82,8 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @@ -94,7 +95,8 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") public String modifyUser; @Column(name="MODIFY_DATE_TIME") 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 85ec609..ee4fb0f 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 @@ -177,7 +177,8 @@ public class WmsPart extends BaseBean { @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String outCloseVendor; @Column(name = "QUALITY_DAYS") From 2e85d993805e2f307b12f745ad1c70091fa6086f Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 7 Apr 2020 18:00:17 +0800 Subject: [PATCH 101/107] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 2d3d15c..a624677 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Transient; import java.io.Serializable; @@ -74,6 +75,10 @@ public class QueueOrderModel implements Serializable { @ApiParam("料架是否已打印") private Integer isGroupPrinted; + @Column(name = "PPT_CODE") + @ApiParam("产品类型名称") + private String pptCode; + public QueueOrderModel() { } @@ -183,8 +188,9 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } + //getWaitQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -198,8 +204,9 @@ public class QueueOrderModel implements Serializable { this.finsihQty = finsihQty; this.qty = qty; this.orderNo = orderNo; + this.pptCode=pptCode; } - + //getAlreadyQueueOrderModelNoSn public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; @@ -214,6 +221,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.serialNumber=serialNumber; } + //料架分组队列展示组件 public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { From 3f3d0038e8605199d23a5aa689d421de959f1e18 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 8 Apr 2020 16:18:12 +0800 Subject: [PATCH 102/107] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A160?= =?UTF-8?q?8=20=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 78 ++++++++++++++++++++-- .../estsh/i3plus/pojo/mes/bean/MesDataWarning.java | 63 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 2 +- ...skNotifyUserModel.java => NotifyUserModel.java} | 2 +- .../mes/repository/MesDataWarningRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 29 ++++++++ 6 files changed, 183 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{EquTaskNotifyUserModel.java => NotifyUserModel.java} (96%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java 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 c08db39..3d99d0f 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 @@ -13,6 +13,74 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 排序方式 + */ + public enum ASC_OR_DESC { + ASC(1, "正序"), DESC(2, "倒序"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private ASC_OR_DESC(int value, String description) { + this.value = value; + this.description = 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; + } + } + + /** + * 监听任务明细-采集数据方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_DETAIL_COLLECT_TYPE { + SELF_ADDITION(10, "自增列"), + FEED_FIELD(20, "反馈字段"); + + private int value; + private String description; + + MONITOR_TASK_DETAIL_COLLECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int 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 == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 动作-module */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1812,10 +1880,10 @@ public class MesEnumUtil { } /** - * mes设备作业通知配置-通知方式 + * mes通知配置-通知方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN { + public enum NOTIFY_CFG_PATTERN { EMAIL(10, "邮件"), USERPHONE(20, "手机号"); @@ -1823,7 +1891,7 @@ public class MesEnumUtil { private int value; private String description; - MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) { + NOTIFY_CFG_PATTERN(int value, String description) { this.value = value; this.description = description; } @@ -4164,8 +4232,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"); -// DB(20, "DB"); + PLC(10, "PLC"), + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java new file mode 100644 index 0000000..f422957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java @@ -0,0 +1,63 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2020/04/03 7:12 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_WARNING") +@Api("数据预警配置") +public class MesDataWarning extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8328008752104417017L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "WARNING_RULE") + @ApiParam("预警规则") + private String warningRule; + + @Column(name = "CHECK_TIME") + @ApiParam("校验时间") + private String checkTime; + + @Column(name = "QTY") + @ApiParam("数据量最大限制(分钟)") + private Integer qty; + + @Column(name = "WARNING_ITEM") + @ApiParam("预警内容项") + private String warningItem; + + @Column(name = "INFORM_MODE") + @ApiParam("通知方式") + private Integer informMode; + + @Lob + @Column(name = "INFORM_USER") + @ApiParam("通知对象") + private String informUser; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 13e8069..7fbe7f7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -53,7 +53,7 @@ public class MesPartCheck extends BaseBean implements Serializable { private String recordNumSpelExpress; @Column(name = "RECORD_NUM_DESC") - @ApiParam("校验表达式") + @ApiParam("校验表达式描述") private String recordNumDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java index 49202fa..9a5b3a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java @@ -29,7 +29,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Api("用户信息model") -public class EquTaskNotifyUserModel extends BaseBean { +public class NotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") private Long userInfoId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java new file mode 100644 index 0000000..54da78e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDataWarning; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesDataWarningRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 5d5916a..b408ff1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2175,9 +2175,15 @@ public class MesHqlPack { if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) { DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean); } + if (!StringUtils.isEmpty(monitorTaskDetail.getStoreObjectCode())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getStoreObjectCode(), "storeObjectCode", packBean); + } if (monitorTaskDetail.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean); } + if (monitorTaskDetail.getCollectType() != null) { + DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getCollectType(), "collectType", packBean); + } return packBean; } @@ -2283,4 +2289,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 数据预警配置 + * @param dataWarning + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode); + if(!StringUtils.isEmpty(dataWarning.getObjectCode())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getWarningRule())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getWarningItem())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getInformMode())){ + DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean); + } + return packBean; + } } From e0a23b147e74e9e601ef78f5a122be17e1e4e9d7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 8 Apr 2020 17:01:18 +0800 Subject: [PATCH 103/107] mes enum --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 3d99d0f..8e46651 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 @@ -1885,8 +1885,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum NOTIFY_CFG_PATTERN { - EMAIL(10, "邮件"), - USERPHONE(20, "手机号"); + EMAIL(10, "邮件"); +// USERPHONE(20, "手机号"); private int value; private String description; From 5a6c525d1f2ec8ac8653288514ff7c16c5a7bae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 8 Apr 2020 17:56:21 +0800 Subject: [PATCH 104/107] =?UTF-8?q?=E3=80=90MES=5F=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B=E5=A2=9E=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E5=88=86=E7=A7=92=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 1454dca..28b8235 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -43,6 +43,15 @@ public class GenSerialNoModel { @ApiParam("日") private String day; + @ApiParam("时") + private String hour; + + @ApiParam("分") + private String minute; + + @ApiParam("秒") + private String second; + @ApiParam("过程条码") private String serialNumber; From 288fb4a16ba0552977a14ff65ddc0ec14e395091 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 8 Apr 2020 19:59:06 +0800 Subject: [PATCH 105/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9POM=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..577686d 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..f714b7d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..b7991cc 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..3b9e57a 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..56d54cb 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..c7bebed 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..fb51da0 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..78bbdef 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..fb44d00 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..dc4ea86 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..8571a5f 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..e36258d 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..9915420 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..61027b2 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ba34538..c2f1247 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 4dee474c738fe8a34d0f41766a4bd49ba75e4437 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 8 Apr 2020 20:30:11 +0800 Subject: [PATCH 106/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9POM=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ff1cd2d..c6f0ba4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From b7e3aeef41e2dc115e4a62f35e3205cfaaf7cb48 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 8 Apr 2020 21:53:04 +0800 Subject: [PATCH 107/107] =?UTF-8?q?=E3=80=908014=2020011--=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E8=AE=B0=E5=BD=95=E8=A1=A8=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D---0415=E3=80=91=20?= =?UTF-8?q?=E3=80=908015=2020011--=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=A4=E5=88=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=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/WmsStockSn.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 e048183..647c116 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 @@ -318,6 +318,14 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "箱数") private Integer boxQty; + @Transient + @ApiParam(value = "是否报工") + private String isReport; + + @Transient + @ApiParam(value = "是否需要报工") + private Integer isReportPartNo; + public WmsStockSn() { }