From eef6f8e18be71d9f2c4da11bfd8992a3f3dd1ac8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 7 May 2021 18:49:26 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=20=E6=B3=B0?= =?UTF-8?q?=E5=9B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/mes/bean/MesHolidayVacation.java | 42 ++++++++++++++++++++++ .../repository/MesHolidayVacationRepository.java | 13 +++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 39e23fe..882c57a 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 @@ -2100,7 +2100,8 @@ public class MesEnumUtil { MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_JISA(640, "jisaExcelService", "JISA导入"), - MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"); + MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), + MES_HOLIDAY_VACATION(650, "holidayVacationExcelService", "节假日导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java new file mode 100644 index 0000000..e1b40ba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java @@ -0,0 +1,42 @@ +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.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 2:55 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_HOLIDAY_VACTION") +@Api("节假日") +public class MesHolidayVacation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1620451254243818560L; + @Column(name = "YEAR") + @ApiParam("年") + private String year; + + @Column(name = "MONTH") + @ApiParam("月") + private String month; + + @Column(name = "DAY") + @ApiParam("日") + private String day; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java new file mode 100644 index 0000000..561c2f2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.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.MesHolidayVacation; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/5/7 4:44 PM + * @Modify: + */ +public interface MesHolidayVacationRepository extends BaseRepository { +} From 3dd67766b25c1d9567f87bf4b457006d068044f4 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 7 May 2021 19:31:22 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index c29893b..eddc7c7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -48,7 +48,7 @@ public class Work extends BaseAPS { @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") - @FieldAnnotation(property = false) + @FieldAnnotation(display = false) private ApsEnumUtil.WORK_TYPE workType; @Column(name="count", columnDefinition = "decimal(18,8)") @@ -165,7 +165,7 @@ public class Work extends BaseAPS { // private Long dynSplitWorkId; @Column(name="ORIGIN_WORK_ID") - @ApiParam(value ="动态拆分前工作ID") + @ApiParam(value ="动态拆分工作ID") private Long originWorkId; private transient boolean hasOptimized = false; 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 485e93d..a74762b 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 @@ -669,13 +669,14 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_SORT_RULE { - ORDER_LET("ORDER_LET", "订单交货期"), + ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"), ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), ORDER_EST("ORDER_EST", "订单最早开始时刻"), ORDER_COUNT("ORDER_COUNT", "订单数量"), ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"), ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"), ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"), + ORDER_CODE("ORDER_CODE", "订单编码"), NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"), REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"), MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"), @@ -685,7 +686,7 @@ public class ApsEnumUtil { HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"), WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"), TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"), - TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"), + TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单编码"), TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"), CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); From 3e0df2027394fcdaad9f001b2aa2aa9b8c9d6c6d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 8 May 2021 10:15:45 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=9015693=2019108+=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=87=BA=E5=BA=93=E5=8D=95-=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86-=E5=8F=8C=E5=87=BB-?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=AD=90=E8=A1=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9Ewms=5Fstock=5Fsn.package=5Fno?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA+0506=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index abae0c0..9833571 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 移库单条码表 @@ -96,6 +100,9 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "目标库位代码") public String destLocateNo; + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; @Transient @ApiParam("前端表格编辑使用") From 49f709959db8920a00cd5333efc5a5453fcf25c3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 8 May 2021 13:10:18 +0800 Subject: [PATCH 4/8] =?UTF-8?q?15711=2019081-=E9=82=AE=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E9=86=92=E5=86=85=E5=AE=B9=E6=AF=8F=E4=B8=80=E6=9D=A1=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E5=A2=9E=E5=8A=A0=E6=8D=A2=E8=A1=8C=E5=92=8C=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 882c57a..f4df909 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 @@ -2101,7 +2101,7 @@ public class MesEnumUtil { MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_JISA(640, "jisaExcelService", "JISA导入"), MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), - MES_HOLIDAY_VACATION(650, "holidayVacationExcelService", "节假日导入"); + MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"); private int value; private String service; From a0f6fa5a7ef8937be65883cfca72eee596223526 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sat, 8 May 2021 17:19:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?15609=2020135--=E4=BA=A7=E5=93=81=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E8=BF=87=E7=A8=8B=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?--=E3=80=8B=E7=BC=BA=E9=99=B7=E4=BF=A1=E6=81=AF--=E3=80=8B?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE--2021-04-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java index 97085b3..bc450c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 产品履历报表-缺陷信息 + * * @author yumingxing * @version 1.0 * @date 2020/12/18 15:16 @@ -51,8 +52,11 @@ public class DefectRecordModel implements Serializable { @ApiParam(value = "扫描时间") public String createDatetime; + @ApiParam(value = "图片路径") + private String pictureUrl; - public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) { + + public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime, String pictureUrl) { this.workCenterName = workCenterName; this.processName = processName; this.qcStatus = qcStatus; @@ -62,5 +66,6 @@ public class DefectRecordModel implements Serializable { this.serialNumber = serialNumber; this.createUser = createUser; this.createDatetime = createDatetime; + this.pictureUrl = pictureUrl; } } From 23e5b87cebb7626bbc90d92bdfe29a5f9320f50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 10 May 2021 13:38:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=9015607=2020027-PCN=E7=AB=AF=20-=20?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C-=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=A1=E6=95=B0=20-20210429=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 0593668..78c3128 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -123,6 +123,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("任务单类型") private String checkOrderType; + @Column(name = "ON_SITE_FREQUENCY") + @ApiParam("巡检次数") + private Integer onSiteFrequency = 0; + @Deprecated @ApiParam(value = "检测结果") @Transient From 7a4ab204836121c958468addeae32d06bf040771 Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Mon, 10 May 2021 15:08:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=A6=81=E7=94=A8=E5=92=8C=E5=90=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java index 6e7cc79..874d299 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -22,6 +22,7 @@ public class MdmHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean); return ddlPackBean; } From 177cdd0b6eb94b2c9ff40ecdea5d019e009e1541 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 11 May 2021 09:17:55 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AE=B9=E5=99=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/WmsStockSn.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6d97bc5..31b6863 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 @@ -237,10 +237,10 @@ public class WmsStockSn extends BaseBean { // @ApiParam(value = "乐观锁", example = "1") // public Integer lockVersion; - @ApiParam("托盘(容器)类型编号") - @Column(name = "CT_CODE") + @ApiParam("容器编号") + @Column(name = "CT_NO") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String ctCode; + private String ctNo; @ApiParam(value = "仓库名称") @Transient