From 6457cac82808599492b75f11d770bdf4675005f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 4 Sep 2020 10:44:03 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=E5=8E=BB=E9=99=A4=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a517b70..518f691 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -13,8 +13,6 @@ import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; import java.io.Serializable; -import java.util.LinkedHashMap; -import java.util.Map; /** * @Description : @@ -65,18 +63,18 @@ public abstract class BaseBean implements Serializable { this.id = id; } - @Column(name="ORGANIZE_CODE", nullable = false) + @Column(name="ORGANIZE_CODE") @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) + @Column(name="IS_VALID", columnDefinition = "int default 1") @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) + @Column(name="IS_DELETED", columnDefinition = "int default 2") @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 From 332e37ea941ddcd24604cd9097612394dc68b9cd Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 4 Sep 2020 18:27:14 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E3=80=902719=2006=201.1.10=09=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 ++++++++-- .../cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java | 3 +++ .../java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 6b4590a..b89b62b 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 @@ -2351,7 +2351,8 @@ public class WmsEnumUtil { MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"), - INITIALIZE_SN("INITIALIZE_SN", "库存初始化"); + INITIALIZE_SN("INITIALIZE_SN", "库存初始化"), + IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号"); private String code; private String description; @@ -6376,7 +6377,12 @@ public class WmsEnumUtil { DATE_FORMAT(4, "Date", "日期格式"), FLOAT_FORMAT(5, "Float", "浮点格式"), BOOL_FORMAT(6, "Boolean", "布尔格式"), - LONG_FORMAT(7, "LONG", "长整数格式"); + LONG_FORMAT(7, "LONG", "长整数格式"), + BYTE_FORMAT(8, "Byte", "字节格式"), + BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"), + BLOB_FORMAT(10, "Blob", "BLOB格式"), + CLOB_FORMAT(11, "Clob", "CLOB格式"), + TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式") private int value; private String code; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java index df22498..fee7d8f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java @@ -45,4 +45,7 @@ public class BasBeanFieldInfoModel implements Serializable { @ApiParam(value = "自增") private String isFieldGeneric; + + @ApiParam(value = "数据表描述") + private String tableDesc; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index 63e108f..016a446 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -34,4 +34,7 @@ public class BasBeanInfoModel implements Serializable { @ApiParam(value = "字段列表数据") private List fieldInfoModelList; + + @ApiParam(value = "表名列表数据") + private List basBeanInfoModelList; } From 1ccd4f3b65228becc1a6b4e648d37b259fbc51f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 5 Sep 2020 18:47:10 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=8C=BA=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b53822b..64cd8a5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1331,7 +1331,8 @@ public class CommonEnumUtil { // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"), - PICK_UP(1000, "PICK_UP", "拾取"); + PICK_UP(1000, "PICK_UP", "拾取"), + INTERVAL(1100, "INTERVAL", "区间",SQL_WHERE.INTERVAL); //FILE(400, "file", "文件"), //IMAGE(410, "image", "image"), //OFF(500, "color", "颜色"), @@ -1440,7 +1441,8 @@ public class CommonEnumUtil { START_LIKE(41, " LIKE ", "前模糊"), END_LIKE(52, " LIKE ", "后模糊"), IN(50, " IN ", " in "), - BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),; + BETWEEN(60, " BETWEEN ", "(between)区间查询(逗号区分)"), + INTERVAL(70, ">=And=< ", "(>= =<)区间查询(逗号区分)"); private int value; private String code; From 0a0727e2fa0e3fff4ea895ab0bdb7247f902557d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 5 Sep 2020 19:01:25 +0800 Subject: [PATCH 04/12] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 2e8bb0e..5ffd60a 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 @@ -6439,7 +6439,7 @@ public class WmsEnumUtil { BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"), BLOB_FORMAT(10, "Blob", "BLOB格式"), CLOB_FORMAT(11, "Clob", "CLOB格式"), - TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式") + TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式"); private int value; private String code; From ba940f9a39b3cffe8e6f23cb274f9c9264d910f7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 6 Sep 2020 16:57:26 +0800 Subject: [PATCH 05/12] =?UTF-8?q?BYPASS=E9=A1=B9=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesBypassMapping.java | 44 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/model/BypassModel.java | 8 +++- .../mes/repository/MesBypassMappingRepository.java | 13 +++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 +++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java new file mode 100644 index 0000000..3bef0b1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.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/9/6 1:25 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BYPASS_MAPPING") +@Api("MES_BYPASS项映射关系") +public class MesBypassMapping extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6362769913660089402L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "BYPASS_SEQ") + @ApiParam("BYPASS项序号") + private Integer bypassSeq; + + @Column(name = "CHECK_NAME") + @ApiParam("检测项描述") + private String checkName; +} 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 2e7cfef..935cbde 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 @@ -21,7 +21,7 @@ public class BypassModel { private String bypassCode; @ApiParam("检测项") - private String businessValue; + private String checkName; @ApiParam("是否确认，1=已确认，2=未确认") private String isVerify; @@ -29,4 +29,10 @@ public class BypassModel { @ApiParam("生产数据ID") private Long productDataId; + @ApiParam("BYPASS项序号") + private Integer bypassSeq; + + @ApiParam("状态") + private String status; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java new file mode 100644 index 0000000..392ba42 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBypassMapping; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/6 1:30 下午 + * @Modify: + */ +public interface MesBypassMappingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 98004a8..7638733 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 @@ -3293,4 +3293,22 @@ public class MesHqlPack { } return packBean; } + + /** + * MES_BYPASS项映射关系 + * + * @param bypassMapping + * @param organizeCode + * @return + */ + public static DdlPackBean getBypassMapping(MesBypassMapping bypassMapping, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(bypassMapping, organizeCode); + if (!StringUtils.isEmpty(bypassMapping.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(bypassMapping.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(bypassMapping.getCheckName())) { + DdlPreparedPack.getStringLikerPack(bypassMapping.getCheckName(), "checkName", packBean); + } + return packBean; + } } From 045babeee1cdb30f4553356e2799dd5f095dfd4d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 6 Sep 2020 19:19:08 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=B7=B2=E7=94=9F=E4=BA=A7=E9=98=9F?= =?UTF-8?q?=E5=88=97=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 0fe8aeb..66a0859 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 @@ -272,7 +272,7 @@ public class QueueOrderModel implements Serializable { //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 partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -288,6 +288,7 @@ public class QueueOrderModel implements Serializable { this.vinCode = vinCode; this.formulaContent = formulaContent; this.queueGroupNo = queueGroupNo; + this.produceCategoryCode = produceCategoryCode; } //getAlreadyQueueOrderModelNoSn From bdf708b73a3866a8b88a590c2f0a38b302402e2f Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 7 Sep 2020 09:07:27 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesSnPhotoRelation.java | 23 +++++++++++++++++++--- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 ++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java index d54028c..cdef2d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java @@ -31,9 +31,9 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable { private static final long serialVersionUID = -3062206473345277360L; @Column(name = "SERIAL_NUMBER") - @ApiParam("条码") - private String serialNumber; - + @ApiParam("过程条码") + private String serialNumber; + //TODO 北京麦格纳使用，如要变更此字段需要更改对应业务代码 @Column(name = "PHOTO_PATH") @ApiParam("照片路径") private String photoPath; @@ -42,4 +42,21 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable { @ApiParam("照片名称") private String photoName; + @Column(name = "PHOTO_URL") + @ApiParam("照片访问地址") + private String photoUrl; + + @Column(name = "PHOTO_ORIGINAL_PATH") + @ApiParam("照片原始路径") + private String photoOriginalPath; + + @Column(name = "PHOTO_TRANSFER_PATH") + @ApiParam("照片转存路径") + private String photoTransferPath; + + @Column(name = "PHOTO_TARGET_PATH") + @ApiParam("照片目标路径") + private String photoTargetPath; + + } 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 7638733..0333bea 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 @@ -3291,6 +3291,21 @@ public class MesHqlPack { if (!StringUtils.isEmpty(snPhotoRelation.getPhotoName())) { DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoName(), "photoName", packBean); } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoPath(), "photoPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoUrl())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoUrl", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoOriginalPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoOriginalPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTransferPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTransferPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTargetPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTargetPath", packBean); + } return packBean; } From b0aba2185989e9707d62b85deb55dd091439e1e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 7 Sep 2020 11:07:41 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=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/andon/bean/AndonAlarmCause.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java index c8767a5..9cb491b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java @@ -34,7 +34,7 @@ public class AndonAlarmCause extends BaseBean implements Serializable { private static final long serialVersionUID = 5837347497945981811L; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java index 91bb41b..e0c6640 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java @@ -47,7 +47,7 @@ public class AndonEventCause extends BaseBean implements Serializable { @AnnoOutputColumn(hidden = true) private String parentEcCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java index c5371c6..2b9dc86 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java @@ -47,7 +47,7 @@ public class AndonEventMethod extends BaseBean implements Serializable { @ApiParam(value = "父阶方法代码") private String parentEmCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; From 6ca0948a5d36b05417f67bc747d5be5a0f09d876 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 7 Sep 2020 15:35:24 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E3=80=9011026=2020011--=E6=9C=89?= =?UTF-8?q?=E5=85=B3=E5=8C=97=E7=BE=8E=E6=94=B6=E8=B4=A7=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4--0910=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 6ef6c90..50cbbdf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -48,7 +48,7 @@ public class WmsActionResponseBean implements Serializable { public String errorMsg; @ApiParam("提示信息") - public String message; + public String message = ""; @ApiParam("列表信息") public List informations; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index b2cd128..21bf580 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -512,6 +512,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "单据") private String orderNo; + @Transient + @ApiParam("物料库位") + private String partLocateNo; + public WmsStockSn() { } From 15d915370e407c9a530314b4d7b398964acefe4a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 7 Sep 2020 19:48:59 +0800 Subject: [PATCH 10/12] =?UTF-8?q?MGN=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 5d51d50..edcf03a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -102,5 +102,11 @@ public class WmsTransType extends BaseBean { } public WmsTransType() { + + } + + public WmsTransType(String transTypeCode, String transTypeName) { + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; } } From 61b87d2d00c3bc07098db4f47408b05d294ff0ae Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 8 Sep 2020 00:50:03 +0800 Subject: [PATCH 11/12] =?UTF-8?q?MGN=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsQCSNErrorList.java | 10 ++++++ .../i3plus/pojo/wms/bean/WmsQCViewReport.java | 40 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java index 4d54afc..f05689d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java @@ -103,4 +103,14 @@ public class WmsQCSNErrorList extends BaseBean { @Column(name = "ERROR_DESC_RDD") @ApiParam("不良描述") private String errorDescRdd; + + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "收货数量", example = "0") + public Double rcQty; + + @Column(name = "QC_SCALE", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "质检比例", example = "0") + public String qcScale; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java new file mode 100644 index 0000000..fc9f032 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java @@ -0,0 +1,40 @@ +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; + +/** + * @Description : MGN质检报表(通过查询视图实现) + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-09-01 14:37 + * @Modify: + **/ +@Data +@Api("质检报表") +public class WmsQCViewReport extends BaseBean { + private static final long serialVersionUID = 4905945381732744790L; + + @ApiParam("单号") + private String orderNo; + + @ApiParam("检验数量") + private double sampleQty; + + @ApiParam("不合格数量") + private double rejectQty; + + @ApiParam("检验员") + private String qcUser; + + @ApiParam(value = "检验时间") + private String qcTime; + + @ApiParam(value = "收货数量") + public Double rcQty; + + @ApiParam(value = "质检比例") + public String qcScale; +} From b8c743896dd0a484b5040c58288e93ca82b88c6f Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 8 Sep 2020 09:23:26 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=8B=86=E8=A7=A3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 2 -- 1 file changed, 2 deletions(-) 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 39063b7..98d4fc0 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 @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; @@ -94,7 +93,6 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE")