From d4bde19861d6383ad1ec9ae8b1d683f485167df0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 20 Apr 2020 11:16:51 +0800 Subject: [PATCH 1/5] mes --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 e692e07..578c559 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 @@ -3505,6 +3505,7 @@ public class MesEnumUtil { public enum QUALITY_OBJECT_TYPE { ORGANIZE(10, "工厂"), + WORK_CENTER_CODE(20, "产线"), PRODUCT(30, "产品"); private int value; From eb85cc232ff4bffa4a2d8a809b47f8dcbffe77e4 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 20 Apr 2020 13:33:00 +0800 Subject: [PATCH 2/5] task:1623 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index e8ae08b..58f5123 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -305,4 +305,10 @@ public class WmsPart extends BaseBean { this.qty = cqty; this.partType = partType; } + + public WmsPart(String partGroup, Double cqty, String createDateTime) { + this.partGroup = partGroup; + this.qty = cqty; + this.createDatetime = createDateTime; + } } From 533d8e55e8a5d65a70a083b864a3ef14f78cfc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 20 Apr 2020 15:22:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 ++++++++++++++++++++++ .../i3plus/pojo/model/wms/ExcelImportModel.java | 40 +++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 3 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d12bf90..697fc86 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 @@ -6192,4 +6192,64 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 数据格式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_FORMAT { + STRING_FORMAT(1, "String", "字符串格式"), + INTEGER_FORMAT(2, "Integer", "整数格式"), + DOUBLE_FORMAT(3, "Double", "高精度浮点格式"), + DATE_FORMAT(4, "Date", "日期格式"), + FLOAT_FORMAT(5, "Float", "浮点格式"), + BOOL_FORMAT(6, "Boolean", "布尔格式"), + LONG_FORMAT(7, "LONG", "长整数格式"); + + private int value; + private String code; + private String description; + + DATA_FORMAT(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java new file mode 100644 index 0000000..609e87b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.model.wms; + + +import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/4/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("导入结果model") +public class ExcelImportModel implements Serializable { + + @ApiParam("结果") + private boolean result; + + @ApiParam("成功行数量") + private int successRowNum; + + @ApiParam("工作薄名称") + private String sheetName; + + @ApiParam("导入数据集合") + private List> excelList; + + @ApiParam("错误信息集合") + private List ImportErrorModels; +} 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 8829dc7..b9e6a01 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 @@ -3094,6 +3094,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result); + DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result); getStringBuilderPack(template, result); return result; } From 43bc24340cf50fbfe1417974828aa09bcdb105a5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 20 Apr 2020 15:32:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E6=96=99=E6=9E=B6=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java index 5ae7b20..4cfc59e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java @@ -21,17 +21,20 @@ public class QueueJitActualModule { private String queueGroupNo; @ApiParam("组内编号") private Integer groupNo; + @ApiParam("JIT排序号") + private String jitSeq; public QueueJitActualModule() { } - public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) { + public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) { this.id = id; this.vinCode = vinCode; this.seq = seq; this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; + this.jitSeq = jitSeq; } } 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 8667491..bf91927 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 @@ -84,6 +84,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("vin") private String vinCode; + @ApiParam("客户JIT队列编号") + private String jitActualNo; + public QueueOrderModel() { } @@ -167,7 +170,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) { + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -175,6 +178,7 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; this.isGroupPrinted = isGroupPrinted; + this.jitActualNo = jitActualNo; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 0bc1675..5f95f8f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -97,7 +97,7 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("车型代码") private String carModuleCode; @ApiParam("上一个序列号") - private Double lastQueDetailSeq; + private String lastQueDetailSeq; @ApiParam("包装数量") private Integer pgCodeNum; From 62883c5cc05013f4d45a85c7c8bce4e6c6b0776d Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 20 Apr 2020 17:14:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=901432=20=E5=B7=A5=E4=BD=8D=E6=89=AB?= =?UTF-8?q?=E6=8F=8F-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91=E3=80=90=E5=B7=A5=E4=BD=8D=E6=89=AB=E6=8F=8F?= =?UTF-8?q?-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?= =?UTF-8?q?=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesQueueShipping.java | 74 ---------------------- .../pojo/mes/model/MesQueueShippingDetail.java | 73 --------------------- 2 files changed, 147 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java deleted file mode 100644 index aabd924..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java +++ /dev/null @@ -1,74 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :MES_JIT发运队列 - * @Reference : - * @Author : qianhausheng - * @CreateDate : 2020-03-06 10:16 上午 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_SHIPPING") -@Api("MES_JIT发运队列") -public class MesQueueShipping extends BaseBean implements Serializable { - - private static final long serialVersionUID = 655875369308414110L; - - @Column(name = "JIT_NO") - @ApiParam("队列编号") - private String jitNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("配置代码") - private String prodCfgCode; - - @Column(name = "VIN_CODE") - @ApiParam("vin") - private String vinCode; - - @Column(name = "CUST_FLAG_NO") - @ApiParam("客户标识号") - private String custFlagNo; - - @Column(name = "SEQ") - @ApiParam("排序号") - private Double seq; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_PLANT_CODE") - @ApiParam("客户产线代码") - private String custPlantCode; - - @Column(name = "JIT_LOT_NO") - @ApiParam("JIT队列批次") - private String jitLotNo; - - @Column(name = "JIT_ACTUAL_NO") - @ApiParam("客户JIT队列编号") - private String jitActualNo; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java deleted file mode 100644 index 2e83143..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java +++ /dev/null @@ -1,73 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :MES_JIT发运队列明细 - * @Reference : - * @Author : qianhausheng - * @CreateDate : 2020-03-06 10:16 上午 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_SHIPPING_DETAIL") -@Api("MES_JIT发运队列明细") -public class MesQueueShippingDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1442091799346314190L; - - @Column(name = "JIT_NO") - @ApiParam("队列编号") - private String jitNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "status") - @ApiParam("状态") - private Integer status; - - @Column(name="SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "QUEUE_GROUP_NO") - @ApiParam("分组队列编号") - private String queueGroupNo; - - @Column(name = "GROUP_NO") - @ApiParam("组内编号") - private Integer groupNo; - - @Column(name = "GROUP_SEQ") - @ApiParam("分组序号") - private String groupSeq; - - @Column(name = "qty") - @ApiParam("数量") - private Double qty; -}