From a6730b0cd8d232d06a752cec67c84b6a36a811f9 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 4 Dec 2019 20:25:20 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1287?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=9B=BE=E7=89=87=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/model/ProduceCtgyPictureModel.java | 58 ++++++++++++++++++++++ .../pojo/mes/bean/MesProduceCtgyPicture.java | 27 +++------- 2 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java new file mode 100644 index 0000000..277f367 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\4 17:10 + * @Modify: + **/ +public class ProduceCtgyPictureModel { + + private Long id; + private String createUser; + private String createDatetime; + private String modifyUser; + private String modifyDatetime; + private String organizeCode; + private Integer isValid; + private Integer isDeleted; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("面位") + private String sideLocation; + + @ApiParam("文件id") + private Long fileId; + + @ApiParam("文件名称") + private String fileName; + @ApiParam("文件URL") + private String fileUrl; + @ApiParam("组名") + private String groupName; + + public ProduceCtgyPictureModel() { + } + + public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCategoryCode, String sideLocation, Long fileId, String fileName, String fileUrl, String groupName) { + this.id = id; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.produceCategoryCode = produceCategoryCode; + this.sideLocation = sideLocation; + this.fileId = fileId; + this.fileName = fileName; + this.fileUrl = fileUrl; + this.groupName = groupName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ae64067..5ebbca0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.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; /** * @Description: @@ -30,29 +31,17 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCategoryCode; + private String produceCtgyCode; @Column(name = "SIDE_LOCATION") @ApiParam("面位") private String sideLocation; - @Column(name = "PICTURE_URL") - @ApiParam("图片URL") - private String pictureUrl; + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; - @Column(name = "PICTURE_NAME") - @ApiParam("图片名称") - private String pictureName; - - @Column(name = "FILE_SIZE") - @ApiParam("FILE_SIZE") - private String fileSize; - - @Column(name = "FILE_TYPE_ID") - @ApiParam("FILE_TYPE_ID") - private String fileTypeId; - - @Column(name = "FILE_TYPE_NAME") - @ApiParam("FILE_TYPE_NAME") - private String fileTypeName; + @Transient + @ApiParam("文件名称") + private String fileName; } From cb6fe137d1f0022545fdf410fe33a56f90e73cad Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 4 Dec 2019 20:32:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90bug6863=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6-=E5=A6=82=E6=9E=9C=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E8=AF=A5=E6=9D=A1=E7=A0=81=E6=9C=AA=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/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 0fe51eb..01f93c4 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 @@ -645,7 +645,8 @@ 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", "坤泰拣货"); + KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), + PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"); private int value; private String code; From edcdeb3d4ffeebdd90ed42f3639c3c0b0dd92cb9 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 5 Dec 2019 09:54:36 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1287?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 42 +++++++--------------- .../pojo/mes}/model/ProduceCtgyPictureModel.java | 18 +++++----- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 22 ------------ 3 files changed, 23 insertions(+), 59 deletions(-) rename modules/{i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes}/model/ProduceCtgyPictureModel.java (76%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index b582621..984b9bf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.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; /** * @Description: @@ -30,41 +31,24 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCategoryCode; + private String produceCtgyCode; @Column(name = "SIDE_LOCATION") @ApiParam("面位") private String sideLocation; - @Column(name = "PICTURE_URL") - @ApiParam("图片URL") - private String pictureUrl; - - @Column(name = "PICTURE_NAME") - @ApiParam("图片名称") - private String pictureName; - - @Column(name = "FILE_SIZE") - @ApiParam("FILE_SIZE") - private String fileSize; + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; - @Column(name = "FILE_TYPE_ID") - @ApiParam("FILE_TYPE_ID") - private String fileTypeId; + @Transient + @ApiParam("文件名称") + private String fileName; - @Column(name = "FILE_TYPE_NAME") - @ApiParam("FILE_TYPE_NAME") - private String fileTypeName; + @Transient + @ApiParam("文件URL") + private String fileUrl; - @Column(name = "SOP_NAME") - @ApiParam("SOP名称") - private String sopName; - - @Column(name = "GROUP_NAME") - @ApiParam("GROUP_NAME") - private String groupName; - - @Column(name = "SYNC_TAG") - @ApiParam("SYNC_TAG") - private Integer syncTag = 0; + @ApiParam("图片URL") + private String pictureUrl; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java similarity index 76% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java index 277f367..ae4142d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java @@ -1,14 +1,16 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; +import lombok.Data; /** * @Description: * @Reference: * @Author: joke.wang - * @CreateDate: 2019\12\4 17:10 + * @CreateDate: 2019\12\4 16:44 * @Modify: **/ +@Data public class ProduceCtgyPictureModel { private Long id; @@ -21,7 +23,7 @@ public class ProduceCtgyPictureModel { private Integer isDeleted; @ApiParam("产品类型代码") - private String produceCategoryCode; + private String produceCtgyCode; @ApiParam("面位") private String sideLocation; @@ -29,8 +31,8 @@ public class ProduceCtgyPictureModel { @ApiParam("文件id") private Long fileId; - @ApiParam("文件名称") - private String fileName; + @ApiParam("文件原名称") + private String fileOriginName; @ApiParam("文件URL") private String fileUrl; @ApiParam("组名") @@ -39,7 +41,7 @@ public class ProduceCtgyPictureModel { public ProduceCtgyPictureModel() { } - public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCategoryCode, String sideLocation, Long fileId, String fileName, String fileUrl, String groupName) { + public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) { this.id = id; this.createUser = createUser; this.createDatetime = createDatetime; @@ -48,10 +50,10 @@ public class ProduceCtgyPictureModel { this.organizeCode = organizeCode; this.isValid = isValid; this.isDeleted = isDeleted; - this.produceCategoryCode = produceCategoryCode; + this.produceCtgyCode = produceCtgyCode; this.sideLocation = sideLocation; this.fileId = fileId; - this.fileName = fileName; + this.fileOriginName = fileOriginName; this.fileUrl = fileUrl; this.groupName = groupName; } 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 a79ca12..6f6a532 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 @@ -1421,28 +1421,6 @@ public class MesHqlPack { } /** - * MES 产品类型图片查询条件封装 - * - * @param mesProduceCtgyPicture - * @param organizeCode - * @return - */ - public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode); - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean); - } - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean); - } - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean); - } - return packBean; - } - - - /** * 设备通知对象配置 查询条件封装 * * @param mesEquNotifyObjectCfg From 61f3465255308d255eb0c63737d00510bef59650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Dec 2019 11:47:54 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 8 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 16 ++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java | 44 ++++++++++++++++++++++ .../pojo/wms/repository/WmsTerminalRepository.java | 17 +++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++ 5 files changed, 102 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 01b1fea..a6fc23c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -97,6 +97,14 @@ public class WmsBom extends BaseBean { @Transient public String routingCode; + @Column(name = "LOCATE_NO") + @ApiParam(value = "线边库位代码") + private String locateNo; + + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位代码") + private String terminalnNo; + public Double getQty() { return this.qty == null ? 0 : this.qty.doubleValue(); } 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 3f08e96..1d2e6b8 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 @@ -191,10 +191,22 @@ public class WmsPart extends BaseBean { @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; + @Column(name = "CYCLE_RQUEST_PERIOD") + @ApiParam(value = "循环补货周期", example = "0") + private Integer cycleRquestPeriod = 0; + + @Column(name = "CYCLE_RQUEST_QTY") + @ApiParam(value = "循环补货数量", example = "0") + private Double cycleRquestQty = 0d; + public int getIqcValue(){ return this.iqc == null ? 0 : this.iqc.intValue(); } + public int getCycleRquestPeriod(){ + return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue(); + } + public WmsPart() { } @@ -210,6 +222,10 @@ public class WmsPart extends BaseBean { return max == null? 0:max; } + public Double getCycleRquestQty() { + return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue(); + } + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java new file mode 100644 index 0000000..3531e8f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; + +/** + * @Description : 工位表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-12-03 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TERMINAL") +@Api("工位信息") +public class WmsTerminal extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592713L; + @Column(name="TERMINAL_NO") + @ApiParam("工位代码") + private String terminalNo; + + @Column(name="TERMINAL_NAME") + @ApiParam("工位名称") + private String terminalName; + + @Column(name="PDLINE_NO") + @ApiParam("产线代码") + private String pdlineNo; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.java new file mode 100644 index 0000000..e7deb3e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal; +import org.springframework.stereotype.Repository; + +/** + * @Description :工位信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface WmsTerminalRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d823254..a3d67fc 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 @@ -2515,4 +2515,21 @@ public class WmsHqlPack { return result; } + + /** + * 打印机管理信息分页查询条件 + * + * @param wmsTerminal + * @return + */ + public static DdlPackBean packHqlWmsTerminal(WmsTerminal wmsTerminal) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsTerminal.getPdlineNo(), "pdlineNo", result); + DdlPreparedPack.getStringLikerPack(wmsTerminal.getTerminalNo(), "terminalNo", result); + + getStringBuilderPack(wmsTerminal, result); + + return result; + } } From 032260b9f2c213408533a80e5cb790048cdcc200 Mon Sep 17 00:00:00 2001 From: zcg Date: Thu, 5 Dec 2019 15:37:43 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1290=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=85=A5excel]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 +++++- 1 file changed, 5 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 18c9e29..caa2b5d 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 @@ -1333,7 +1333,11 @@ public class MesEnumUtil { MES_DATA_OBJECT(220, "数据对象"), MES_OBJECT_CFG(230, "对象结构"), MES_WC_CHECK(240, "开线检查"), - MES_QC_CHECK_STANDARD(250, "质量检测标准"); + MES_QC_CHECK_STANDARD(250, "质量检测标准"), + MES_FAULT_CAUSE(260,"设备故障原因"), + MES_FAULT_METHOD(270,"设备故障处理措施"), + MES_FAULT_PHENOMENON(280,"设备故障现象"); + private int value; private String description; From a0780669c335431579e39eab5f657cfe509ab0ee Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 5 Dec 2019 15:59:58 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1287?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index 5ebbca0..bd45841 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -42,6 +42,6 @@ public class MesProduceCtgyPicture extends BaseBean { private Long fileId; @Transient - @ApiParam("文件名称") - private String fileName; + @ApiParam("文件原名称") + private String fileOriginName; } 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 6f6a532..368abef 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import org.springframework.util.StringUtils; @@ -1848,14 +1849,20 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) { + DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean); + } + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) { + DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean); +// DdlPreparedPack.timeBuilder( +// mesProduceSn.getOutWorkCenterStartTime(), +// mesProduceSn.getOutWorkCenterEndTime(), +// "outWorkCenterTime", packBean, true); + } DdlPreparedPack.timeBuilder( mesProduceSn.getCreateDateTimeStart(), mesProduceSn.getCreateDateTimeEnd(), "createDatetime", packBean, true); - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterStartTime(), - mesProduceSn.getOutWorkCenterEndTime(), - "outWorkCenterTime", packBean, true); return packBean; } From fcc2b09559a6f0039266a01f5b07eeb055aec414 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 5 Dec 2019 17:20:31 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E3=80=90=E5=AE=89=E7=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9E=9A=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index afcbeff..f435f19 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -947,12 +947,12 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - PART("PART_ALARM", 111020005, "物料"), - QUALITY("QUALITY_ALARM", 111020006, "质量"), - EQUIP("EQUMENT_ALARM", 111020007, "设备"), - PROCESS("ROUTING_ALARM", 111020008, "工艺"), - CHECK("OTHER_ALARM", 111020009, "自处理"), - FIX_ERROR("FIX_ERROR", 111020010, "自动报警"); + PART("PART_ALARM", 110060205, "物料"), + QUALITY("QUALITY_ALARM", 110060206, "质量"), + EQUIP("EQUMENT_ALARM", 110060207, "设备"), + PROCESS("ROUTING_ALARM", 110060208, "工艺"), + CHECK("OTHER_ALARM", 110060209, "自处理"), + FIX_ERROR("FIX_ERROR", 110060210, "自动报警"); private String value; private Integer code; From 5797ec4b1b045c23c624fdb2d0a8e97402168ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Dec 2019 17:31:17 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.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/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index a6fc23c..27a400a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -103,7 +103,7 @@ public class WmsBom extends BaseBean { @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - private String terminalnNo; + private String terminalNo; public Double getQty() { return this.qty == null ? 0 : this.qty.doubleValue(); From eb5f9610a8fc788652bc0c6c55cbeba7c14ab20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Dec 2019 18:24:34 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90KT-1282=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=8F=AD=E6=AC=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsShift.java | 48 ++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsShiftRest.java | 52 ++++++++++++++++++++++ .../pojo/wms/repository/WmsShiftRepository.java | 17 +++++++ .../wms/repository/WmsShiftRestRepository.java | 17 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 37 ++++++++++++++- 5 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRestRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java new file mode 100644 index 0000000..b894c55 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 班次表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-05 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_SHIFT") +@Api("班次信息") +public class WmsShift extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592714L; + + @Column(name="SHIFT_NO") + @ApiParam("班次编码") + private String shiftNo; + + @Column(name="SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name="START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name="END_TIME") + @ApiParam("结束时间") + private String endTime; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java new file mode 100644 index 0000000..103808a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 班休表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-05 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_SHIFT_REST") +@Api("班休信息") +public class WmsShiftRest extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592715L; + + @Column(name="REST_NO") + @ApiParam("班休代码") + private String restNo; + + @Column(name="REST_NAME") + @ApiParam("班休名称") + private String restName; + + @Column(name="SHIFT_NO") + @ApiParam("班次编码") + private String shiftNo; + + @Column(name="START_REST_TIME") + @ApiParam("开始休息时间") + private String startRestTime; + + @Column(name="END_REST_TIME") + @ApiParam("结束休息时间") + private String endRestTime; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRepository.java new file mode 100644 index 0000000..7f04633 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsShift; +import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal; +import org.springframework.stereotype.Repository; + +/** + * @Description :班次信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-05 14:49 + * @Modify: + **/ +@Repository +public interface WmsShiftRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRestRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRestRepository.java new file mode 100644 index 0000000..c7c87d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRestRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsShift; +import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest; +import org.springframework.stereotype.Repository; + +/** + * @Description :班休信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-12-05 14:49 + * @Modify: + **/ +@Repository +public interface WmsShiftRestRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 81642a2..d23756e 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 @@ -2519,7 +2519,7 @@ public class WmsHqlPack { } /** - * 打印机管理信息分页查询条件 + * 工位信息分页查询条件 * * @param wmsTerminal * @return @@ -2534,4 +2534,39 @@ public class WmsHqlPack { return result; } + + /** + * 班次信息分页查询条件 + * + * @param wmsShift + * @return + */ + public static DdlPackBean packHqlWmsShift(WmsShift wmsShift) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result); + DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result); + + getStringBuilderPack(wmsShift, result); + + return result; + } + + /** + * 班休信息分页查询条件 + * + * @param wmsShiftRest + * @return + */ + public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsShiftRest.getShiftNo(), "shiftNo", result); + DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestNo(), "restNo", result); + DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestName(), "restName", result); + + getStringBuilderPack(wmsShiftRest, result); + + return result; + } }