From bf71cd07d014c2071fb20da2e5cddadb41da6050 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 16 Jan 2020 21:41:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?JIS=E5=8F=91=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 +++------------------- .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 28 ++++++------- .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 5 +++ .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 4 ++ .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 20 ++++++++-- .../pojo/mes/pcn/model/StationResultBean.java | 3 ++ .../estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 28 ++++++------- .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 +- 10 files changed, 73 insertions(+), 76 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 067cb20..a5c7c54 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 @@ -50,14 +50,14 @@ public class MesEnumUtil { * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); private int value; private String description; - MES_JIS_PATTERN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -3419,7 +3419,8 @@ public class MesEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 674878a..8baa6a5 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 @@ -16,49 +16,14 @@ public class MesPcnEnumUtil { * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); private int value; private String description; - MES_JIS_PATTERN_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * JIS发运是否按主队列顺序扫描 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_SCAN_TYPE { - TRUE(10, "是"), - FALSE(20, "否"); - - private int value; - private String description; - - MES_JIS_SCAN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -86,7 +51,7 @@ public class MesPcnEnumUtil { * JIS发运队列状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIS_STATUS { + public enum JIS_QUEUE_STATUS { TRUE(10, "已发运"), FALSE(20, "未发运"); @@ -94,7 +59,7 @@ public class MesPcnEnumUtil { private int value; private String description; - MES_QUEUE_JIS_STATUS(int value, String description) { + JIS_QUEUE_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -2516,7 +2481,8 @@ public class MesPcnEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 6635e25..293fc07 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java index b833dfc..c08acfd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :JIS发运队列 @@ -61,4 +62,8 @@ public class MesQueueJis extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Transient + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java index e8243ed..86cddfb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("明细整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index 7a32f8b..b0cb953 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -42,24 +42,37 @@ public class QueueJisModel implements Serializable { @ApiParam("产品条码") private String serialNumber; + @ApiParam("明细整体状态") + private Integer finalStatus; + @ApiParam("状态名称") private String statusName; @ApiParam("明细状态名称") private String detailStatusName; + @ApiParam("明细整体状态名称") + private Integer finalStatusName; + + @ApiParam("颜色") + private String color; + public String getStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); } public String getDetailStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); + } + + public String getFinalStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); } public QueueJisModel() { } - public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) { + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { this.jisNo = jisNo; this.vinCode = vinCode; this.carNo = carNo; @@ -71,6 +84,7 @@ public class QueueJisModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.detailStatus = detailStatus; this.serialNumber = serialNumber; + this.finalStatus = finalStatus; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java index e86fd56..978fd4b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -49,4 +49,7 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + + @ApiParam("多个数据集") + private List> stationResultBeans; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index b7a7b64..87400b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理队列数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index db45636..03f8870 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("发运整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; 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 dbf4e42..9a46d75 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 @@ -2105,8 +2105,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(patternJis.getPatternNo())) { DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(patternJis.getTopNo())) { - DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getQueueNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getQueueNo(), "queueNo", packBean); } if (!StringUtils.isEmpty(patternJis.getHandleNo())) { DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean); From 51d60a107ae2b27eb341b40ec5f08362ee52d037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 17 Jan 2020 10:18:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?SAP=E6=8C=87=E4=BB=A4=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2(=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=EF=BC=9A=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86;?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=EF=BC=9A=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?)=E8=8E=B7=E5=8F=96=E8=A1=8C=E5=8F=B7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=B0sap=5Forder=5Flock=E8=A1=A8=EF=BC=9B=20=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=EF=BC=9ASAP=E8=A6=81=E7=9A=84=E6=98=AF=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E8=A1=8C=E5=8F=B7=EF=BC=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=8F=AF=E8=83=BD=E6=98=AF=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84=E6=8B=86=E5=88=86=E6=88=96=E8=80=85?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=89=80=E5=BE=97=EF=BC=8C=E8=A1=8C=E5=8F=B7?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E5=AE=9A=E5=87=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 111 ++++++++++----------- .../pojo/wms/repository/WmsConfigRepository.java | 2 + 2 files changed, 54 insertions(+), 59 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b3eb04f..ed0a748 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 @@ -174,6 +174,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 主表信息 单据类型 */ @@ -700,9 +701,9 @@ public class WmsEnumUtil { KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), - KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), - PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"), - UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用"); + KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), + PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), + UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"); private int value; private String code; @@ -897,7 +898,7 @@ public class WmsEnumUtil { VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), - UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用"); + UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"); private String value; private String description; @@ -1037,7 +1038,7 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - SCRAP(70,"报废"), + SCRAP(70, "报废"), COMMING(80, "在途"); private int value; @@ -1470,6 +1471,7 @@ public class WmsEnumUtil { return valueOf(val); } } + /** * 库存移动单状态状态:10=新建,20=已处理,30=处理出错 */ @@ -2936,64 +2938,56 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IMPORT_ORDER_TYPE { - PO("PO", "要货计划"), - ASN("ASN", "ASN"), - INSTRUCTIONS("INSTRUCTIONS", "指令"), - SCATTERED_OUT("C00", "零星出库指令"), - SCATTERED_INT("C01", "零星入指令"), - NC_DISMANTLING_PICKING("C02", "NC拆解领料"), - NC_DISMANTLING_RETURN("C03", "NC拆解退料"), - NC_SCRAPPED("C04", "NC报废指令"), - NOT_JIS("NOTJIS", "非JIS指令"), - STOCK_DUMP("D00", "库存转储指令"), - NC_INSTOCK("D01", "NC入库指令"), - SMRR("B00", "SMRR退货"), - DMR("B01", "DMR退货"), - OUT_SOURCING("A00", "委外发料指令"), - OUT_REBACK("A01", "委外退料指令"), - OUT_RETURN_SOURCING("A02", "委外返工发料指令"), - OUT_RETURN_("A03", "委外返工退料指令"), - SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"), - CS("CS", "盘点指令"), - CS_ADUJUST("CS_ADUJUST", "盘点调差指令"); + PO("1", "PO", "要货计划"), + ASN("2", "ASN", "ASN"), + INSTRUCTIONS("3", "INSTRUCTIONS", "指令"), + SCATTERED_OUT("C00", "C00", "零星出库指令"), + SCATTERED_INT("C01", "C01", "零星入指令"), + NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"), + NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"), + NC_SCRAPPED("C04", "C04", "NC报废指令"), + NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"), + STOCK_DUMP("D00", "D00", "库存转储指令"), + NC_INSTOCK("D01", "D01", "NC入库指令"), + SMRR("B00", "B00", "SMRR退货"), + DMR("B01", "B01", "DMR退货"), + OUT_SOURCING("A00", "A00", "委外发料指令"), + OUT_REBACK("A01", "A01", "委外退料指令"), + OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"), + OUT_RETURN_("A03", "A03", "委外返工退料指令"), + SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"), + CS("CS", "CS", "盘点指令"), + CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令"); private String value; + private String code; private String description; - IMPORT_ORDER_TYPE(String value, String description) { + IMPORT_ORDER_TYPE(String value, String code, String description) { this.value = value; + this.code = code; this.description = description; } - public String getDescription() { - return description; + public String getValue() { + return value; } public String getCode() { - return value; + return code; } - public String getValue() { - return value; + public String getDescription() { + return description; } - public static IMPORT_ORDER_TYPE codeOf(String value) { + public static IMPORT_ORDER_TYPE codeOf(String code) { for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(value)) { + if (values()[i].code.equals(code)) { return values()[i]; } } return null; } - - public static String getDes(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } } /** @@ -3083,7 +3077,6 @@ public class WmsEnumUtil { } - /** * 任务数据来源：检查子数据 */ @@ -3496,7 +3489,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); private int value; private String description; @@ -4488,8 +4481,8 @@ public class WmsEnumUtil { WAIT_RECEIVING(10, "待收货"), RECEIVING(20, "收货中"), COMPLETE_RECEIVING(30, "收货完成"), - CLOSE(40,"已关闭"), - CANCEL(50,"已取消"), + CLOSE(40, "已关闭"), + CANCEL(50, "已取消"), UN_RECEIVED(60, "延迟未收货"); private int value; @@ -4580,9 +4573,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_ORDER_MASTER_STATUS { - CREATE(10,"CREATE", "创建"), - PLANNED(20,"PLANNED", "已计划"), - CLOSE(30,"CLOSE", "已关闭"); + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "已计划"), + CLOSE(30, "CLOSE", "已关闭"); private int value; private String code; @@ -4668,8 +4661,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PULL_TASK_DETAILS_STATUS { - BE_HANDLE(10,"BE_HANDLE", "待处理"), - CANCELLATION(20,"CANCELLATION", "已处理"); + BE_HANDLE(10, "BE_HANDLE", "待处理"), + CANCELLATION(20, "CANCELLATION", "已处理"); private int value; private String code; @@ -4720,10 +4713,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PULL_TASK_MASTER_STATUS { - CREATE(10,"CREATE", "创建"), - ENABLED(20,"ENABLED", "已启动"), - COMPLETE(30,"COMPLETE", "已完成"), - CLOSE(40,"CLOSE", "已关闭"); + CREATE(10, "CREATE", "创建"), + ENABLED(20, "ENABLED", "已启动"), + COMPLETE(30, "COMPLETE", "已完成"), + CLOSE(40, "CLOSE", "已关闭"); private int value; private String code; @@ -4804,8 +4797,8 @@ public class WmsEnumUtil { } /** - * WEB页面字段类型 - * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 + * WEB页面字段类型 + * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FIELD_TYPE { @@ -4881,7 +4874,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_COMMIT_MODE { - JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交"); + JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), REF_GROUP(30, 30, "关联分组号提交"); private int value; private int code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index da71990..97dad56 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; +import org.springframework.stereotype.Repository; /** * @Description : 系统配置 @@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; * @CreateDate : 2019-03-07 10:00 * @Modify: **/ +@Repository public interface WmsConfigRepository extends BaseRepository { /** From 9e0158e749c5f2e94727353de64b9d4ec742ecd8 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Jan 2020 11:43:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9test=E5=88=86=E6=94=AFPOM?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 19 +++++++++++-------- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 17 ++++++++++------- .../cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 13 +++++++++---- .../cn/estsh/i3plus/pojo/aps/holders/EOperInput.java | 2 +- .../cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/model/APSPager.java | 1 + .../src/main/resources/relations/OperInput.xml | 2 +- .../src/main/resources/relations/OperOutput.xml | 2 +- .../estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 2 +- 10 files changed, 38 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 53389da..e9c592a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -34,21 +34,24 @@ public class OperInput extends BaseAPS { @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) private Long operationId; - @Column(name="MATERIAL_ID") + @Column(name="INPUT_MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material", notEmpty = true) - private Long materialId; + @FieldAnnotation(relation = "InputMaterial", notEmpty = true) + private Long inputMaterialId; @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输入量") + @FieldAnnotation(defaultValue = "1.0") private Double inputCount; @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") + @FieldAnnotation(defaultValue = "1.0") private Double yield; @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") + @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; @Column(name="CONS_TYPE") @@ -73,13 +76,13 @@ public class OperInput extends BaseAPS { BeanRelation.set(this, EOperInput.Operation, oper); } - public Material getMaterial() { - return BeanRelation.get(this, EOperInput.Material); + public Material getInputMaterial() { + return BeanRelation.get(this, EOperInput.InputMaterial); } - public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EOperInput.Material, material); + public void setInputMaterial(Material material) { + this.inputMaterialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperInput.InputMaterial, material); } @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 86c4996..476d45b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -33,21 +33,24 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) private Long operationId; - @Column(name="MATERIAL_ID") + @Column(name="OUTPUT_MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", notEmpty = true) - private Long materialId; + private Long outputMaterialId; @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输出量") + @FieldAnnotation(defaultValue = "1.0") private Double outputCount; @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") + @FieldAnnotation(defaultValue = "1.0") private Double yield; @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") + @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; public Operation getOperation() { @@ -59,13 +62,13 @@ public class OperOutput extends BaseAPS { BeanRelation.set(this, EOperOutput.Operation, oper); } - public Material getMaterial() { - return BeanRelation.get(this, EOperOutput.Material); + public Material getOutputMaterial() { + return BeanRelation.get(this, EOperOutput.OutputMaterial); } - public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EOperOutput.Material, material); + public void setOutputMaterial(Material material) { + this.outputMaterialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperOutput.OutputMaterial, material); } @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 7eb002d..4743f7d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -51,6 +52,7 @@ public class ProductOrder extends BaseOrder { @Column(name="SPECIFY_ROUTING") @ApiParam(value ="指定工艺路线") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") private String specifyRouting; @Column(name="RECALC_COUNT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 510e091..e0786d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -211,7 +211,12 @@ public class BeanInfo { } public static Set> getBeanClasses() { - return beanInfos.keySet(); + Set> beanClasses = new HashSet<>(); + for (Map.Entry, BeanInfo> entry : beanInfos.entrySet()) { + beanClasses.add(entry.getKey()); + } + + return beanClasses; } public static BeanInfo getBeanInfo(Class cls) { @@ -234,9 +239,9 @@ public class BeanInfo { public static List> getChildClasses(Class cls) { List> beanClasses = new ArrayList<>(); - List beanInfos = getBeanInfo(cls).childsBeanInfos; - for (BeanInfo beanInfo : beanInfos) { - beanClasses.add(beanInfo.getBeanClass()); + List childBeanInfos = getBeanInfo(cls).childsBeanInfos; + for (BeanInfo childBeanInfo : childBeanInfos) { + beanClasses.add(childBeanInfo.getBeanClass()); } return beanClasses; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java index 4ee6467..9ce8642 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EOperInput { Operation, - Material, + InputMaterial, WorkInputs } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java index 898f576..df02363 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EOperOutput { Operation, - Material, + OutputMaterial, WorkOutputs } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java index 51f1ba0..6376ea3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -40,4 +40,5 @@ public class APSPager extends Pager { } private String filter; private List sorts; + private String query; } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml index e2d484c..1107e5c 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml index 5a7f843..2f030d9 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index f7f6ab7..5338751 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -333,7 +333,7 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RESOURCE_LOCK_TYPE { - NONE("NONE", "不锁定"), // + NONE("NONE", "不锁定"), PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"), PRODUCE_END("PRODUCE_END", "后工序生产结束时刻"); From 4ae13f827012633110ad4ab6cf978e6c1f05675c Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 17 Jan 2020 12:55:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?task=20`1408`=20=E7=94=9F=E4=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/ProductDataModel.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java new file mode 100644 index 0000000..727e482 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +}