From e7196c3f7fc4ed5dc1c9d2ce6fffb1c3c54b1153 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 21 Sep 2020 09:32:53 +0800 Subject: [PATCH 01/51] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=2010923=20108?= =?UTF-8?q?94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java index ba1090a..2d1e39c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java @@ -43,5 +43,13 @@ public class MesWorkCellStatus extends BaseBean implements Serializable { @ApiParam("超时状态") private Integer timeOutStatus; + @Column(name = "DELAY_HELP_STATUS") + @ApiParam("延迟帮助状态") + private Integer delayHelpStatus; + + @Column(name = "EMERGENCY_STOP_STATUS") + @ApiParam("紧急停止状态") + private Integer emergencyStopStatus; + } From bc383d573b183c6e69afff4c124104f096f1a3d5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 22 Sep 2020 09:36:22 +0800 Subject: [PATCH 02/51] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=AE=8A=E6=A0=87=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 +-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 49 ++++++++++++++++++++- .../main/java/cn/estsh/i3plus/pojo/mes/.DS_Store | Bin 8196 -> 0 bytes .../i3plus/pojo/mes/bean/IfQueueShipping.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 8 ++++ .../pojo/mes/bean/MesWorkCellPointGroup.java | 8 ++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 14 ++++-- 7 files changed, 81 insertions(+), 8 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store 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 769dc34..17e9493 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 @@ -4526,7 +4526,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), - EMPTYING(20, "放空"); + EMPTYING(20, "放空"), + ERR_PERCH(30, "异常占位"); private int value; private String description; @@ -6659,8 +6660,7 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_SIDE { POSITIVE(10, "A", "正面"), - REVERSE_SIDE(20, "B", "背面"), - SPECIAL_SIDE(30, "C", "特殊件"); + REVERSE_SIDE(20, "B", "背面"); private Integer value; private String code; 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 9fe3ede..63ea616 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 @@ -2165,6 +2165,16 @@ public class MesPcnEnumUtil { 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; + } } /** @@ -5381,8 +5391,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_SIDE { POSITIVE(10, "A", "正面"), - REVERSE_SIDE(20, "B", "背面"), - SPECIAL_SIDE(30, "C", "特殊件"); + REVERSE_SIDE(20, "B", "背面"); private Integer value; private String code; @@ -5467,4 +5476,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + NORMAL(10, "正常"), + EMPTYING(20, "放空"), + ERR_PERCH(30, "异常占位"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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/.DS_Store b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store deleted file mode 100644 index cc05df3a1b6d4ff9f06fe9c784d439d6dd3e4565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIZ9G~A&V3)3Riy#HNaB?6;0c(r47{KcXRcJ{o*V6J~kG+k5V>F^hiEje>DEMI12bCrYi4W=n>VrO@i6qAOpPjwZT96lGPa`8_viTYgYm`y~?7%BIhlDao_Sn_j)ZO*w<}38*Q^_I-OpJ9+=)vZrtsDF;95B5#5~tW2({YaCgb z9Byc+rF#8?BO|gTEm+>RwZCxq=d4&U{HmM~aWRSUkk)udQf z(QKuNexF4{az_>NsoC=vFRfWs*RU?VajZhEoO8P}PuW3GJAt*wGQI7(pEn)Da`yHN z@weAow0tXPo868+V9J$PDUVfDEm(MGwWbM!YYrvTzCzC0U$BCMYD$vAF_PL6WtTyZ zvc)y{D2Ak-rZ_bEGHr>rlWST$lS(6USfSmkbo=zglBx^C)k>|>{UlLAR(;V^uRNgj z*m};iWz`VlG%62iy+whxthS5J^~yZ0FYgWv&=h@H^fhTMT0bAQL-&KuLDS)n^daeJ zYHdq2Z9CUB83unK;?~K}Lq4R^HG&tZ5b~BF+vm@*nJH_5% zXV_VGo_)f;U|+M#>?ig!U55S2t|9>mbFdI8EW_Pcj#{k82Bgu1&De%s^g+iS?1hCV z;Nt)eVii?$w=UN&&JGDacitWIlgsY8Z_U~b z&ErJ))7ziO!H{@@Ss~*}j0#`&BpQ!}D?wSbxJ3PHi$N@o9wMxHK;r90ohhuVQ%fb{ znkq%jnibSMttP^zQoU-mOq^GzMWO5JC1STaU1*htMw$4pmPOii>q*>KtYyTY!r-!TK_sKQ-XfqJaP!y#Q;(S}ZR;W1>;gMMVO8#x#l zfCCr%iM)p}f~PTx!y$Q(5P4s~ah$-5c!@~-Cf>rSaT33WbNHAjd=Zx-YL+P5F`2UX zb|Phq8PBm@XD{`Y>?fPYt(ze*O&C=1tzzSi@BeQWCf3IY#0dP05kOgMrnQ+SaHEZs zpS6>ecT?tx+l>ktx==CcB7oZCe;86dNv7N<9m!E4sfW@(ei2|A@%R6)e!9lr|B#pe G_2Lh!2}*ka 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 index fbe8994..c9b462d 100644 --- 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 @@ -146,4 +146,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "VERSION") @ApiParam("版本号") private String version; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 5d1f42f..88771e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -112,6 +112,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("等级代码") private String gradeCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; + @Transient @ApiParam("起始车号") private String custFlagNoStart; 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 index 719ae64..b539f74 100644 --- 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 @@ -91,6 +91,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCategoryCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Transient + @ApiParam("状态") + private String statusName; + public double getQueueSeqVal() { return this.queueSeq == null ? 0 : this.queueSeq; } 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 5268375..70b769e 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 @@ -113,6 +113,8 @@ public class QueueOrderModel implements Serializable { @ApiParam("是否放空") private Integer isEmpty; + @ApiParam("特殊标识") + private Integer specialFlag; public QueueOrderModel() { } @@ -199,7 +201,8 @@ public class QueueOrderModel implements Serializable { // getPrintSnQueueOrderModel public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, - String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) { + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, + String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -216,6 +219,8 @@ public class QueueOrderModel implements Serializable { this.groupSeq = groupSeq; this.serialNumber = serialNumber; this.custProdLineCode = custProdLineCode; + this.specialFlag = specialFlag; + this.workType = workType; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -259,7 +264,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSnMgn 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 pptCode, String produceCategoryCode, String prodCfgTypeCode, - String vinCode, String formulaContent, String queueGroupNo) { + String vinCode, String formulaContent, String queueGroupNo, String jitSeq) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -279,11 +284,13 @@ public class QueueOrderModel implements Serializable { this.vinCode = vinCode; this.formulaContent = formulaContent; this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; } //getAlreadyQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) { + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, + String queueGroupNo, String produceCategoryCode, String jitSeq) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -300,6 +307,7 @@ public class QueueOrderModel implements Serializable { this.formulaContent = formulaContent; this.queueGroupNo = queueGroupNo; this.produceCategoryCode = produceCategoryCode; + this.jitSeq = jitSeq; } //getAlreadyQueueOrderModelNoSn From 2f953ac22344252c696b95994c400b19f5d3dae5 Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 22 Sep 2020 11:57:19 +0800 Subject: [PATCH 03/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=AD=E8=88=AADB=E5=A4=8D=E6=A0=B8=E9=A1=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=82=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 2 +- .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index f25605d..fd18f12 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -45,7 +45,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 @Column(name = "DB_CHECK_ITEM") @ApiParam("DB复核项") - private String dbReview; + private String dbCheckItem; @Column(name = "ERROR_FILED_CODE") @ApiParam("异常取值字段") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index a364f73..46b468c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -341,6 +341,29 @@ public class MesPcnHqlPack { return packBean; } + public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getDbCheckItem())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getDbCheckItem(), "dbCheckItem", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getErrorFiledCode())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) { + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getStatus())) { + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean); + } + return packBean; + } + /** * 按条件分页查询产品条码补打印数据 * From 053b609d88d542b613b1cc8cfa4ebac3d4434faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 22 Sep 2020 14:02:54 +0800 Subject: [PATCH 04/51] =?UTF-8?q?=E3=80=9011559=2019081-MESOP30=E6=96=99?= =?UTF-8?q?=E7=AE=B1=E4=BA=8C=E6=AC=A1=E6=A0=A1=E9=AA=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=A7=A6=E5=8F=9120200922=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 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 17e9493..56a6580 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 @@ -69,16 +69,21 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { - MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(20, "展示组件"), - BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"); + MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"), + REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"), + BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"), + TIMING_MODULE(40, "TIMING_MODULE", "定时组件"), + PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"), + ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件"); private int value; + private String data; private String description; - WORK_MODULE_TYPE(int value, String description) { + WORK_MODULE_TYPE(int value, String data, String description) { this.value = value; + this.data = data; this.description = description; } @@ -86,6 +91,10 @@ public class MesEnumUtil { return value; } + public String getData() { + return data; + } + public String getDescription() { return description; } @@ -708,7 +717,8 @@ public class MesEnumUtil { EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), - BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"); + BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"), + WO_TYPE("WO_TYPE", "客户JIT队列工单类型"); private String value; private String description; @@ -4779,7 +4789,8 @@ public class MesEnumUtil { public enum WORK_CELL_MONITOR_TYPE { MONITOR(10, "监听组件"), SHOW(20, "展示组件"), - BUTTON(30, "按钮组件"); + BUTTON(30, "按钮组件"), + PROCESS_MONITOR(40, "工序监听组件"); private int value; private String description; From d0502744508758f3bf8c894e221b07641bade31d Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 22 Sep 2020 16:04:22 +0800 Subject: [PATCH 05/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesProductDataModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java new file mode 100644 index 0000000..ce492d7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @CreateDate: 2020/9/22 + * @Author: simon.song + */ +@Data +public class MesProductDataModel { + @ApiParam("生产数据表主键ID") + private String id; + + @ApiParam("工位代码") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam("产品包装model") + private List productDataModelList; + +} From 696695ef0e8de74c9d4aff103e4d3f79dd916e89 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 22 Sep 2020 17:12:32 +0800 Subject: [PATCH 06/51] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=2010923=2010894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 20 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java | 5 +++++ 2 files changed, 25 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 c076230..8788520 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 @@ -5427,4 +5427,24 @@ public class MesPcnEnumUtil { } } + /** + * 过程检测检测检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_MONITOR_OBJECT_TYPE { + ORGANIZE("10"), + WORK_SHOP("20"), + WORK_CENTER("30"); + + private String value; + + BOARD_MONITOR_OBJECT_TYPE(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java index 7077a43..aa78191 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.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; /** @@ -45,4 +46,8 @@ public class MesBoardDisplay extends BaseBean implements Serializable { @Column(name = "ROLL_SPEED") @ApiParam("滚动速度") private Integer rollSpeed; + + @Transient + @ApiParam("跑马灯字体颜色") + private String fontColor; } From 3d259fe565b73b393e91151e35aa33e26a2d36d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=8F=8C=E5=8F=8C?= Date: Tue, 22 Sep 2020 17:14:58 +0800 Subject: [PATCH 07/51] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'.DS=5FStore'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Tue, 22 Sep 2020 17:19:49 +0800 Subject: [PATCH 08/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=8E=89.DS=5FStore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e1e35d5..b86a41d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ target *.class .md *.log -*.properties \ No newline at end of file +*.properties +.DS_Store \ No newline at end of file From fc351f559916fbdb611c652aef7be806d8a92ada Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 22 Sep 2020 17:37:14 +0800 Subject: [PATCH 09/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= 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 9f24499..8f75c78 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 @@ -1375,7 +1375,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { - DdlPreparedPack.getNumberBiggerPack(0, "qty", result); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "qty", result); } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); From 612c919e5fb56a4e186c3f0a122df1429fff51c6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 22 Sep 2020 21:23:33 +0800 Subject: [PATCH 10/51] =?UTF-8?q?bypass=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 48 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 8 ++++ 2 files changed, 56 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 63ea616..5043169 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 @@ -5512,4 +5512,52 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY_NAME { + + FL("FL", "前右"), + FR("FR", "前左"), + RL("RL", "后左"), + RR("RR", "后右"); + + private String description; + private String value; + + PRODUCE_CATEGORY_NAME(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + 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].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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 e438425..926b291 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 @@ -170,4 +170,12 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "零件号") public String partNo; + @Transient + @ApiParam(value = "客户零件号") + public String custPartNo; + + @Transient + @ApiParam(value = "qty") + public Integer qty; + } From e9ce24d6f9eee61e7947f0100aaca2962de951df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 23 Sep 2020 14:16:08 +0800 Subject: [PATCH 11/51] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8F=98=E6=9B=B4-20200813=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/MesDefectRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 9c5f0e9..26ca667 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -95,6 +95,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("后移数量") private Integer backwardNum; + @Transient + @ApiParam("质量状态") + private Integer qcStatus; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } From 3c1c6c8c55ea19ffceecf611232767ebbccd9155 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 23 Sep 2020 14:39:44 +0800 Subject: [PATCH 12/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=20password?= 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, 3 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 f759312..d46f990 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 @@ -192,6 +192,9 @@ public class StationRequestBean implements Serializable { @ApiParam("创建时间") private String packageNo; + @ApiParam("密码") + private String password; + @Override public String toString() { return "StationRequestBean{" + From 11750e9bf1184c01a7b75b5564cff06834d63d92 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 23 Sep 2020 17:34:02 +0800 Subject: [PATCH 13/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E7=9A=84pojo=EF=BC=8C=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=8A=9F=E8=83=BD=E5=8F=AF=E4=BB=A5=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/snapshot/SnapshotBean.java | 153 +++++++++++++++++++++ .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 34 ++++- .../wms/bean/snapshot/WmsMoveMasterSnapshot.java | 4 +- .../pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 8 +- .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 3 +- .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 3 +- 6 files changed, 185 insertions(+), 20 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java new file mode 100644 index 0000000..8a1e6b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java @@ -0,0 +1,153 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +@Data +@MappedSuperclass +public class SnapshotBean implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GenericGenerator(name = "generator", strategy = "increment") + @GeneratedValue(generator = "generator") + @Column(name = "snap_id") + private Long snapId; + + //此处使用hibernate的主键策略方式 + //手动设置,使用iplus-platform-common中的idtool生成 + //将Long类型系列化成String避免精度丢失 + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="ORGANIZE_CODE", nullable = false) + @ApiParam(value ="组织代码") +// @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "有效性",example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + public Integer isValid; //CommonEnumUtil.IS_VAILD; + + @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否已删除",example = "2") + @AnnoOutputColumn(hidden = true) + //逻辑删除，软删除 + public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA + + @Column(name="CREATE_USER",updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name="CREATE_DATE_TIME",updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name="MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name="MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @AnnoOutputColumn(hidden = true) + //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid.intValue(); + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + } + + //排序方式 + public String orderBy(){ + String result = ""; + if (orderByParam!=null&&orderByParam.trim().length()>0) { + result = " order by " + orderByParam; + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + }else{ + result += " desc"; + } + } + return result; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 29477e4..f830b47 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -32,7 +33,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单明细信息") -public class WmsMoveDetailsSnapshot extends BaseBean { +public class WmsMoveDetailsSnapshot extends SnapshotBean { private static final long serialVersionUID = -4095410692227226944L; @@ -141,6 +142,31 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @Transient private Long finishedCounts; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer consignation = 2; + + @Column(name = "GROUP_NO") + @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String groupNo; + + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "已处理数量", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Double handledQty; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient @ApiParam("交易类型") private String transTypeCode; @@ -182,10 +208,6 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("创建时间") private String createDateTime; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java index 7679f39..bf4419e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -31,7 +30,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单主表信息") -public class WmsMoveMasterSnapshot extends BaseBean { +public class WmsMoveMasterSnapshot extends SnapshotBean { private static final long serialVersionUID = 3569874772643448726L; @@ -150,7 +149,6 @@ public class WmsMoveMasterSnapshot extends BaseBean { @ApiParam(value = "设备编号") public String fixId; - @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 453d372..79bb4c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -33,7 +32,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单条码信息") -public class WmsMoveSnSnapshot extends BaseBean { +public class WmsMoveSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 2588101374261238353L; @@ -189,11 +188,6 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; - public WmsMoveSnSnapshot() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index 724a81d..c927e7d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -33,7 +32,7 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "库存信息", description = "库存信息") -public class WmsStockQuanSnapshot extends BaseBean { +public class WmsStockQuanSnapshot extends SnapshotBean { private static final long serialVersionUID = 8335719859185712904L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 8d15ecc..62a730f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -45,7 +44,7 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "库存条码信息", description = "库存条码信息") -public class WmsStockSnSnapshot extends BaseBean { +public class WmsStockSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 8641922373097608315L; From ba6470baad6c7e3b901001e0d03b471f6f38eba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 23 Sep 2020 17:41:07 +0800 Subject: [PATCH 14/51] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=BB=84=E6=89=98=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=89=98=E5=8C=85=E8=A7=84=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index eb0072f..9e6b793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -128,6 +128,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; + @Column(name = "QTY2") + @ApiParam(value = "二级包装数量") + private Double qty2; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; From 4bfb903e5417ea37c510d25c8004e7d439edefb1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Sep 2020 19:07:17 +0800 Subject: [PATCH 15/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E9=82=A3=E5=8F=91=E8=BF=90=E6=8F=90=E4=BA=A4=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E9=87=8D=E5=A4=8D&=E7=9B=98=E7=82=B9=E6=8F=90=E4=BA=A4sql?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 4ce5d3c..a805f86 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -39,4 +39,7 @@ public class WmsStockFifoModel { @ApiParam("默认规则") private String defaultRule; + + @ApiParam("同批次") + private boolean fifoSameBatch; } 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 8f75c78..3e5609b 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 @@ -1375,7 +1375,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "qty", result); + DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result); } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); From 979e18c4a7bd6ab82d0f8fff24e01cb354c10b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 24 Sep 2020 09:08:11 +0800 Subject: [PATCH 16/51] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 9e6b793..b7bcc1c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -129,7 +129,7 @@ public class MesPart extends BaseBean implements Serializable { private Integer isSmallSize = 1; @Column(name = "QTY2") - @ApiParam(value = "二级包装数量") + @ApiParam(value = "包装数量") private Double qty2; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 469a7e1..8ded48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -44,6 +44,9 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("不良处理类型") private String defectType; + @ApiParam("反喷标识") + private String reverseSprayMark; + @ApiParam("列名") private List> headModelList; From 9fb8962e4e991e710e91af826aef7e082cf101bc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 24 Sep 2020 09:15:41 +0800 Subject: [PATCH 17/51] =?UTF-8?q?=E5=AE=A2=E9=80=80=E4=BB=B6bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) 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 926b291..5ecb56c 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 @@ -178,4 +178,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "qty") public Integer qty; + @Transient + @ApiParam("工单类型") + private String woTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 4cee1fd..64e9e70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -36,6 +36,9 @@ public class QueueJitActualModel { public String workTypeName; @ApiParam("客户产线代码") + private String custPlantCode; + + @ApiParam("客户产线代码") private String custProdLineCode; @ApiParam("产品位置代码") @@ -73,13 +76,13 @@ public class QueueJitActualModel { } - public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode, + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode, String productSn, Integer detailStatus, String createUser, String createDatetime) { this.id = id; this.vinCode = vinCode; this.jisActualNo = jisActualNo; this.workType = workType; - this.custProdLineCode = custProdLineCode; + this.custPlantCode = custPlantCode; this.produceCtgyCode = produceCtgyCode; this.productSn = productSn; this.detailStatus = detailStatus; @@ -94,6 +97,7 @@ public class QueueJitActualModel { this.jisActualNo = jisActualNo; this.partNo = partNo; this.partName = partName; + this.produceCtgyCode = produceCtgyCode; this.qty = qty; this.createUser = createUser; this.createDatetime = createDatetime; From 2d2ff0ddb171597bc3667d3928afad685674f237 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 24 Sep 2020 09:40:30 +0800 Subject: [PATCH 18/51] =?UTF-8?q?=E3=80=902801=20=E6=AD=A6=E6=B1=89PRD-AMP?= =?UTF-8?q?-WMS2SAP=E5=9B=9E=E4=BC=A0TWD=E8=AE=A2=E5=8D=95=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3=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/WmsMoveToERP.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1e55325..733c9d0 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 @@ -236,6 +236,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "IS_SYNC2") + @ApiParam("同步标识2") + public Integer isSync2 = CommonEnumUtil.FALSE; + @Transient private Long shippingId; From 708985be2ad9e9369e21aac584675429bd8f0f78 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 24 Sep 2020 14:22:58 +0800 Subject: [PATCH 19/51] =?UTF-8?q?=E4=B8=AD=E8=88=AA=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=A5=E8=AD=A6=20#1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 18 ++++++++ .../pojo/mes/pcn/bean/MesEquAlarmRecord.java | 53 ++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.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 025fe04..b8719b6 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 @@ -4791,6 +4791,24 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_TYPE { + STANDARD(10, "标准"), + EQU_WORKING_SIGNAL(20, "设备作业信号"); + + private int value; + private String description; + + PLC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } + /** * mes设备状态 */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java new file mode 100644 index 0000000..25fe6ee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/23 18:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_ALARM_RECORD", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("设备自动报警记录表") +public class MesEquAlarmRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1675134362612851879L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警等级") + private Integer alarmLevel; + + @Column(name = "ALARM_START_TIME") + @ApiParam("报警开始时间") + private String alarmStartTime; + + @Column(name = "ALARM_STOP_TIME") + @ApiParam("报警开始时间") + private String alarmStopTime; +} From b376450d4b1c5ef37439b7f1de7fbabcef5dc933 Mon Sep 17 00:00:00 2001 From: songss Date: Thu, 24 Sep 2020 14:55:35 +0800 Subject: [PATCH 20/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=BC=82=E5=B8=B8=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 2 +- .../pojo/mes/model/MesDbCheckRecordModel.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index fd18f12..5a8223f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -57,7 +57,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { @Column(name = "PRODUCT_DATA_ID") @ApiParam("生产记录表主键ID") - private String productDataId; + private Long productDataId; //是否停线：1=是，2=否 @Column(name = "IS_STOP_LINE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java new file mode 100644 index 0000000..2b5b50c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesDbCheckRecordModel { + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partDesc; + + @ApiParam("异常取值字段") + private String errorFiledCode; + + @ApiParam("异常描述") + private String errorDesc; + + public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) { + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partDesc = partDesc; + this.errorFiledCode = errorFiledCode; + this.errorDesc = errorDesc; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 46b468c..3e7316f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -353,7 +353,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) { - DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) { DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean); From b8e34a34b5c49f370c6d87b1270c3a4056923a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 14:59:56 +0800 Subject: [PATCH 21/51] =?UTF-8?q?=E3=80=9011561=2019081-=E5=AE=89=E7=81=AF?= =?UTF-8?q?pushPLC=E6=8E=A7=E5=88=B6=E4=B8=89=E8=89=B2=E7=81=AF-=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=9C=AA=E6=8E=A7=E5=88=B6=E5=85=B7=E4=BD=93=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D-20200924=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonPlcColorCfg.java | 54 ++++++++++++++++++++++ .../repository/IAndonPlcColorCfgRepository.java | 17 +++++++ 2 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java new file mode 100644 index 0000000..5893a1d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.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 : siliter + * @CreateDate : 2019-03-07 09:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_PLC_COLOR_CFG") +@Api(value="PLC三色灯控制") +public class AndonPlcColorCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3284234821448131212L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name="RED_PLC_CODE") + @ApiParam(value ="红灯PLC代码") + private String redPlcCode; + + @Column(name="YELLOW_PLC_CODE") + @ApiParam(value ="黄灯PLC代码") + private String yellowPlcCode; + + @Column(name="GREEN_PLC_CODE") + @ApiParam(value ="绿灯PLC代码") + private String greenPlcCode; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java new file mode 100644 index 0000000..1de89d8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonPlcColorCfgRepository extends BaseRepository { +} From 373e5026c5b8ca5913e2c3dffd2c2fc66d96596d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 15:21:39 +0800 Subject: [PATCH 22/51] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8F=98=E6=9B=B4-20200813=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/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b7bcc1c..f26050e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -155,4 +155,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("拉动数量") private Double pullQty; + + @Transient + @ApiParam("BOM用量") + private Double bomQty = 0d; } From 0f1f437a9e9b73d6645d90c70611f96f34fa03b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 16:25:26 +0800 Subject: [PATCH 23/51] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8F=98=E6=9B=B4-20200813=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/MesRepairRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index d717a56..8ddba7c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -100,4 +100,8 @@ public class MesRepairRecord extends BaseBean implements Serializable { @Transient @ApiParam("缺陷集合") private List mesDefectList; + + @Transient + @ApiParam("质量状态") + private Integer qcStatus; } From d7edc3a309517b45c6d492330da672ef7ba65a2b Mon Sep 17 00:00:00 2001 From: songss Date: Thu, 24 Sep 2020 17:27:43 +0800 Subject: [PATCH 24/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E8=AE=B0=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesProductDataDefectModel.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java new file mode 100644 index 0000000..6af729e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesProductDataDefectModel { + + @ApiParam("生产工单") + private String orderNo; + + @ApiParam("产品编码") + private String partNo; + + @ApiParam("产品名称") + private String partDesc; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("缺陷类型") + private String errorFiledCode; + + @ApiParam("缺陷原因") + private String errorDesc; + + @ApiParam("下线时间") + private String offlineTime; + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String errorFiledCode, String errorDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.errorFiledCode = errorFiledCode; + this.errorDesc = errorDesc; + this.offlineTime = offlineTime; + } +} From 4bd47e64c31121d8da4de788dddfee3760a08fc8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 24 Sep 2020 20:03:25 +0800 Subject: [PATCH 25/51] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84-=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=8D=E7=A7=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 9dfdc8c..27e1ab2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -173,4 +173,8 @@ public class WmsInterfaceDataMapper extends BaseBean { @ColumnDefault("10") @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false) public Integer softDataType; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + public String interfaceName; } 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 3e5609b..6c0f1d4 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 @@ -2543,6 +2543,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getInterfaceName(), "interfaceName", result); getStringBuilderPack(wmsInterfaceDataMapper, result); From 604c1443cadf32d9a67589e07bd76ca9533c4930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Sep 2020 09:41:15 +0800 Subject: [PATCH 26/51] =?UTF-8?q?=E3=80=90=E4=B8=89=E8=89=B2=E7=81=AF?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=BF=A1=E6=81=AF=E5=9F=BA=E7=A1=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 05520d5..9038150 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -1100,4 +1100,17 @@ public class AndonHqlPack { DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean); return packBean; } + + /** + * 安灯 PLC三色灯控制信息查询条件封装 + * @param andonPlcColorCfg + * @return + */ + public static DdlPackBean getAndonPlcColorCfg(AndonPlcColorCfg andonPlcColorCfg) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(andonPlcColorCfg, result); + return result; + } } From 605b7e846a2af31071c29eb47ead7e7e27a2ca7f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Fri, 25 Sep 2020 10:17:44 +0800 Subject: [PATCH 27/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=99=9A=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index b1643f2..af6faf9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -19,6 +19,7 @@ import javax.persistence.Table; * @Author dragon * @CreateDate 2019/6/19 21:23 * @Modify + * 2020-09-24 18:58 Rock.Yu 增加 Category 属性，Magna 的 BOM 是多层结构，需要靠这个字段标记是否虚阶 */ @Data @Entity @@ -82,4 +83,11 @@ public class WmsBomTotal extends BaseBean { @Column(name = "SID") @ApiParam(value = "SID") private String sid; + + /** + * SAP Category == 5 表示零件是虚阶 + */ + @Column(name = "CATEGORY") + @ApiParam(value = "是否虚阶物料") + private String category; } From 0f46a23c7af8cb64bacfff45c2f2076ae285b617 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 25 Sep 2020 11:07:03 +0800 Subject: [PATCH 28/51] =?UTF-8?q?Fix=20bug#11611=2019081-=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93-=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=90=8E=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index df92d67..fc8dbdb 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 @@ -865,7 +865,8 @@ public class WmsEnumUtil { OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"), OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"), WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), - WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"); + WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), + OTHER_IN(730, "OTHER_IN", "其它入库"); private int value; private String code; From 8c633f0bc33de2b31e270ee60382f5a45f733e79 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 25 Sep 2020 11:22:07 +0800 Subject: [PATCH 29/51] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesDbCheckRecordModel.java | 18 +++++++++--------- .../pojo/mes/model/MesProductDataDefectModel.java | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java index 2b5b50c..1fa374a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -13,23 +13,23 @@ public class MesDbCheckRecordModel { @ApiParam("过程条码") private String serialNumber; - @ApiParam("物料号") + @ApiParam("零件号") private String partNo; - @ApiParam("物料名称") + @ApiParam("零件名称") private String partDesc; - @ApiParam("异常取值字段") - private String errorFiledCode; + @ApiParam("缺陷类型") + private String defectType; - @ApiParam("异常描述") - private String errorDesc; + @ApiParam("缺陷原因") + private String defectDesc; - public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) { + public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String defectType, String defectDesc) { this.serialNumber = serialNumber; this.partNo = partNo; this.partDesc = partDesc; - this.errorFiledCode = errorFiledCode; - this.errorDesc = errorDesc; + this.defectType = defectType; + this.defectDesc = defectDesc; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java index 6af729e..fec884f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -24,21 +24,21 @@ public class MesProductDataDefectModel { private String productSn; @ApiParam("缺陷类型") - private String errorFiledCode; + private String defectType; @ApiParam("缺陷原因") - private String errorDesc; + private String defectDesc; @ApiParam("下线时间") private String offlineTime; - public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String errorFiledCode, String errorDesc, String offlineTime) { + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectType, String defectDesc, String offlineTime) { this.orderNo = orderNo; this.partNo = partNo; this.partDesc = partDesc; this.productSn = productSn; - this.errorFiledCode = errorFiledCode; - this.errorDesc = errorDesc; + this.defectType = defectType; + this.defectDesc = defectDesc; this.offlineTime = offlineTime; } } From d9d7e47ca7f7697e934852229af09c42e91c43e6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 25 Sep 2020 11:53:06 +0800 Subject: [PATCH 30/51] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95=E4=BF=AE?= =?UTF-8?q?=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/bean/MesQueueOrderDetail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 3e94f7b..dff8934 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -26,7 +26,7 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"}) }) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { @@ -64,7 +64,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("生产类型") private String workType; - @Column(name = "PRODUCE_CATEGORY_CODE") + @Column(name = "PRODUCE_CATEGORY_CODE", nullable = false) @ApiParam("产品位置") private String produceCategoryCode; From a939c689f3b58982da44438fc3032d48558241d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 25 Sep 2020 16:11:54 +0800 Subject: [PATCH 31/51] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2814?= 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 | 1 + 1 file changed, 1 insertion(+) 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 6c0f1d4..e686c57 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 @@ -1594,6 +1594,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsScriptModule(), "isScriptModule", result); return result; } From d5486603541040736c70b5f5dcc9561684c114c6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Sep 2020 14:02:21 +0800 Subject: [PATCH 32/51] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 3 --- 1 file changed, 3 deletions(-) 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 db1831e..08e820a 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 @@ -102,7 +102,4 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { // @ApiParam("状态执行情况") // private StepResult stepResult; - @Transient - @ApiParam("是否执行下个扫描信息") - private boolean execNextScan = false; } From 14d2af59d68bdc4442781e3ce385379bd7a5c61f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 26 Sep 2020 15:34:21 +0800 Subject: [PATCH 33/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=BA=A7BOM?= =?UTF-8?q?=E7=94=9F=E6=95=88=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/WmsBomTotal.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index af6faf9..c276781 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -30,6 +30,11 @@ import javax.persistence.Table; @Api("全量BOM") public class WmsBomTotal extends BaseBean { private static final long serialVersionUID = 8196235268344152723L; + /** + * 麦格纳 SAP 中表示虚阶BOM的代码 + */ + public static final String MGANA_BOM_HAS_CHILD = "5"; + @Column(name = "PART_NO") @ApiParam("父物料号") private String partNo; @@ -90,4 +95,12 @@ public class WmsBomTotal extends BaseBean { @Column(name = "CATEGORY") @ApiParam(value = "是否虚阶物料") private String category; + + /** + * 是否包含子阶 + * @return + */ + public boolean hasChild() { + return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD); + } } From 85feb7927a7c8bfbc078f65ba355b58a04eb0a89 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 26 Sep 2020 15:50:32 +0800 Subject: [PATCH 34/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 4505d1a..c55e93f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1524,7 +1524,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + StringBuffer sb = new StringBuffer("select max(CAST(model." + sumPropertyName + " as integer)) from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); if(StringUtils.isNotBlank(groupByName)){ sb.append(" group by model." + groupByName); From f2177fdc1ea1f5e39f2635bbfe158bc7c91c00a8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 26 Sep 2020 17:32:47 +0800 Subject: [PATCH 35/51] =?UTF-8?q?bypass=E6=95=B0=E6=8D=AE=E9=87=87?= =?UTF-8?q?=E9=9B=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java index 935cbde..b7c05dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -35,4 +35,7 @@ public class BypassModel { @ApiParam("状态") private String status; + @ApiParam("颜色") + private String color; + } From f591139bed01ebb7571d8992eaaa3ca81b335908 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 26 Sep 2020 19:57:48 +0800 Subject: [PATCH 36/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= 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 556316e..82d05f2 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 @@ -115,7 +115,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; From 171f39cf01ddd87d72a650b2bf471943ae7a7a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 27 Sep 2020 13:31:52 +0800 Subject: [PATCH 37/51] =?UTF-8?q?revert:=E8=BF=98=E5=8E=9Fpojo=20pom.xml?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= 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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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 +- 21 files changed, 21 insertions(+), 21 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1e17935..d2521de 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 37b8a51..b599490 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 dc13374..9f5788e 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/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 fdcf6e3..04b40d4 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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 aa3dd42..102ab0e 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 80498fc..864c56a 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 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 f06d17f..cc6131f 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 65ea61fd706dc15fbaaece8569f7963dde13f41a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 27 Sep 2020 20:50:23 +0800 Subject: [PATCH 38/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=86=E6=B3=B0?= =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=87=BA=E5=BA=93=E4=B8=9A=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index fc8dbdb..b28e142 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 @@ -866,7 +866,8 @@ public class WmsEnumUtil { OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"), WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), - OTHER_IN(730, "OTHER_IN", "其它入库"); + OTHER_IN(730, "OTHER_IN", "其它入库"), + OTHER_OUT(740, "OTHER_OUT", "其它出库"); private int value; private String code; From 3d8842602de1cff1b12bdc98dd2c85e52b98f7e7 Mon Sep 17 00:00:00 2001 From: Liquor Date: Mon, 28 Sep 2020 09:52:21 +0800 Subject: [PATCH 39/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86SPC-KEY-TATA?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 62 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 28 ++++++++++ 2 files changed, 90 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 56a6580..f04adef 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 @@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * MES_SPC关键数据 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPC_KEY_DATA_OBJECT_TYPE{ + POJO_OBJECT(10,"实体对象（单表）"), + DYNAMIC(20,"动态对象（生产数据表）"); + + private Integer objectType; + private String description; + SPC_KEY_DATA_OBJECT_TYPE(Integer objectType,String description ){ + this.objectType = objectType; + this.description = description; + } + + public Integer getObjectType() { + return objectType; + } + + public void setObjectType(Integer objectType) { + this.objectType = objectType; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { GT(">", ">", "大于"), @@ -111,6 +143,36 @@ public class MesEnumUtil { } /** + * 启用还是禁用 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_VALID{ + YES(1,"启用"), + NO(2,"禁用"); + private Integer isValid; + private String description; + + IS_VALID(int isValid,String description){ + this.isValid = isValid; + this.description = description; + } + public int getIsValid() { + return isValid; + } + + public void setIsValid(int isValid) { + this.isValid = isValid; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + /** * 排序方式 */ public enum ASC_OR_DESC { 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 f310d79..e465c73 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 @@ -870,6 +870,34 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){ + DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); + if (!StringUtils.isEmpty(keyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(keyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getFieldCode(), "fieldCode", packBean); + } + if (keyData.getObjectType() != null && keyData.getObjectType() != 0) { + DdlPreparedPack.getNumEqualPack(keyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCondition())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCondition(), "kdCondition", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdName())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdName(), "kdName", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCode(), "kdCode", packBean); + } + if (keyData.getSpecLsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecLsl(), "specLsl", packBean); + } + if (keyData.getSpecUsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecUsl(), "specUsl", packBean); + } + return packBean; + } /** * MES 物料关键数据关系信息查询条件封装 * From 2bd7650d4868b8c6510a25e9f0bb1b0bdfe96311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 11:22:24 +0800 Subject: [PATCH 40/51] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3pojo=E4=B8=AD=E6=89=80=E6=9C=89Double=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/IfDefectData.java | 4 +++- .../i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 +++- .../i3plus/pojo/mes/bean/IfPackageDetail.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java | 4 +++- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 4 +++- .../i3plus/pojo/mes/bean/IfQueueShipping.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 4 +++- .../i3plus/pojo/mes/bean/MesBoardEquDetail.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 4 +++- .../i3plus/pojo/mes/bean/MesBoardWorkCell.java | 6 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 4 +++- .../i3plus/pojo/mes/bean/MesCellFeedRecord.java | 4 +++- .../i3plus/pojo/mes/bean/MesCustomerPart.java | 4 +++- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 4 +++- .../i3plus/pojo/mes/bean/MesDismantleRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesLocation.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesMouldPart.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 25 +++++++++++++++------- .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 8 +++---- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesPackageTrans.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesPartSample.java | 4 +++- .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 2 +- .../i3plus/pojo/mes/bean/MesProdWorkCenter.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +++- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 +++- .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 7 ++++-- .../pojo/mes/bean/MesQcOrderApprovalStatus.java | 4 +++- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueOrderBom.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 10 ++++++--- .../i3plus/pojo/mes/bean/MesQueueShipping.java | 4 +++- .../pojo/mes/bean/MesQueueShippingDetail.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 4 +++- .../i3plus/pojo/mes/bean/MesScatterPartCfgBom.java | 2 +- .../pojo/mes/bean/MesScatterPartProdCfg.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 4 +++- .../pojo/mes/bean/MesSpcControlCoefficient.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java | 10 ++++++--- .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 5 +++-- .../i3plus/pojo/mes/bean/MesTorqueDetail.java | 10 ++++++--- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 +++- .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 7 ++++-- .../pojo/mes/bean/MesWorkCellPointGroup.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 25 +++++++++++++++------- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 25 +++++++++++++++------- 63 files changed, 271 insertions(+), 110 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java index ae079bb..289babc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -67,7 +68,8 @@ public class IfDefectData extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 98d4fc0..991b3a1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String sn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 280de6b..bab82d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("包装批次") private String lotNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java index e26bbcd..005e0d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -54,7 +55,8 @@ public class IfPartPull extends BaseBean implements Serializable { @ApiParam("子物料编码") private String itemPartNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("拉动数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index d1dcee7..001d4cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,7 +43,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("包装条码") private String packageNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -66,7 +68,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 74de05a..25c6e0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -38,7 +39,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; 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 index c9b462d..4693daa 100644 --- 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 @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -115,7 +117,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料物料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index bb50de6..561bd95 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,7 +47,8 @@ public class IfRawPartData extends BaseBean implements Serializable { @ApiParam("原料条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 16462e9..6902d49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,11 +45,13 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 2df2ad6..80d3a4e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -64,7 +65,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @ApiParam("时段产能") private Integer hourCapacity; - @Column(name = "STOP_TIME") + @Column(name = "STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("停机时间") private Double stopTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java index 59d5305..1140335 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -47,11 +47,13 @@ public class MesBoardWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a5a8a52..96d5dce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -60,7 +61,8 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index aec9dcf..62e56c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -59,7 +60,8 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 92bcd86..71e21af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,7 +51,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @ApiParam("客户物料颜色") private String customerPartColor; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 26ca667..54d14d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -84,7 +85,8 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 6a682d7..d57df5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -60,7 +61,8 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("生产工单号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 3bbe40e..06a48ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,7 +42,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index b17f81d..00839db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,11 +38,13 @@ public class MesKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String keyDataName; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; 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 752cdd2..c7a6e6d 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,11 +48,13 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("关键数据数量") private Integer keyDataCount; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java index 581368f..2ab848c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,7 +48,8 @@ public class MesLocation extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 698ffde..0e42446 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -39,7 +40,8 @@ public class MesMouldPart extends BaseBean implements Serializable { @ApiParam("模具代码") private String mouldCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 43454da..bd5d000 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -68,11 +69,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总生产时间") private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总停机时间") private Double totalStopTime; @@ -92,27 +95,33 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("时间开动率") private Double timeRate; - @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("性能开动率") private Double taktRate; - @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("良品率") private Double qualifiedRate; - @Column(name = "OEE", columnDefinition = "decimal(18,4)") + @Column(name = "OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE") private Double oee; - @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE目标值") private Double targetOee; - @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "MIN_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE警戒值") private Double minOee; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index bc7b401..5637728 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index dac14a4..37a9793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -40,22 +40,22 @@ public class MesPackSpec extends BaseBean implements Serializable { @ApiParam("包装规格名称") private String specName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量", example = "0") private Double qty = 0d; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量2", example = "0") private Double qty2; - @Column(name = "QTY3") + @Column(name = "QTY3", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量3", example = "0") private Double qty3; - @Column(name = "QTY4") + @Column(name = "QTY4", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量4", example = "0") private Double qty4; 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 4c1f98a..e1e09fd 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 @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,11 +43,13 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "PACK_SPEC_QTY") + @Column(name = "PACK_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("包装规格数量") private Double packSpecQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java index 230f503..77c9ed0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -43,7 +44,8 @@ public class MesPackageTrans extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index f26050e..95ae538 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; - @Column(name = "PART_SPEC_QTY") + @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("标准包规数量") private Double partSpecQty; @@ -128,7 +130,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "包装数量") private Double qty2; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java index 4b756ee..9ad4d4b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,7 +38,8 @@ public class MesPartSample extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index ac42795..7689354 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,7 +38,8 @@ public class MesPartScheduleBom extends BaseBean implements Serializable { @ApiParam("关联物料号") private String itemPartNo; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index d5f6ed3..55bd48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,11 +53,13 @@ public class MesPlanOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; - @Column(name = "DECOMPOSE_QTY") + @Column(name = "DECOMPOSE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("分解数量") private Double decomposeQty; 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 94ceddd..91b3ecd 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 @@ -68,7 +68,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String kpSn; - @Column(name = "KP_QTY") + @Column(name = "KP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "原材料数量", example = "0") private Double kpQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index ed640d7..b463839 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("料箱编号") private String rackNo; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b9a1af3..4cd5e8a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 0f176b5..76c61d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -53,7 +54,8 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index c6c488a..2a00ea2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -104,11 +105,13 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("检测值配置编号") private String checkCfgNo; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 0ff6d06..ed50194 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -49,11 +50,13 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @Column(name = "FINISH_QTY") + @Column(name = "FINISH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已检数量") private Double finishQty = 0D; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java index c1774c7..2b8d481 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -45,7 +46,8 @@ public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { @ApiParam("工单号") private String workOrderNo; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 6fefde1..fb90c4c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -80,11 +81,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("已检数量") private Integer finishQty; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 4a6ca87..8035a05 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("车号") private String carNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; 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 5ecb56c..dd46d65 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,7 +51,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index cde084a..93f729c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index b55af50..04d6155 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -53,7 +54,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("选配码") private String vehicleCode; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 5177ba9..f7eedab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("道口") private String dockNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 88771e3..5162f3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品配置名称") private String prodCfgNameRdd; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index e1066b7..61ad875 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index dff8934..1a8a0d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,11 +49,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -112,7 +115,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列序号") private Double queueSeq; - @Column(name = "FINSIH_QTY") + @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已生产数量") private Double finsihQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index bc23151..3337e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index 6f0005e..575899c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -67,11 +68,13 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; - @Column(name = "qty") + @Column(name = "qty", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index ee3e3b5..dd7a8eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java index fd2e7c3..f1b5039 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -64,7 +64,7 @@ public class MesScatterPartCfgBom extends BaseBean implements Serializable { @ApiParam("零件标志值") private String partFlagValue; - @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "用量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index a95f2be..f562fd3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -162,11 +163,13 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("是否截至顺序号") private Integer isEndSeq; - @Column(name = "MULTIMEDIA_PLUG_QTY") + @Column(name = "MULTIMEDIA_PLUG_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("多媒体插头数量") private Double multimediaPlusQty; - @Column(name = "QUALIFIED_COUNT") + @Column(name = "QUALIFIED_COUNT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("应收合格数") private Double qualifiedCount; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 8263d3e..6f4c169 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -69,7 +70,8 @@ public class MesScrapRecord extends BaseBean implements Serializable { @ApiParam("工单编号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 3fd79bb..fe879fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("下班时间") private String endTime; - @Column(name = "WORK_TIMES") + @Column(name = "WORK_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("作业时长") private Double workTimes; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index ef567e2..ae77fe6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -43,7 +44,8 @@ public class MesShiftRest extends BaseBean implements Serializable { @ApiParam("开始时间") private String startTime; - @Column(name = "REST_TIMES") + @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("休息时长") private Double restTimes; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java index 4c896fc..a90ab6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,7 +45,8 @@ public class MesSpcControlCoefficient extends BaseBean implements Serializable { @ApiParam("系数描述") private String coefficientDesc; - @Column(name = "COEFFICIENT_VALUE") + @Column(name = "COEFFICIENT_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("系数值") private Double coefficientValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java index 774a869..f1c2cfd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,15 +37,18 @@ public class MesSpcKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String kdName; - @Column(name = "NOMINAL_VALUE") + @Column(name = "NOMINAL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公称值") private Double nominalValue; - @Column(name = "SPEC_USL") + @Column(name = "SPEC_USL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格上限") private Double specUsl; - @Column(name = "SPEC_LSL") + @Column(name = "SPEC_LSL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格下限") private Double specLsl; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 7cd1e59..e159d8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -57,7 +57,7 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; @@ -86,7 +86,8 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "绑定物料类型") private Integer bindPartType = 20; - @Column(name = "FEED_WARNING_QTY") + @Column(name = "FEED_WARNING_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "投料预警值") private Double feedWarningQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java index 56743f5..e303080 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -35,15 +36,18 @@ public class MesTorqueDetail extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大值") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小值") private Double lowerLimit; - @Column(name = "TORQUE_DETAIL_VALUE") + @Column(name = "TORQUE_DETAIL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("扭矩值") private Double torqueValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 571dd6c..0739b8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -70,7 +71,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位等级") private Integer grade; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 9ab0cb3..fb8ef53 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,11 +43,13 @@ public class MesWorkCellPoint extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; 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 index b539f74..4ca4471 100644 --- 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,11 +52,13 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("主队列编号") private String orderNo; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 0d056b6..7582002 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,23 +51,28 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -146,15 +152,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 6213888..18be551 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,23 +48,28 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -139,15 +145,18 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; From 72faca1092fbd5ca75d5e1ea8d97ce20917f4d80 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Mon, 28 Sep 2020 11:59:45 +0800 Subject: [PATCH 41/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 3bfe3b7..6913225 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 @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +23,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "PROCESS_CODE"), + @Index(columnList = "STEP_CODE") +}) @Api("产品流程配置操作参数表") public class MesProdRouteOptParam extends BaseBean implements Serializable { private static final long serialVersionUID = -5043197912658757665L; From 83bfaaceab95c29cd3430653eedb54f05f83bd1b Mon Sep 17 00:00:00 2001 From: Liquor Date: Mon, 28 Sep 2020 17:01:09 +0800 Subject: [PATCH 42/51] =?UTF-8?q?=E5=AF=B9SPC-KEY-TATA=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E8=BF=9B=E8=A1=8C=E4=BA=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 22 +++++++++++++++------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 7 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 f04adef..dbdd6a1 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 @@ -20,19 +20,27 @@ public class MesEnumUtil { POJO_OBJECT(10,"实体对象（单表）"), DYNAMIC(20,"动态对象（生产数据表）"); - private Integer objectType; + private Integer value; private String description; - SPC_KEY_DATA_OBJECT_TYPE(Integer objectType,String description ){ - this.objectType = objectType; + SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){ + this.value = value; this.description = description; } + public static String valueOfDesc(String val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + return values()[i].description; + } + } + return null; + } - public Integer getObjectType() { - return objectType; + public Integer getValue() { + return value; } - public void setObjectType(Integer objectType) { - this.objectType = objectType; + public void setValue(Integer value) { + this.value = value; } public String getDescription() { 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 e465c73..46ee53a 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 @@ -2327,6 +2327,25 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData spcKeyData) { + DdlPackBean packBean = getAllBaseData(spcKeyData.getOrganizeCode()); + if (!StringUtils.isEmpty(spcKeyData.getIsValid())) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getIsValid(), "isValid", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getKdCode(), "kdCode", packBean); + } + if (spcKeyData.getObjectType() != null) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getFieldCode(), "fieldCode", packBean); + } + return packBean; + } /** * 监听任务查询条件封装 * From ebb965f46df2acc7d2fb4d1e9a3090f48b65d10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 17:36:50 +0800 Subject: [PATCH 43/51] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=B7=BB=E5=8A=A0=E7=9C=8B=E6=9D=BF=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=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/MesEnumUtil.java | 39 +++++++++++- .../i3plus/pojo/mes/bean/MesBoardCustomerData.java | 44 ++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardSubmenu.java | 71 ++++++++++++++++++++++ .../repository/MesBoardCustomerDataRepository.java | 15 +++++ .../mes/repository/MesBoardSubMenuRepository.java | 15 +++++ 5 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.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 dbdd6a1..6f5ca2c 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 @@ -5264,7 +5264,8 @@ public class MesEnumUtil { BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), - BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"); + BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", " 麦格纳产能看板"); private String code; private String description; @@ -7551,4 +7552,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * mes 看板展示类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_TYPE { + + PICTURE(10, "图片"), + VIDEO(20, "视频"); + + private int value; + private String description; + + SHOW_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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java new file mode 100644 index 0000000..9509fc5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java @@ -0,0 +1,44 @@ +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: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_CUSTOMER_DATA") +@Api("MES_看板客户相关信息") +public class MesBoardCustomerData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3871945569470777555L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "COMPLAIN_PLAN_QTY") + @ApiParam("客户抱怨目标数量") + private Integer complainPlanQty; + + @Column(name = "COMPLAIN_ACTUAL_QTY") + @ApiParam("客户抱怨实际数量") + private Integer complainActualQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java new file mode 100644 index 0000000..052a1c3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java @@ -0,0 +1,71 @@ +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: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SUBMENU") +@Api("MES_看板子菜单") +public class MesBoardSubmenu extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6544735793917822548L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "ITEM_NAME") + @ApiParam("子项名称") + private String itemName; + + @Column(name = "ICON") + @ApiParam("ICO图标") + private String icon; + + @Column(name = "SEQ") + @ApiParam("顺序号") + private Integer seq; + + /** + * 10-图片 20-视频 + */ + @Column(name = "SHOW_TYPE") + @ApiParam("展示类型") + private Integer showType; + + @Column(name = "PICTURE_URL") + @ApiParam("图片路径") + private String pictureUrl; + + @Column(name = "VIDEO_URL") + @ApiParam("视频路径") + private String videoUrl; + + /** + * 10-图片， 20-视频 + */ + @Transient + @ApiParam("文件类型") + private Integer fileTypeCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java new file mode 100644 index 0000000..41ee9e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.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.MesBoardCustomerData; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardCustomerDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java new file mode 100644 index 0000000..c45b135 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.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.MesBoardSubmenu; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardSubMenuRepository extends BaseRepository { +} From 461780e0d064ff5730ab4e2587848c3d5776cf8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 17:40:43 +0800 Subject: [PATCH 44/51] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 6f5ca2c..714f433 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 @@ -5265,7 +5265,7 @@ public class MesEnumUtil { BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), - BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", " 麦格纳产能看板"); + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"); private String code; private String description; From aa01153c4b83376b974ef75b4a7454ae09a55d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 18:21:05 +0800 Subject: [PATCH 45/51] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=9B=B4=E6=96=B0=E7=9C=8B=E6=9D=BF=E5=AD=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java index 052a1c3..55288d0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java @@ -61,11 +61,4 @@ public class MesBoardSubmenu extends BaseBean implements Serializable { @Column(name = "VIDEO_URL") @ApiParam("视频路径") private String videoUrl; - - /** - * 10-图片， 20-视频 - */ - @Transient - @ApiParam("文件类型") - private Integer fileTypeCode; } From 037e898cd262fa06a286e155320b4ca667a22ba5 Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 28 Sep 2020 19:38:24 +0800 Subject: [PATCH 46/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 55 ++++++++++ .../i3plus/pojo/mes/bean/MesQualityStandard.java | 118 +++++++++++++++++++++ .../pojo/mes/model/MesDbCheckRecordModel.java | 11 +- .../pojo/mes/model/MesProductDataDefectModel.java | 9 ++ .../mes/repository/MesControlPlanRepository.java | 12 +++ .../repository/MesQualityStandardRepository.java | 12 +++ 6 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java new file mode 100644 index 0000000..4a3b70e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -0,0 +1,55 @@ +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控制计划-主表 + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTROL_PLAN") +@Api("中航控制计划主表") +public class MesControlPlan extends BaseBean implements Serializable { + //1. 主表字段：“产线”、“产品”、“客户”、“版本号”、“是否生效”、“状态（编辑中、待审核、已审核）”组成。（主表命名“控制计划”） + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + +// @Column(name = "WORK_CELL_CODE") +// @ApiParam("工作单元代码") +// private String workCellCode; + + @Column(name = "product_name") + @ApiParam("产品名称") + private String productName; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; + + @Column(name = "EDIT_TYPE") + @ApiParam("编辑状态") + private Integer editType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java new file mode 100644 index 0000000..d8fbcef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -0,0 +1,118 @@ +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: MES质量标准-明细表（主表：控制计划MES_CONTROL_PLAN） + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUALITY_STANDARD") +@Api("中航质量标准明细表") +public class MesQualityStandard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "CONTROL_PLAN_ID") + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @Column(name = "VERSION") + @ApiParam("版本") + private String version; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer CHECK_TYPE; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private String isConcession; + + @Column(name = "CHECK_INTERVAL") + @ApiParam("间隔时间") + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @Column(name = "NUMBER_FLAG") + @ApiParam("个数标识") + private String numberFlag; + + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String CHECK_ORDER_TYPE; + + //数据来源：10=手工录入，20=PLC，30=DB + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String DATA_SOURCE; + + //检验值类型：10=字符串，20=数值 + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检验值类型") + private String CHECK_VALUE_TYPE; + + @Column(name = "DIFFERENCE_MAX_LIMIT") + @ApiParam("公差上限") + private BigDecimal differenceMaxLimit; + + @Column(name = "DIFFERENCE_MIN_LIMIT") + @ApiParam("公差下限") + private BigDecimal differenceMinLimit; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer IS_KEY_CHECK_ITEM; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String CHECK_CFG_NO; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java index 1fa374a..5d5f06c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -10,6 +10,9 @@ import lombok.Data; */ @Data public class MesDbCheckRecordModel { + @ApiParam("主键") + private Long id; + @ApiParam("过程条码") private String serialNumber; @@ -25,11 +28,15 @@ public class MesDbCheckRecordModel { @ApiParam("缺陷原因") private String defectDesc; - public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String defectType, String defectDesc) { + @ApiParam("生产记录表主键ID") + private Long productDataId; + + public MesDbCheckRecordModel(Long id, String serialNumber, String partNo, String partDesc, String defectDesc, Long productDataId) { + this.id = id; this.serialNumber = serialNumber; this.partNo = partNo; this.partDesc = partDesc; - this.defectType = defectType; this.defectDesc = defectDesc; + this.productDataId = productDataId; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java index fec884f..d825602 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -41,4 +41,13 @@ public class MesProductDataDefectModel { this.defectDesc = defectDesc; this.offlineTime = offlineTime; } + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.defectDesc = defectDesc; + this.offlineTime = offlineTime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java new file mode 100644 index 0000000..ab6c93c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesControlPlan; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesControlPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java new file mode 100644 index 0000000..0693f9c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandard; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesQualityStandardRepository extends BaseRepository { +} From 5033c8dde0ac271f7827d5ce5f153ccb99b683b2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 29 Sep 2020 10:54:16 +0800 Subject: [PATCH 47/51] =?UTF-8?q?Fix=20bug#11661=20=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E5=92=8C=E7=9B=AE=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 0a8b2f9..7e1103a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -57,7 +57,7 @@ public class WmsMessageStyleModel implements Serializable { } else if (actQty == transQty) {//处理完成 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } else if (transQty < actQty) {//处理中 处理数量可以大于需求数量 - this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } } } From 79baaa4546f43be43b2929b4296ce936b498025a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 29 Sep 2020 13:13:06 +0800 Subject: [PATCH 48/51] =?UTF-8?q?Fix=20bug#11661=20=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E5=92=8C=E7=9B=AE=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 7cd233a..bb34224 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 @@ -338,6 +338,14 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "过滤业务类型") private String filterBusiType; + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } From 3d8d27d780db33248b845add2bef6f3eccaa8072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 29 Sep 2020 17:08:54 +0800 Subject: [PATCH 49/51] =?UTF-8?q?=E3=80=9011374=2020027-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=8A=A5?= =?UTF-8?q?=E9=94=99=EF=BC=88=E9=99=84=E4=BB=B6=E6=98=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=89-20200915=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 2 +- 2 files changed, 78 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 714f433..78e2d68 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 @@ -7588,4 +7588,81 @@ public class MesEnumUtil { return tmp; } } + + /** + * mes 数据来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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; + } + } + + /** + * mes 检验值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); + + private int value; + private String description; + + QC_CHECK_VALUE_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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 2a00ea2..c215d8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -98,7 +98,7 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { private String dataSource; @Column(name = "CHECK_VALUE_TYPE") - @ApiParam("任务单类型") + @ApiParam("检测值类型") private String checkValueType; @Column(name = "CHECK_CFG_NO") From 84d5f84457e78fd9946627966a4a2a4672d550c9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 30 Sep 2020 10:47:58 +0800 Subject: [PATCH 50/51] =?UTF-8?q?=E3=80=9011629=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E7=9C=8B=E6=9D=BF=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--0930=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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 82d05f2..f24ff0c 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 @@ -344,6 +344,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "子位置号") private String itemSeqNo; + @ApiParam(value = "最早需求时间") + private String firstTime; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 944b8538625b78e26f969444f23f6f7923006cb6 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 30 Sep 2020 13:35:20 +0800 Subject: [PATCH 51/51] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=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/WmsCSOrderDetails.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/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index dcc76ee..68abad8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -112,7 +112,7 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "LOT_NO", nullable = false) + @Column(name = "LOT_NO") @ColumnDefault("") @ApiParam("收货批次") public String lotNo = "";