From 87611856dd3a3344a827bad3d5de6bae95be8c48 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 29 Oct 2020 13:11:34 +0800 Subject: [PATCH 001/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=A4=9A=E7=BA=A7BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index 8bddf7e..d382a00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -173,6 +173,10 @@ public class WmsPartExtend extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lastQcTime; + @Column(name = "CYCLE_IQC") + @ApiParam(value = "周期内免检", example = "1") + private Integer cycleIqc; + public Integer getQcPassCount() { return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); } From 3dc951c34f804b70e50484d303264e74e501ec5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 29 Oct 2020 14:38:23 +0800 Subject: [PATCH 002/107] =?UTF-8?q?=E3=80=9011964=2019048-=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E6=8A=9B=E5=85=89=E6=8A=A5=E8=A1=A8=E5=8F=98=E6=9B=B4?= =?UTF-8?q?-20201021=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++++++++++ .../mes/model/MgnPaintPolishingReportModel.java | 3 + 2 files changed, 80 insertions(+) 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 a0e0dde..8ca0b5a 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 @@ -7972,4 +7972,81 @@ public class MesEnumUtil { } } + /** + * 不良品处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BAD_HANDLE_TYPE { + BACK_SPRAY(10, "BACK_SPRAY", "返喷"), + SCRAPPED(20, "SCRAPPED", "报废"), + POLISHING(30, "POLISHING", "抛光"), + DETERMIND(40, "DETERMIND", "待定"); + + private int value; + private String code; + private String description; + + BAD_HANDLE_TYPE(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 int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java index 5f7725a..99ff6fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java @@ -39,4 +39,7 @@ public class MgnPaintPolishingReportModel { @ApiParam("组织代码") private String organizeCode; + @ApiParam("不良处理类型") + private String defectActionType; + } From 92fec185b8b67cf5286deab6fd06309baaacd334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 29 Oct 2020 14:45:02 +0800 Subject: [PATCH 003/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#28142909?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 83a6c13..0e24a09 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; 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.Version; +import javax.persistence.*; /** * @Description : 质检单明细信息 @@ -86,4 +83,8 @@ public class WmsQCDetails extends BaseBean { @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; + + @Transient + @ApiParam(value = "供应商编号") + public String vendorNo; } From 692cd283f714480bf5a0bac6467992f02b46f25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 29 Oct 2020 16:27:05 +0800 Subject: [PATCH 004/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF-=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/TjMgnBoardEquipmentMonitorModel.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java new file mode 100644 index 0000000..d19a7bc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class TjMgnBoardEquipmentMonitorModel { + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("横坐标") + private Double xAxes = 0d; + + @ApiParam("纵坐标") + private Double yAxes = 0d; + + @ApiParam("工位状态") + private String workCellStatus; + + @ApiParam("颜色") + private String color; +} From 2db034a7f83a0505affd43e742e4e70f09e3c36e Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Thu, 29 Oct 2020 16:32:54 +0800 Subject: [PATCH 005/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3WMS-ASN=E5=88=B0=E8=B4=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 ++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 33 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 16 ++++++++++ .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 36 +++++++++++++++++++++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++- 5 files changed, 90 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index e2e0255..62ecbd3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -371,6 +371,8 @@ public interface BaseRepository extends JpaReposito boolean isExitByProperty(String[] propertyNames, Object[] values); + boolean isExitByPropertyDemo(String[] propertyNames, Object[] values); + boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values); boolean isExitByHqlWhere(String hqlWhere); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index c55e93f..e7865c2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -651,6 +651,34 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } + + public int findByPropertyCountDemo(String[] propertyNames, Object[] values) { + if(propertyNames.length != values.length){ + throw new IllegalArgumentException("参数错误数量和值个数不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append("select count(*) from " + persistentClass.getName() + " as model where 1=1 "); + for (int i = 0; i < propertyNames.length; i++) { + if(values[i] != null) { + queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString(),Long.class); + for (int i = 0; i < propertyNames.length; i++) { + if(values[i] != null) { + queryObject.setParameter(propertyNames[i], values[i]); + } + } + + try{ + Long count = (Long) queryObject.getSingleResult(); + return count == null ? 0 : count.intValue(); + }catch(NoResultException e){ + return 0; + } + } + @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { if(pager != null){ @@ -1439,6 +1467,11 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public boolean isExitByPropertyDemo(String[] propertyNames, Object[] values) { + return findByPropertyCountDemo(propertyNames, values) > 0; + } + + @Override public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) { return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 64ae284..d8f8ada 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -112,6 +112,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "发货日期") private String sendDate; + @Transient + @ApiParam(value = "实际到货时间") + private String arrDate; + @Column(name = "IS_SN") @ApiParam(value = "是否生成条码", example = "1") public Integer isSn; @@ -177,6 +181,14 @@ public class WmsPOMaster extends BaseBean { private String partNo; @Transient + @ApiParam("需求数量") + private Double qty; + + @Transient + @ApiParam("实收数量") + private Double rcqty; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -211,6 +223,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam("容差") private Integer delayHour; + @Transient + @ApiParam("当前状态") + private String nowStatus; + public WmsPOMaster() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index bc69da7..061704e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -110,6 +110,18 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("计划交货时间") private String planTime; + @Transient + @ApiParam("当前状态") + private String nowStatus; + + @Transient + @ApiParam(value = "实际到货日期") + private String arrDate; + + @Transient + @ApiParam(value = "实际到货时间") + private String arrTime; + @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") private String erpAreaNo; @@ -154,6 +166,16 @@ public class WmsPOMasterDetails extends BaseBean { private Boolean isSet = false; @Transient + @ApiParam("道口，临时使用") + private String dock; + + @Transient + @ApiParam("收货状态，临时使用") + private String receiveStatus; + + + + @Transient @ApiParam("供应商批次字段是否可编辑") private Boolean isDateCodeEdit = true; @@ -279,7 +301,7 @@ public class WmsPOMasterDetails extends BaseBean { } public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, - Double rcQty, Integer itemStatus) { + Double rcQty, Integer itemStatus) { this.orderNo = orderNo; this.erpSrcNo = erpSrcNo; this.partNo = partNo; @@ -287,4 +309,16 @@ public class WmsPOMasterDetails extends BaseBean { this.rcQty = rcQty; this.itemStatus = itemStatus; } + + public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double qty,Double rcQty) { + this.orderNo = orderNo; + this.planDate=planDate; + this.planTime=planTime; + this.qty = qty; + this.rcQty = rcQty; + this.vendorNo=vendorNo; + this.dock=dock; + this.poStatus=poStatus; + } + } 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 bce0e9d..ec0a805 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 @@ -300,7 +300,10 @@ public class WmsHqlPack { DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); } - + if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), + wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } getStringBuilderPack(wmsPOMaster, result); return result; From 762f9d4a9bc9366cfc26e9b15310fda4a8252125 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 29 Oct 2020 18:24:20 +0800 Subject: [PATCH 006/107] =?UTF-8?q?Fix=20bug#12020=2019058-KT=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=88=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 22badef..ad715f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -53,10 +53,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "REF_ITEM") - @ApiParam("关联行号") - public Integer refItem; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") @@ -204,6 +200,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("源单行号") public String srcItem; + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") public String custOrderNo; From 5e8b023fd596572fef3c277d7c36bcb009933c7a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 18:30:29 +0800 Subject: [PATCH 007/107] =?UTF-8?q?=E3=80=9011883=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E9=A2=86=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--1023=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsSuspenStockSync.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java index 0470492..63b30a6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -114,4 +115,31 @@ public class WmsSuspenStockSync extends BaseBean { @ApiParam(value = "物料数据Map") private Map partNameMap; + public String getLocateNoVal() { + return this.locateNo == null ? StringUtils.EMPTY : this.locateNo; + } + + public String getPartNoAVal() { + return this.partNoA == null ? StringUtils.EMPTY : this.partNoA; + } + + public String getPartNoBVal() { + return this.partNoB == null ? StringUtils.EMPTY : this.partNoB; + } + + public Double getQtyAVal() { + return this.qtyA == null ? 0 : this.qtyA; + } + + public Double getQtyBVal() { + return this.qtyB == null ? 0 : this.qtyB; + } + + public String getLotNoAVal() { + return this.lotNoA == null ? StringUtils.EMPTY : this.lotNoA; + } + + public String getLotNoBVal() { + return this.lotNoB == null ? StringUtils.EMPTY : this.lotNoB; + } } From b979a9471c155731289d9ad806b44697d570aeb0 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 20:17:50 +0800 Subject: [PATCH 008/107] =?UTF-8?q?=E3=80=9011883=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E9=A2=86=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--1023=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/wms/bean/WmsSuspenStockSync.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/WmsSuspenStockSync.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java index 63b30a6..05a6e33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -69,7 +69,7 @@ public class WmsSuspenStockSync extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private Double qtyA; - @Column(name = "qty_b") + @Column(name = "QTY_B") @ApiParam(value = "数量B") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private Double qtyB; From dceb9b17a58c52a52c8c62cf9c0c10179d48846e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 29 Oct 2020 21:13:44 +0800 Subject: [PATCH 009/107] =?UTF-8?q?revert(pojo):=E8=BF=98=E5=8E=9Fpom?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 63b7162932117d25b6ec1a99e0a9551c35fe0589 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 29 Oct 2020 22:34:56 +0800 Subject: [PATCH 010/107] =?UTF-8?q?mgn-bj=20=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java | 6 ++++++ .../mes/model/mgn/bj/{BjBoardModel.java => MgnBjBoardModel.java} | 9 +++++++-- .../bj/{BjBoardSeriesModel.java => MgnBjBoardSeriesModel.java} | 2 +- .../estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/CodeRule.java | 2 +- .../estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Document.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Head.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Message.java | 3 ++- .../pojo/mes/model/mgn/bj/{ => edi}/MgnBjJitPlanModel.java | 3 ++- .../pojo/mes/model/mgn/bj/{ => edi}/MgnBjRecipePartsModel.java | 3 ++- .../estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/OptionCode.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Part.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Parts.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Pn.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 16 files changed, 36 insertions(+), 16 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{BjBoardModel.java => MgnBjBoardModel.java} (78%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{BjBoardSeriesModel.java => MgnBjBoardSeriesModel.java} (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/CodeRule.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Document.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Head.java (94%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Message.java (91%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/MgnBjJitPlanModel.java (95%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/MgnBjRecipePartsModel.java (69%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/OptionCode.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Part.java (96%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Parts.java (88%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Pn.java (94%) 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 10cc3b3..d328625 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 @@ -3656,7 +3656,9 @@ public class MesEnumUtil { public enum QUEUE_ORDER_DETAIL_STATUS { NORMAL(10, "正常"), - CLOSE(20, "关闭"); + CLOSE(20, "关闭"), + FINISH(30, "完成"), + OFF_LINE_REWORK(40, "线下返修"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index ca4851d..90569c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -96,6 +96,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { private Integer alreadyLandedNum; @Transient + @ApiParam("当前库存") + private Integer currentStock; + + @Transient @ApiParam("物料名称") private String partName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java index c6aa422..8048ccc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java @@ -28,6 +28,12 @@ public class SkillsUserModel { @ApiParam(value ="工号") private String userEmpNo; + @ApiParam(value ="工位") + private String workCellCode; + + @ApiParam(value ="产线") + private String workCenterCode; + @ApiParam("技能矩阵信息") private List mesUserSkillList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java similarity index 78% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index fee720e..9827255 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -5,6 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description: @@ -13,10 +14,12 @@ import java.util.List; * @Modify: */ @Data -public class BjBoardModel implements Serializable { +public class MgnBjBoardModel implements Serializable { @ApiParam("jsa数量") private Integer jsaQty; + @ApiParam("jsa数量") + private Integer jsaRate; @ApiParam("完成数量") private Integer completeQty; @ApiParam("总数量") @@ -36,6 +39,8 @@ public class BjBoardModel implements Serializable { @ApiParam("x坐标内容") private List xAxisList; + private Map resultMap; + @ApiParam("显示数据") - private List seriesModels; + private List seriesModels; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java index 3b113ee..63c7999 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java @@ -10,7 +10,7 @@ import lombok.Data; * @Modify: */ @Data -public class BjBoardSeriesModel { +public class MgnBjBoardSeriesModel { @ApiParam("名称") private String name; @ApiParam("显示数量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java index 67ed3eb..31a7723 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java index 6ea1cca..24c85fc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java index be1576f..3df8072 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java similarity index 91% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java index 7b7fdc9..6eddfc7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Pn; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java similarity index 95% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java index b1219aa..d56f13a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java similarity index 69% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java index e85a236..1975611 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part; import lombok.Data; import java.util.List; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java index 45c78ff..a3fb79c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java index 63d2725..a1b7261 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java similarity index 88% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java index 6916568..833a28c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java index 9822683..b102a5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; 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 6a6e8bc..e8acac3 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 @@ -241,10 +241,10 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) { - DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) { - DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean); + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getPgCode(), "pgCode", packBean); } if (mesQueueOrder.getQueueType() != null) { DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean); From e6e5982d73d006d739541b1b435cd54dd894138c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 30 Oct 2020 09:00:50 +0800 Subject: [PATCH 011/107] =?UTF-8?q?Fix=20bug#12020=2019058-KT=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=88=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 764d333..1ed5159 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 @@ -14,7 +14,11 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -529,6 +533,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("数量总和") private Double sumQty; + @Transient + @ApiParam("原数量") + private Double srcQty; + public WmsStockSn() { } From 8d91675109b0e6d6d8bf3373d25c2743f0cc1bd7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 30 Oct 2020 09:35:17 +0800 Subject: [PATCH 012/107] =?UTF-8?q?=E3=80=9012155=2020145+=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=82=E6=95=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=BC=96=E7=A0=81=E4=B9=9F=E6=94=AF=E6=8C=81=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=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/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 057846a..0cd559a 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 @@ -2009,7 +2009,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsConfig(WmsConfig wmsConfig) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringLikerPack(wmsConfig.getConfigCode(), "configCode", result); DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result); DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result); DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result); From 2ff6eded6eefee990a6ac768f061162a0c3fd291 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 30 Oct 2020 13:43:57 +0800 Subject: [PATCH 013/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9Oee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/mgn/tj/OeeModel.java | 2 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java index fcf204f..143452c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java @@ -16,6 +16,8 @@ public class OeeModel { private Integer standardTakt; + private Double planOee; + private String color; private Double threshold = 0.03; 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 6a6e8bc..50ba239 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 @@ -708,6 +708,27 @@ public class MesHqlPack { } /** + * MES工步信息查询条件封装 + * + * @param staff + * @return + */ + public static DdlPackBean getStaff(MesStaff staff, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(staff, organizeCode); + if (!StringUtils.isEmpty(staff.getUserCode())) { + DdlPreparedPack.getStringLikerPack(staff.getUserCode(), "userCode", packBean); + } + if (!StringUtils.isEmpty(staff.getUserName())) { + DdlPreparedPack.getStringLikerPack(staff.getUserName(), "userName", packBean); + } + if (!StringUtils.isEmpty(staff.getSkillLevel())) { + DdlPreparedPack.getNumEqualPack(staff.getSkillLevel(), "skillLevel", packBean); + } + + return packBean; + } + + /** * MES工步参数信息查询条件封装 * * @param stepParam From 0d12d01ebfb0db7e9ab341adea804119d26fbbfb Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 30 Oct 2020 17:24:00 +0800 Subject: [PATCH 014/107] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=8A=9F?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index b9aeefa..cfcc146 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -157,6 +157,10 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("BaseModule零件号") private String baseModule; + @Column(name = "QUEUE_GROUP_FLAG") + @ApiParam("分组标识") + private String queueGroupFlag; + public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) { this.partNo = partNo; this.packageNo = packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 9827255..6640422 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -16,12 +16,15 @@ import java.util.Map; @Data public class MgnBjBoardModel implements Serializable { + private Integer qty; @ApiParam("jsa数量") private Integer jsaQty; @ApiParam("jsa数量") private Integer jsaRate; @ApiParam("完成数量") private Integer completeQty; + @ApiParam("完成率") + private Integer completeRate; @ApiParam("总数量") private Integer totalQty; @ApiParam("预警数量") @@ -33,6 +36,9 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("一次合格率") private Integer onceQualityRate = 0; + @ApiParam(value = "显示颜色") + private String color; + @ApiParam("x坐标内容") private String xAxis; From 76a0703bac8b2d99612719ab264714c00b7b39ca Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 30 Oct 2020 17:57:19 +0800 Subject: [PATCH 015/107] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java index b016661..77c1384 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description: MES控制计划-主表 + * @Description: MES控制计划-主表（子表：质量标准MES_QUALITY_STANDARD） * @CreateDate: 2020/9/27 * @Author: simon.song */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java index 7a558d5..7d51b88 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -29,6 +29,6 @@ public class MesBoardWorkCenterOverviewModel { @ApiParam("工单列表") List workOrderList; - @ApiParam("班组列表") + @ApiParam("班组信息") List shiftGroupList; } From 5d41023df6f382d6ce4b960e6c53ca2983eb2414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 30 Oct 2020 18:15:18 +0800 Subject: [PATCH 016/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index d4fc145..04ac902 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -27,6 +27,9 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("实际OEE") private String finaOee; + @ApiParam("OEE红线值") + private String oeeRedLineValue; + @ApiParam("缺陷名称") private String defectName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index f308538..8ad36ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -20,19 +20,19 @@ public class MgnBoardListModel { @ApiParam("当班实际产量") private Double shiftActualYield; - @ApiParam("当前时间分钟") + @ApiParam("时间小时") private String currentMinTime; /** - * 开班时间到当前时间按分钟累计计划数量 + * 开班时间到当前时间按小时累计计划数量 */ - @ApiParam("每分钟计划产量") + @ApiParam("每小时计划产量") private Double minPlanYield; /** - * 开班时间到当前时间按分钟累计实际数量 + * 开班时间到当前时间按小时累计实际数量 */ - @ApiParam("每分钟实际产量") + @ApiParam("每小时实际产量") private Double minActualYield; @ApiParam("计划完成率") From d7092a7f5244bbc70ec8c581a159b0faff4aaef4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 1 Nov 2020 10:25:56 +0800 Subject: [PATCH 017/107] =?UTF-8?q?=E6=80=BB=E8=A3=85=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E4=B8=8D=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 4 +++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 +- .../i3plus/pojo/mes/model/AssembleDefectModel.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/FutrueTaskModel.java | 25 ++++---------- 4 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 566aa9c..cb53973 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -53,4 +53,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("顺序") private Integer seq; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index fa677a8..9a7debb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -379,7 +379,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer endCheckQty; @Transient - @ApiParam("终检数量") + @ApiParam("打包数量") private Integer finalInspectionQty; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java new file mode 100644 index 0000000..837b718 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class AssembleDefectModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("抛光层级model") + private AssembleDefectModel polishingModel; + + @ApiParam("拆解层级model") + private AssembleDefectModel disassembleModel; + + @ApiParam("不良类型集合") + private List defectModelList; + + @ApiParam("类型代码") + private String typeCode; + + @ApiParam("类型名称") + private String typeName; + + @ApiParam("不良集合") + private List defectList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index f1114df..4e8de2f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -1,16 +1,14 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; -import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; /** - * @Description: 条码解绑实体 + * @Description: 异步任务model * @Reference: - * @Author: siliter.yuan + * @Author: wangjie * @CreateDate: 2020-06-28-11:44 * @Modify: **/ @@ -20,15 +18,6 @@ public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; - @ApiParam("工位请求bean") - private StationRequestBean stationRequestBean; - - @ApiParam("产品条码表") - private MesProduceSn produceSn; - - @ApiParam("产品绑定记录表") - private MesProdBindRecord prodBindRecord; - @ApiParam("组织代码") private String organizeCode; @@ -38,12 +27,10 @@ public class FutrueTaskModel { @ApiParam("工作单元代码") private String workCellCode; - @ApiParam("总装批量执行逻辑") - private List requestBeanList; - - @ApiParam("总装批量执行逻辑") - private Object specialBusinessType; - + @ApiParam("数据") + private Object Obj; + @ApiParam("集合") + private List list; } From ade2d60849cfd4a9294b07d0ec7d0d61d9ee81c6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Nov 2020 09:48:59 +0800 Subject: [PATCH 018/107] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java index 837b718..ee6e90b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -18,6 +18,9 @@ public class AssembleDefectModel { @ApiParam("过程条码") private String serialNumber; + @ApiParam("物料号") + private String partNo; + @ApiParam("抛光层级model") private AssembleDefectModel polishingModel; From e68735be83bcaf9125c52a142e2505670837e33c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 2 Nov 2020 10:15:36 +0800 Subject: [PATCH 019/107] =?UTF-8?q?MOVE=5FSN=20=E5=A2=9E=E5=8A=A0=20left?= =?UTF-8?q?=5Fcode=20=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMessageStyleModel.java | 17 +++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 7e1103a..45c5589 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -60,4 +60,21 @@ public class WmsMessageStyleModel implements Serializable { this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } } + + public WmsMessageStyleModel(String message, double transQty, double actQty, boolean showRed) { + this.message = message; + if (actQty == 0) {//未处理 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(); + } else if (transQty > actQty) {//处理中 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + } else if (actQty == transQty) {//处理完成 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } else if (transQty < actQty) {//处理数量大于需求数量-显示红色 + if (showRed) { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CLOSED.getValue(); + } else { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 8772b84..22d79be 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -88,6 +88,11 @@ public class WmsMoveSn extends BaseBean { @ApiParam("批次编号") public String lotNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode = ""; + + @Column(name = "PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; From 143e2f1947d2dd99f1f29350fcaf62afec83e16b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 2 Nov 2020 14:07:49 +0800 Subject: [PATCH 020/107] =?UTF-8?q?=E3=80=9012057=20#20011-----=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E6=B5=81=E7=A8=8B=E6=98=AF=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=92=8Cpo=E6=94=B6=E8=B4=A7=E5=92=8Cpo?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E6=94=B6=E8=B4=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B5=B0=E5=AE=8C=E4=BD=86=E6=98=AF=E8=BF=98=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E9=9C=80=E8=A6=81=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=93=8D=E4=BD=9C=E5=90=8E=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E4=B8=8D=E5=85=81=E8=AE=B8=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=BE=85=E6=8F=90=E4=BA=A4=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E3=80=82=E6=9C=9F=E6=9C=9B=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=97=A5=E6=9C=9F2020/10/31=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/wms/bean/WmsMoveSn.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 22d79be..5f0f6bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -412,9 +412,10 @@ public class WmsMoveSn extends BaseBean { } - public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) { + public WmsMoveSn(String sn, String refSrc,String transTypeCode, String transTypeName, Integer itemStatus) { this.sn = sn; this.refSrc = refSrc; + this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; this.itemStatus = itemStatus; } From 47f464b01de12c991b5b3c9573a18bd9a99e4178 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Mon, 2 Nov 2020 14:27:20 +0800 Subject: [PATCH 021/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 50 +++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index ad715f0..2a3156a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -107,6 +107,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "超时时间(单位:分钟)") private Integer timeOut; + @Transient + @ApiParam(value = "窗口时间") + private Integer windowTime; + + @Transient + @ApiParam(value = "紧急程度") + private String urgentStatus; + @Column(name = "SRC_NO") @ApiParam(value = "源单号") private String srcNo; @@ -123,6 +131,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "完成状态") public Integer orderStatus; + @Transient + @ApiParam(value = "客户名称") + public String custName; + + @Transient + @ApiParam(value = "道口") + public String dock; + /** * 已创建，已收货，已发运，已拣货 */ @@ -134,6 +150,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; + @Transient + @ApiParam(value = "完成数百分比") + private String number; + /** * 是否免费:0=计费,1=免费 */ @@ -285,6 +305,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("生产日期") public String dateCode; + @Transient + @ApiParam("生产线") + public String line; + @ApiParam(value = "散件移库输入移库数量") @Transient public Double inputMoveQty; @@ -420,8 +444,27 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; - public WmsDocMovementDetails () { + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty, + Double recQty,Double outQty,Integer itemStatus) { + this.custNo = custNo; + this.orderNo = orderNo; + this.planDate = planDate; + this.planTime = planTime; + this.qty = qty; + this.pickQty = pickQty; + this.recQty= recQty; + this.outQty = outQty; + this.itemStatus = itemStatus; + this.projectNo = projectNo; + this.partNo=partNo; + } + public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) { + this.createDatetime = createDatetime; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus= itemStatus; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { @@ -485,6 +528,11 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(){ + + } + + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) { this.orderNo = orderNo; this.srcZoneNo = srcZoneNo; From 11748bb19eaa160ca6970dece495856f6c5fdb62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 2 Nov 2020 15:26:34 +0800 Subject: [PATCH 022/107] =?UTF-8?q?=E3=80=9012066=2019048-=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=E5=8F=98=E6=9B=B4-20201024?= =?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/mes/bean/MesProduceSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index c14092e..a024e83 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -229,6 +229,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("维修状态") private Integer repairStatus; + @Transient + @ApiParam("颜色名称") + private String colorName; + public MesProduceSn() { } From 52c35877d81e180cd2ee6e3638bc877ef5c70631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 2 Nov 2020 18:02:44 +0800 Subject: [PATCH 023/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/TJMgnBoardModel.java | 12 ++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 8ded48c..b55ccd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -47,10 +47,22 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("反喷标识") private String reverseSprayMark; + @ApiParam("班次") + private String shiftName; + + @ApiParam("车间配置代码") + private String areaConfigCode; + @ApiParam("列名") private List> headModelList; @ApiParam("列值") private List> headValueModelList; + @ApiParam("不良汇总列名") + private List defectNameList; + + @ApiParam("不良汇总列值") + private List defectValueList; + } 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 08e4739..bd6bf3d 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 @@ -3501,4 +3501,25 @@ public class MesHqlPack { } return packBean; } + + /** + * MES下线报工查询条件封装 + * + * @param productOffLine + * @return + */ + public static DdlPackBean getIfProductOffLine(IfProductOffLine productOffLine) { + DdlPackBean packBean = getAllBaseDataByNormalPro(productOffLine, productOffLine.getOrganizeCode()); + if (!StringUtils.isEmpty(productOffLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getPartNo())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getCreateDateTimeStart()) || !StringUtils.isEmpty(productOffLine.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(productOffLine.getCreateDateTimeStart(), productOffLine.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From f38e41f1ec4b7382390c9e962d9d9d11f68636c5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 2 Nov 2020 18:54:18 +0800 Subject: [PATCH 024/107] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= 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 | 4 +++- 1 file changed, 3 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 d328625..7188498 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 @@ -5347,7 +5347,9 @@ public class MesEnumUtil { BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), - BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"); + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"), + BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"), + BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板"); private String code; private String description; From fb5df5aedf7e269b009b26da5a9f7fbcec77f98f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 2 Nov 2020 20:48:53 +0800 Subject: [PATCH 025/107] =?UTF-8?q?=E7=85=A7=E7=89=87=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 27b6637..95ed07f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -355,7 +355,8 @@ public class MesPcnEnumUtil { UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), - PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); + PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"), + SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes"); private int value; private String code; 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 08e4739..a2de9c8 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 @@ -729,6 +729,24 @@ public class MesHqlPack { } /** + * 产线看板矩阵 + * @param boardLineMatrix + * @param organizeCode + * @return + */ + public static DdlPackBean getBoardLineMatrix(MesBoardLineMatrix boardLineMatrix, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(boardLineMatrix, organizeCode); + if (!StringUtils.isEmpty(boardLineMatrix.getAreaCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(boardLineMatrix.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } + + /** * MES工步参数信息查询条件封装 * * @param stepParam From a844a4d59b3e1f83041bc9972d1ea2cb05358c46 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 2 Nov 2020 22:07:12 +0800 Subject: [PATCH 026/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 5f0f6bb..d34360f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -359,6 +359,42 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; } + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String leftCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) { this.id = id; this.organizeCode = organizeCode; From ab0b8a2af11b48b2a1987bbbabd963a64352857c Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Tue, 3 Nov 2020 14:38:59 +0800 Subject: [PATCH 027/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BFsql=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 2a3156a..a84874b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -109,7 +109,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "窗口时间") - private Integer windowTime; + private String windowTime; @Transient @ApiParam(value = "紧急程度") @@ -318,6 +318,14 @@ public class WmsDocMovementDetails extends BaseBean { private Double snp; @Transient + @ApiParam(value = "订单总数量") + private Integer itemCount; + + @Transient + @ApiParam(value = "完成订单数量") + private Integer completeCount; + + @Transient @ApiParam(value = "条码总数量", example = "1") private Double detailsSnCount; @@ -444,27 +452,32 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; - public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty, - Double recQty,Double outQty,Integer itemStatus) { + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; this.planDate = planDate; this.planTime = planTime; - this.qty = qty; - this.pickQty = pickQty; - this.recQty= recQty; - this.outQty = outQty; this.itemStatus = itemStatus; this.projectNo = projectNo; this.partNo=partNo; } + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + + } - public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) { + + public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.itemStatus= itemStatus; + this.orderNo = orderNo; + this.partNo=partNo; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From c0abb5f994f9facd8e206f66f0f421720935de97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 3 Nov 2020 16:34:38 +0800 Subject: [PATCH 028/107] =?UTF-8?q?=E3=80=9012077=2019048-=E6=B3=A8?= =?UTF-8?q?=E5=A1=91=EF=BC=8C=E5=96=B7=E6=B6=82=EF=BC=8C=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=94=9F=E4=BA=A7=E6=8A=A5=E8=A1=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=97=A0=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5=E5=86=85?= =?UTF-8?q?=E5=AE=B9-20201026=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 48 ++++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 9a7debb..113971f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -363,14 +363,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer isFictive = 2; @Transient - @ApiParam("圈数") - private Integer rounds; - - @Transient - @ApiParam("小车号") - private String smallCarNo; - - @Transient @ApiParam("行颜色") private String rowColor; @@ -390,6 +382,46 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("生产节拍") private Integer takt; + /********************** 动态冗余字段（界面维护大写） *********************************/ + + @Transient + @ApiParam("基准时间") + private String standardDate; + + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("节拍") + private Integer chainSpeed; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + + @Transient + @ApiParam("小车数量") + private Integer smallCarAmount; + + @Transient + @ApiParam("标包") + private Integer standardPackage; + + @Transient + @ApiParam("包规代码") + private String packageGauge; + + @Transient + @ApiParam("反喷标识") + private String reverseSprayMark; + + @Transient + @ApiParam("模具编号集合") + private String mouldCodeList; + + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 46c22020bd33b6c8183848907190eb75dcb20d54 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Nov 2020 16:48:08 +0800 Subject: [PATCH 029/107] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E7=BC=BA=E9=99=B7=E5=A2=9E=E5=8A=A0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BB=A3=E7=A0=81?= 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 ++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 ++ 2 files changed, 4 insertions(+) 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 7188498..4d2d890 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 @@ -815,6 +815,8 @@ public class MesEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 95ed07f..abfa556 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -445,6 +445,8 @@ public class MesPcnEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), From a2cf356516f874d95aa515a2b847e0db6dc948cf Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 3 Nov 2020 17:42:51 +0800 Subject: [PATCH 030/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9mysql=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E7=89=88=E6=9C=AC=20=E5=85=BC=E5=AE=B9mysql8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 337c41d..1551917 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 @@ -1962,7 +1962,9 @@ public class CommonEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval + return "jdbc:mysql://"+host+":"+port+"/"+database+ + "?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true"; } private String getJDBCUrlOracle(String database,String host,Integer port){ From 12224ed8df2f2949e0b93ad0a4a6ff4db3c88642 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Nov 2020 17:54:20 +0800 Subject: [PATCH 031/107] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=20=EF=BC=9AworkCenterCode=20workOrderStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 113971f..8bb9074 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -26,10 +26,13 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}, - uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) - }) +@Table(name = "MES_WORK_ORDER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WO_STATUS") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; From b9fef07d7fdbc11d126b4f500c4a1b2f3e057f51 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Nov 2020 21:37:46 +0800 Subject: [PATCH 032/107] =?UTF-8?q?=E6=80=BB=E8=A3=85=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java index ee6e90b..bbf317e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -15,6 +15,9 @@ public class AssembleDefectModel { @ApiParam("工作中心代码") private String workCenterCode; + @ApiParam("工单号") + private String workOrderNo; + @ApiParam("过程条码") private String serialNumber; From ece1ca4c01b933c6c10584f1da2f24b260075470 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 4 Nov 2020 09:28:44 +0800 Subject: [PATCH 033/107] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=BF=94=E5=9B=9E=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=AD=E8=88=AApcn=E5=8E=9F=E6=9D=90=E6=96=99=E4=B8=8A?= =?UTF-8?q?=E7=BA=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 5 ++++ .../pojo/mes/model/MesAndonManageQueueModel.java | 33 ++++++++++++++++++++++ .../mes/model/MesBoardWorkCenterOverviewModel.java | 2 +- .../mes/model/MesBoardWorkCenterStatusModel.java | 31 ++++++++++++++++++++ .../pojo/mes/model/MesWorkCellStatusModel.java | 15 ++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 +- 7 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index abfa556..312c1f6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1182,7 +1182,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_TYPE { - GET_MES_DATA(1, "pcn获取mes数据"), + GET_MES_DATA(1, "pcn拉取mes数据"), DATA_TO_MES(2, "pcn推送数据至mes"); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 6a01945..ab59fa1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.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; import java.io.Serializable; /** @@ -45,4 +46,8 @@ public class MesShiftGroup extends BaseBean implements Serializable { @Column(name = "SQUAD_LEADER") @ApiParam("班长") private String squadLeader; + + @Transient + @ApiParam("班组数") + private String count; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java new file mode 100644 index 0000000..59a4d30 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * + */ + +/** + * @Description: 中航-工位停线原因（取AndonManageQueue数据） + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesAndonManageQueueModel { + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("故障名称") + private String acDesc; + + @ApiParam("故障来源") + private String workCellNameRdd; + + @ApiParam("安灯类型") + private String alarmDetailNameRdd; + + @ApiParam("事件描述") + private String ecDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java index 7d51b88..586c574 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -30,5 +30,5 @@ public class MesBoardWorkCenterOverviewModel { List workOrderList; @ApiParam("班组信息") - List shiftGroupList; + MesShiftGroup shiftGroup; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java new file mode 100644 index 0000000..41a9001 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 中航-产线状态图 + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesBoardWorkCenterStatusModel { + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("实时节拍") + private String realTimeTakt; + + @ApiParam("工位状态列表") + private List workCellStatusList; + + @ApiParam("工位停线原因") + private List workCellStopLineList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java new file mode 100644 index 0000000..9507a38 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MesWorkCellStatusModel { + + @ApiParam("工位运行状态") + private String cellStatus; + + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 81613fd..f585b43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -106,7 +106,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; From 8a648eab7442012e8dedd5c888ace04d0bff1793 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 4 Nov 2020 10:48:49 +0800 Subject: [PATCH 034/107] =?UTF-8?q?=E6=96=B0=E5=A2=9Emysql=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 ++++++-- 1 file changed, 6 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 1551917..04a5b7f 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 @@ -1962,9 +1962,13 @@ public class CommonEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval + //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST return "jdbc:mysql://"+host+":"+port+"/"+database+ - "?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true"; + "?autoReconnect=true" + + "&useSSL=false" + + "&characterEncoding=utf-8" + + "&allowPublicKeyRetrieval=true" + + "&serverTimezone=CST"; } private String getJDBCUrlOracle(String database,String host,Integer port){ From 250d2fbf14182ec2a86c56b8c34cf865d4104449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 4 Nov 2020 13:40:47 +0800 Subject: [PATCH 035/107] =?UTF-8?q?=E3=80=902932=2011=202.3.3QMES=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index d350c54..77d9324 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -167,6 +167,14 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; + @Transient + @ApiParam("班组") + private String shiftGroup; + + @Transient + @ApiParam("客户名称") + private String custName; + public MesPackage() { } @@ -198,4 +206,16 @@ public class MesPackage extends BaseBean implements Serializable { this.defectActionType = defectActionType; this.createDatetime = createDatetime; } + + public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo, + String packageNo, String lotNo, String custCode, String shiftGroup) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.workOrderNo = workOrderNo; + this.packageNo = packageNo; + this.lotNo = lotNo; + this.custCode = custCode; + this.shiftGroup = shiftGroup; + } } From 67419496cb6fac41d9760ac9d75f1a8884fbbdef Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 4 Nov 2020 14:46:44 +0800 Subject: [PATCH 036/107] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 11 ++++++++++- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 79bb4c4..fc673d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -10,7 +10,11 @@ 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.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单条码信息 @@ -167,6 +171,11 @@ public class WmsMoveSnSnapshot extends SnapshotBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode; + + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") 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 0cd559a..cd0c07a 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 @@ -1373,6 +1373,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { From 2f81a0f35d5c65ed645c18e99ba74125c6779a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 4 Nov 2020 15:09:31 +0800 Subject: [PATCH 037/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java | 11 +++++++++++ .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 11 ++++++++++- .../java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 9 +++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java index e40623b..004561a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + @Data public class MgnBoardAreaYieldModel { @@ -15,4 +17,13 @@ public class MgnBoardAreaYieldModel { @ApiParam("注塑") private MgnBoardListModel injectMoldBoardListModel; + @ApiParam("组装集合") + private List assembleBoardListModelList; + + @ApiParam("涂装集合") + private List paintBoardListModelList; + + @ApiParam("注塑集合") + private List injectMoldBoardListModelList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 8ad36ad..7c6d1aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -38,10 +38,19 @@ public class MgnBoardListModel { @ApiParam("计划完成率") private String planCompleteRate; - @ApiParam("异常数量") + @ApiParam("呼叫异常数量") private Integer exceptQty; + @ApiParam("响应异常数量") + private Integer responseQty; + @ApiParam("正常数量") private Integer normalQty; + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("车间") + private String areaCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index b55ccd2..fcf9501 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -65,4 +66,12 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("不良汇总列值") private List defectValueList; + @Transient + @ApiParam("开始工单") + private String workOrderNoStart; + + @Transient + @ApiParam("结束工单") + private String workOrderNoEnd; + } From 48a678cc16d25b48d44f7f7dc53de374dfabd167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 4 Nov 2020 15:44:25 +0800 Subject: [PATCH 038/107] =?UTF-8?q?=E3=80=9012116=2019048-=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E7=9B=91=E6=8E=A7-=E5=8F=82=E6=95=B0=E4=B8=AD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8F=92=E5=85=A5=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=BE=9D=E6=97=A7=E6=8F=90=E7=A4=BA=E8=BF=87=E7=A8=8B=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=9C=A8=E7=B3=BB=E7=BB=9F=E4=B8=AD=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8-20201030=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 14 +++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 4dc2203..1b131b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -52,7 +52,7 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam("标准包规数量") - private Double partSpecQty; + private Double partSpecQty = 0d; @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") @@ -84,15 +84,15 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private Integer processMatchType; + private Integer processMatchType = 0; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private Integer packageMatchType; + private Integer packageMatchType = 0; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private Integer productMatchType; + private Integer productMatchType = 0; @Column(name = "PPT_CODE") @ApiParam("产品类型代码") @@ -100,7 +100,7 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PART_TRAIT") @ApiParam("物料特性") - private Integer partTrait; + private Integer partTrait = 0; @Column(name = "COLOR_CODE") @ApiParam("颜色代码") @@ -112,11 +112,11 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "SHELVES_AMOUNT") @ApiParam("挂架数") - private Integer shelvesAmount; + private Integer shelvesAmount = 0; @Column(name = "QUANTITY_PER_RACK") @ApiParam("挂架可放零件数") - private Integer quantityPerRack; + private Integer quantityPerRack = 0; @Column(name = "PAINT_TANK_CODE") @ApiParam("供漆罐代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 8bb9074..2286808 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -397,7 +397,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Transient @ApiParam("节拍") - private Integer chainSpeed; + private String chainSpeed; @Transient @ApiParam("小车号") @@ -405,11 +405,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Transient @ApiParam("小车数量") - private Integer smallCarAmount; + private String smallCarAmount; @Transient @ApiParam("标包") - private Integer standardPackage; + private String standardPackage; @Transient @ApiParam("包规代码") From be7f6a4a92db758882db1eb8768c1e1a2c8dc2be Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Wed, 4 Nov 2020 16:10:47 +0800 Subject: [PATCH 039/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 35bcf37..dce7352 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -162,6 +162,10 @@ public class WmsPOMasterDetails extends BaseBean { private String dateCode; @Transient + @ApiParam(value = "颜色控制") + private String color; + + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; From 06c3992b982f0a8094cb0467b05006408bbd23f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 4 Nov 2020 16:21:54 +0800 Subject: [PATCH 040/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 7c6d1aa..5593de3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,4 +53,7 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; + @ApiParam("产线集合") + private List workCenterList; + } From 9bf8018ac14278471bcfb4f689251156079079bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 4 Nov 2020 17:25:03 +0800 Subject: [PATCH 041/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MgnBoardListColorModel.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java new file mode 100644 index 0000000..711d0ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardListColorModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("颜色") + private String color; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 5593de3..cce2193 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -54,6 +54,6 @@ public class MgnBoardListModel { private String areaCode; @ApiParam("产线集合") - private List workCenterList; + private List workCenterList; } From d819821234cb6d448c843149d7809d427da14b0f Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Wed, 4 Nov 2020 17:53:20 +0800 Subject: [PATCH 042/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index a84874b..21110ed 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -470,7 +470,8 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { + public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { + System.out.println("=======参数方法"); this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; @@ -478,6 +479,7 @@ public class WmsDocMovementDetails extends BaseBean { this.itemStatus= itemStatus; this.orderNo = orderNo; this.partNo=partNo; + this.srcZoneNo = srcZoneNo; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From 346a5088ffd4bf2cefeab46f392e685b3847cf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Nov 2020 18:04:00 +0800 Subject: [PATCH 043/107] BUG#12231 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 542301e..6def198 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -16,6 +16,7 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; import java.util.List; +import java.util.Map; /** * @Description : 库存信息 @@ -169,6 +170,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "应有数量") private Double theoryQty; + @Transient + @ApiParam(value = "差异数量MAP") + private Map> differenceQtyMap; + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; @@ -362,4 +367,11 @@ public class WmsStockQuan extends BaseBean { this.partNameRdd = partNameRdd; this.qty = qty; } + public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } From 48c1d2c1c83924f22e3206d00cdba61512eb422d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 4 Nov 2020 21:26:08 +0800 Subject: [PATCH 044/107] =?UTF-8?q?feat(tj)=20=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 04a5b7f..70ebd4e 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 @@ -1961,8 +1961,10 @@ public class CommonEnumUtil { return null; } + + // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest private String getJDBCUrlMySQL(String database,String host,Integer port){ - //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST + // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST return "jdbc:mysql://"+host+":"+port+"/"+database+ "?autoReconnect=true" + "&useSSL=false" + From e775db87fad77b4704944007052dcc7dba14c88c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Nov 2020 21:27:06 +0800 Subject: [PATCH 045/107] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E6=8F=92=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 2286808..116caa0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -84,7 +84,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Column(name = "IS_PULL") @ApiParam("是否投料") - private Integer isPull = 2; + private Integer isPull = 1; @Column(name = "WO_TYPE") @ApiParam("工单类型") From 0be2231995341db4f1d31c60354b501a35bdb0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Nov 2020 10:18:14 +0800 Subject: [PATCH 046/107] =?UTF-8?q?=E3=80=9012238=2019073-=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E6=8A=A5=E8=A1=A8-=E9=80=9A=E7=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A4=B1=E6=95=88=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/andon/sqlpack/AndonHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 9038150..0a111a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -51,6 +51,7 @@ public class AndonHqlPack { public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean); From 85d2f03b55b776739b8d4390f66b34f08c070bd5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 5 Nov 2020 10:44:22 +0800 Subject: [PATCH 047/107] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++++- 1 file changed, 47 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 1d94a09..b70f563 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 @@ -867,7 +867,8 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), - OTHER_OUT(740, "OTHER_OUT", "其它出库"); + OTHER_OUT(740, "OTHER_OUT", "其它出库"), + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"); private int value; private String code; @@ -9290,6 +9291,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * WMS数据库类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_DB_TYPE { + MYSQL(10, "mysql", "mysql"), + SQLSERVER(20, "sqlserver", "sqlserver"); + + private int value; + private String code; + private String description; + + WMS_DB_TYPE(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 String valueOfDescription(int val) { + return valueOf(val); + } + } } From 6aeb6bdddeaf72d6701fc175550a0a8fe6131f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 5 Nov 2020 16:56:41 +0800 Subject: [PATCH 048/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index 04ac902..075da09 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -48,4 +48,7 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("最终良品率") private String finalQualifiedRate; + @ApiParam("不良描述") + private String defectMemo; + } From 0ea3354b70e66a4216d141033a2258ebc4425083 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Thu, 5 Nov 2020 17:09:22 +0800 Subject: [PATCH 049/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E6=97=B6=E9=97=B4=E5=92=8Ccount=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index dce7352..4005ae5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -228,6 +228,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("erp单号") private String erpSrcNo; + @Transient + @ApiParam("汇总数量") + private Double sumQty; + + @Transient + @ApiParam("汇总收货数量") + private Double sumRcQty; + /** * 状态:1=新建,10=收货中,20=收货完成, @@ -326,15 +334,15 @@ public class WmsPOMasterDetails extends BaseBean { this.itemStatus = itemStatus; } - public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double qty,Double rcQty) { + public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double sumQty,Double sumRcQty) { this.orderNo = orderNo; this.planDate=planDate; this.planTime=planTime; - this.qty = qty; - this.rcQty = rcQty; this.vendorNo=vendorNo; this.dock=dock; this.poStatus=poStatus; + this.sumQty = sumQty; + this.sumRcQty = sumRcQty; } } From ae1bb4376469f4701caa87b5d082d2c118942769 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 5 Nov 2020 23:23:01 +0800 Subject: [PATCH 050/107] =?UTF-8?q?mgn-bj=20edi=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 3 +++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 3 ++- .../pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 21 +++++++++++++++++++++ .../i3plus/pojo/mes/model/mgn/bj/edi/Part.java | 5 ----- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 6c046d9..bc61bd2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -74,6 +74,9 @@ public class AndonBoardModel implements Serializable { @ApiParam("图表类型颜色") private String color; + @ApiParam("停线时间比率") + private Integer downtimeRate; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 6b1f00b..8524845 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -202,10 +202,11 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workType = workType; this.orderNo = orderNo; } - public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, String workCenterCode, String workCellCode) { + this.id = id; this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 6640422..c1994c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -31,10 +31,16 @@ public class MgnBjBoardModel implements Serializable { private Integer warnQty; @ApiParam("预警率") private Integer warnRate; + @ApiParam("目标数量") + private Integer targetQty; + @ApiParam("计划　数量") + private Integer planQty; @ApiParam("目标合格率") private Integer targetRate = 0; @ApiParam("一次合格率") private Integer onceQualityRate = 0; + @ApiParam("待生产订单数量") + private Integer waitProduceQty = 0; @ApiParam(value = "显示颜色") private String color; @@ -42,6 +48,21 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("x坐标内容") private String xAxis; + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("班次人数") + private Integer shiftNum; + + @ApiParam("产品位置代码") + private String produceCategoryCode; + + @ApiParam("产品位置名称") + private String produceCtgyName; + + @ApiParam("时段") + private String timeInterval; + @ApiParam("x坐标内容") private List xAxisList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java index a1b7261..50c452d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author Wynne.Lu @@ -57,8 +55,5 @@ public class Part implements Serializable { @ApiParam("Mes物料号") private String partNo; - @ApiParam("单元格编号") - private Map cellNoMap = new HashMap<>(); - } From 08011a57226c79a8a4f5e7909eec17e069362655 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 00:52:16 +0800 Subject: [PATCH 051/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 21110ed..bec1faf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -380,6 +381,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; + @Transient + @ApiParam(value = "处理中/创建中订单总数量") + private Long handleItemCount; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } @@ -412,6 +417,13 @@ public class WmsDocMovementDetails extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public String getLine() { + if (StringUtil.isEmpty(this.line)) { + return ""; + } + return this.line; + } + @Version @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") @@ -470,16 +482,27 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { - System.out.println("=======参数方法"); + public WmsDocMovementDetails (String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String partNo) { this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.itemStatus= itemStatus; this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; this.partNo=partNo; + } + + + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount) { + this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus = itemStatus; + this.orderNo = orderNo; + this.handleItemCount = handleItemCount; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From cd2076d66a2444c4919bbb48f0bea71f5aa860af Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 01:31:09 +0800 Subject: [PATCH 052/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index bec1faf..dc856c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -494,7 +494,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount, String planTime) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -503,6 +503,7 @@ public class WmsDocMovementDetails extends BaseBean { this.itemStatus = itemStatus; this.orderNo = orderNo; this.handleItemCount = handleItemCount; + this.planTime = planTime; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From c0d52b93f71c7b909bb1dd7532c835da23b8fafa Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 02:26:09 +0800 Subject: [PATCH 053/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index dc856c6..d9348ba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -320,7 +320,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "订单总数量") - private Integer itemCount; + private Long itemCount; @Transient @ApiParam(value = "完成订单数量") @@ -381,9 +381,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; - @Transient - @ApiParam(value = "处理中/创建中订单总数量") - private Long handleItemCount; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -494,7 +491,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount, String planTime) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planTime, Long itemCount) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -502,8 +499,8 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; this.itemStatus = itemStatus; this.orderNo = orderNo; - this.handleItemCount = handleItemCount; this.planTime = planTime; + this.itemCount = itemCount; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From 29a5d01620bf42645852f482772730d2c1446fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 6 Nov 2020 18:27:30 +0800 Subject: [PATCH 054/107] BUG#2938 --- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 36 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 12 ++++---- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 0e24a09..2b75be8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,6 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -85,6 +89,38 @@ public class WmsQCDetails extends BaseBean { public transient Integer lockVersion; @Transient + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @Transient @ApiParam(value = "供应商编号") public String vendorNo; + + @Transient + @ApiParam(value = "供应商名称") + public String vendorDesc; + + public WmsQCDetails() { + } + + public WmsQCDetails(String partNo, String partNameRdd, String item, + Double qty, String unit, String orderNo, + Integer itemStatus, String remark, Double factQty, + Double passQty, Double rejectQty, + Integer orderStatus, String vendorNo,String vendorDesc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.qty = qty; + this.unit = unit; + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.remark = remark; + this.factQty = factQty; + this.passQty = passQty; + this.rejectQty = rejectQty; + this.orderStatus = orderStatus; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 8fe824f..60fb5e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -103,8 +103,8 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "供应商全称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", - searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo") - private String VendorDesc; + searchColumnName = "vendorNo,vendorDesc", listColumnName = "vendorNo,vendorDesc", explicitColumnName = "vendorNo") + private String vendorDesc; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @@ -146,10 +146,10 @@ public class WmsQCMaster extends BaseBean { this.partNo = partNo; } - public WmsQCMaster(String orderNo, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + public WmsQCMaster(String orderNo, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { this.orderNo = orderNo; this.vendorNo = vendorNo; - this.VendorDesc = VendorDesc; + this.vendorDesc = vendorDesc; this.refType = refType; this.refSrc = refSrc; this.partNo = partNo; @@ -157,11 +157,11 @@ public class WmsQCMaster extends BaseBean { this.createDatetime = createDatetime; } - public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + public WmsQCMaster(String orderNo, Double qty, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { this.orderNo = orderNo; this.qty = qty; this.vendorNo = vendorNo; - this.VendorDesc = VendorDesc; + this.vendorDesc = vendorDesc; this.refType = refType; this.refSrc = refSrc; this.partNo = partNo; From 2ca398468fab5f65e2b15c34cdfcd1ffcae21d78 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Fri, 6 Nov 2020 19:32:39 +0800 Subject: [PATCH 055/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index d9348ba..21d4aae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -641,4 +641,33 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.planTime = planTime; } + public WmsDocMovementDetails (String erpSrcNo,String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.erpSrcNo = erpSrcNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + } From 77d8aa4bdd58c6267e1d1aadccb057201893af18 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Fri, 6 Nov 2020 21:47:36 +0800 Subject: [PATCH 056/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8B=89=E5=8A=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 74 ++++++++++++++++++++++ .../wms/dbinterface/WmsInterfaceDataRecord.java | 69 ++++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.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 1d94a09..8557749 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 @@ -7321,6 +7321,80 @@ public class WmsEnumUtil { } /** + * 报文校验类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INTERFACE_DATA_VERIFY_STATUS { + INITIAL(10, "INITIAL", "初始化"), + COMPLETED(30, "COMPLETED", "校验完成"), + ERROR(40, "ERROR", "校验出错"); + + private int value; + private String code; + private String description; + + INTERFACE_DATA_VERIFY_STATUS(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 String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 INTERFACE_DATA_VERIFY_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** * 运费单审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java new file mode 100644 index 0000000..7f5f46c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * WMS - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_INTERFACE_DATA_RECORD") +@Api("接口数据收发记录") +public class WmsInterfaceDataRecord extends BaseBean { + private static final long serialVersionUID = 4139055040492108499L; + + @ApiParam("来源表名") + @Column(name = "SRC_TABLE_NAME", length = 50) + public String srcTableName; + + @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔") + @Column(name = "DEST_BEAN_NAME", length = 500) + public String destBeanName; + + @ApiParam("软适配编号") + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + public String interfaceName; + + @ApiParam("报文唯一编号") + @Column(name = "SID") + public Long sid; + + @ApiParam("MOVE_TO_ERP表的ID") + @Column(name = "MOVE_TO_ERP_ID") + public Long moveToErpID; + + @ApiParam("报文校验状态") + @Column(name = "VERIFY_STATUS") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false) + public int verifyStatus; + + @ApiParam("备注信息") + @Column(name = "REMARK") + public String remark; +} From 274191aee2108686aaa4d2e59663ae77522e594e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 7 Nov 2020 00:23:12 +0800 Subject: [PATCH 057/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 21d4aae..1ef109a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -491,7 +491,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planTime, Long itemCount) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planDate, String planTime, Long itemCount) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -499,6 +499,7 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; this.itemStatus = itemStatus; this.orderNo = orderNo; + this.planDate = planDate; this.planTime = planTime; this.itemCount = itemCount; } From 1680314d49b5450f313f4b12564cb2c7dfb49167 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Sat, 7 Nov 2020 13:39:32 +0800 Subject: [PATCH 058/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= 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 | 1 + 1 file changed, 1 insertion(+) 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 b70f563..c92988c 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 @@ -795,6 +795,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"), + BUSI_TYPE_NEW(480, "BUSI_TYPE_NEW", "新增业务类型"), CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"), OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"), ALLOCATION(40, "ALLOCATION", "调拨"), From bc3e94923fc10fa72c1390761c962a2fbacfca6f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 7 Nov 2020 14:16:44 +0800 Subject: [PATCH 059/107] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E7=B1=BB=E5=9E=8B?= 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 | 4 +++- 1 file changed, 3 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 75bb7ae..89b2f51 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 @@ -9373,7 +9373,9 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_DB_TYPE { MYSQL(10, "mysql", "mysql"), - SQLSERVER(20, "sqlserver", "sqlserver"); + SQLSERVER(20, "sqlserver", "sqlserver"), + ORACLE(30, "oracle", "oracle"), + POSTGRESQL(40, "postgresql", "postgresql"); private int value; private String code; From 7162664b79a5d1ca74a579098067da71e2eab97e Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 7 Nov 2020 20:00:27 +0800 Subject: [PATCH 060/107] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0SID=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 7 +++++++ .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 10 +++++++++- .../pojo/wms/repository/WmsInterfaceDataRecordRepository.java | 9 +++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 27e1ab2..d9b5dd4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * WMS - SAP 中间数据库接口映射关系 @@ -177,4 +178,10 @@ public class WmsInterfaceDataMapper extends BaseBean { @ApiParam("接口名称") @Column(name = "INTERFACE_NAME") public String interfaceName; + + /** + * 本次发送报文使用的 SID + */ + @Transient + public Long sid; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 7f5f46c..c060cd6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -28,7 +29,14 @@ import javax.persistence.Table; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_INTERFACE_DATA_RECORD") +@Table(name = "WMS_INTERFACE_DATA_RECORD", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SRC_TABLE_NAME"), + @Index(columnList = "DEST_BEAN_NAME"), + @Index(columnList = "SOFT_ADAPATOR_CODE"), + @Index(columnList = "SID"), + @Index(columnList = "MOVE_TO_ERP_ID") +}) @Api("接口数据收发记录") public class WmsInterfaceDataRecord extends BaseBean { private static final long serialVersionUID = 4139055040492108499L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java new file mode 100644 index 0000000..eea6e36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataRecord; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsInterfaceDataRecordRepository extends BaseRepository { +} From 303fe5907d26a6c90e3dbc2ca765397533568f89 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Sat, 7 Nov 2020 21:59:59 +0800 Subject: [PATCH 061/107] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 5d1e4b0..3c2b908 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -136,6 +136,10 @@ public class WmsZones extends BaseBean { @ApiParam(value = "子存储区列表") private List childList; + @Transient + @ApiParam(value = "库位利用率百分比") + private String Location; + public WmsZones(String zoneNo) { this.zoneNo = zoneNo; } From 679ef67457c0b1b4f1c810886923ea8fc4780364 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 8 Nov 2020 02:04:53 +0800 Subject: [PATCH 062/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../pojo/wms/bean/WmsDocMovementDetails.java | 31 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 6 +++++ 3 files changed, 38 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 89b2f51..674a987 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 @@ -795,7 +795,6 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"), - BUSI_TYPE_NEW(480, "BUSI_TYPE_NEW", "新增业务类型"), CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"), OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"), ALLOCATION(40, "ALLOCATION", "调拨"), @@ -842,6 +841,7 @@ public class WmsEnumUtil { KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + FINISH_PRODUCT_SHPING_NEW(480, "FINISH_PRODUCT_SHPING_NEW", "成品发运-新业务类型"), KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 1ef109a..3d469ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -381,6 +381,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; + @Transient + @ApiParam(value = "实际发运时间") + private String actualPlanTime; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -461,6 +465,15 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; + @Transient + @ApiParam("项目编号") + String prodCfgTypeCode; + + @Transient + @ApiParam("项目名称") + String prodCfgTypeName; + + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; @@ -671,4 +684,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) { } + public WmsDocMovementDetails(String erpSrcNo, String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.erpSrcNo = erpSrcNo; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) { + this.orderNo = orderNo; + this.pickQty = pickQty; + this.prodCfgTypeCode = prodCfgTypeCode; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index d82174b..f115c0a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -359,6 +359,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", this.modifyUser = modifyUser; } + public WmsMoveDetails(String refSrc, String prodCfgTypeCode, String createDatetime) { + this.refSrc = refSrc; + this.prodCfgTypeCode = prodCfgTypeCode; + this.createDatetime = createDatetime; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } From 98fa35c8a0fa103bad89f3135f475f5a2650db00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 8 Nov 2020 15:53:36 +0800 Subject: [PATCH 063/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index 1bbd48f..bf42458 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -74,5 +74,12 @@ public class MesBoardLine extends BaseBean implements Serializable { @ApiParam("最终良品率目标值") private Double planPassYield; + /** + * 是否展示： 1--展示 ，2--不展示 + */ + @Column(name = "IS_DISPLAY") + @ApiParam("是否展示") + private Integer isDisPlay; + } From e19d53de4a4f68ab5e143b8ce6946a1fe5786d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 8 Nov 2020 15:58:30 +0800 Subject: [PATCH 064/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index bf42458..2e75537 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -79,7 +79,7 @@ public class MesBoardLine extends BaseBean implements Serializable { */ @Column(name = "IS_DISPLAY") @ApiParam("是否展示") - private Integer isDisPlay; + private Integer isDisplay; } From 5070fcc8fb0f64874c5895844115eae462cf4133 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 9 Nov 2020 13:11:56 +0800 Subject: [PATCH 065/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E7=9C=8B=E6=9D=BF=20?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=9F=A9=E9=98=B5model=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=A2=86=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java index cb9a30e..4ed3e9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java @@ -21,4 +21,6 @@ public class StaffMatrixModel { private List staffs; + private List leaders; + } From 12074e24a828928f657907994409b5e4a7b5bc1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Nov 2020 14:15:41 +0800 Subject: [PATCH 066/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBoardArea.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/MgnBoardListModel.java | 6 +++ .../mes/repository/MesBoardAreaRepository.java | 14 ++++++ 3 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java new file mode 100644 index 0000000..fcf8e78 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java @@ -0,0 +1,54 @@ +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.ColumnDefault; +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看板车间配置 + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-11-09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_AREA") +@Api("mes看板车间配置") +public class MesBoardArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4592603687011665216L; + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "PLAN_PASS_YIELD", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("目标达成率") + private Double planPassYield; + + @Column(name = "YIELD_DIFF_VALUE", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("上下偏差值") + private Double yieldDiffValue; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index cce2193..486deb5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,6 +53,12 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; + @ApiParam("绿线值") + private Double planPassYield; + + @ApiParam("上下偏差值") + private Double yieldDiffValue; + @ApiParam("产线集合") private List workCenterList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java new file mode 100644 index 0000000..fd1a8de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardArea; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesBoardAreaRepository extends BaseRepository { +} From 39da900ae1549337340acb24bbe5d9f4a5c477b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Nov 2020 15:40:35 +0800 Subject: [PATCH 067/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 486deb5..8bcab46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,11 +53,8 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; - @ApiParam("绿线值") - private Double planPassYield; - - @ApiParam("上下偏差值") - private Double yieldDiffValue; + @ApiParam("颜色") + private String color; @ApiParam("产线集合") private List workCenterList; From 2911abf1934fa69ce8899799dc860f0e3e97cf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 9 Nov 2020 18:06:17 +0800 Subject: [PATCH 068/107] =?UTF-8?q?=E3=80=9012324=2020027-PCN=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86-=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E5=B7=B2=E7=BB=8F=E5=81=9C=E7=BA=BF=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E5=9C=A8=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E7=82=B9=E5=87=BB=E6=9A=82=E5=81=9C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E2=80=9C90003:=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E3=80=901545=E3=80=91=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E5=81=9C=E7=BA=BF=E6=97=B6=E6=89=8D=E5=85=81=E8=AE=B8=E6=9A=82?= =?UTF-8?q?=E5=81=9C[=E8=AF=B7=E6=A3=80=E6=9F=A5]=E2=80=9D-20201109?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfCustOrderData.java | 83 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 4 ++ .../mes/repository/IfCustOrderDataRepository.java | 9 +++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java new file mode 100644 index 0000000..2d8aa20 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +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.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_客户月度订单数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_CUST_ORDER_DATA") +@Api("IF_客户月度订单数据") +public class IfCustOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695346L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("订单数量") + private Integer qty = 0; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Transient + @ApiParam("年度客户月度订单集合") + private List> ifCustOrderDataMap = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 129d45e..cfaf6f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -57,4 +57,8 @@ public class MesCustomer extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "IS_BI_DISPLAY") + @ApiParam("是否BI显示") + private Integer isBiDisplay = 2; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java new file mode 100644 index 0000000..47b1a16 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfCustOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfCustOrderDataRepository extends BaseRepository { +} From 4d5ffce7ac0798bf8681712f831b31b1213760d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 9 Nov 2020 19:21:47 +0800 Subject: [PATCH 069/107] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2933?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6def198..b57e05f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -76,6 +76,10 @@ public class WmsStockQuan extends BaseBean { private Boolean includeZeroStock = false; @Transient + @ApiParam(value = "无差异库存显示") + private Boolean showNoDiffStock = false; + + @Transient @ColumnDefault("0") @ApiParam(value = "库存数量总和") private Double sumQty; From 7dba4e7f322802192d32b49b91008c1bbe4077ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 9 Nov 2020 19:22:50 +0800 Subject: [PATCH 070/107] BUG#12166 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index b8df6db..86f2fe7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -127,6 +127,9 @@ public class WmsLocatePart extends BaseBean { public double getMinValue(){ return this.min ==null?0:this.min.doubleValue(); } + public double getSafetyStockVal(){ + return this.safetyStock ==null?0:this.safetyStock.doubleValue(); + } public WmsLocatePart() { } From d41d14b1125eac124547b65b87b6fdc718d7f79e Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 9 Nov 2020 20:27:55 +0800 Subject: [PATCH 071/107] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20erp=20doc=20no=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/dbinterface/WmsInterfaceDataRecord.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index c060cd6..99798d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -33,7 +33,7 @@ import javax.persistence.Table; @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SRC_TABLE_NAME"), @Index(columnList = "DEST_BEAN_NAME"), - @Index(columnList = "SOFT_ADAPATOR_CODE"), + @Index(columnList = "SOFT_ADAPTOR_CODE"), @Index(columnList = "SID"), @Index(columnList = "MOVE_TO_ERP_ID") }) @@ -43,35 +43,39 @@ public class WmsInterfaceDataRecord extends BaseBean { @ApiParam("来源表名") @Column(name = "SRC_TABLE_NAME", length = 50) - public String srcTableName; + private String srcTableName; @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔") @Column(name = "DEST_BEAN_NAME", length = 500) - public String destBeanName; + private String destBeanName; @ApiParam("软适配编号") - @Column(name = "SOFT_ADAPATOR_CODE") - public String softAdaptorCode; + @Column(name = "SOFT_ADAPTOR_CODE") + private String softAdaptorCode; @ApiParam("接口名称") @Column(name = "INTERFACE_NAME") - public String interfaceName; + private String interfaceName; @ApiParam("报文唯一编号") @Column(name = "SID") - public Long sid; + private Long sid; @ApiParam("MOVE_TO_ERP表的ID") @Column(name = "MOVE_TO_ERP_ID") - public Long moveToErpID; + private Long moveToErpID; @ApiParam("报文校验状态") @Column(name = "VERIFY_STATUS") @ColumnDefault("10") @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false) - public int verifyStatus; + private int verifyStatus; @ApiParam("备注信息") @Column(name = "REMARK") - public String remark; + private String remark; + + @ApiParam("ERP文档编号") + @Column(name = "ERP_DOC_NO") + private String erpDocNo; } From 71e70e9a9453dc4394b749d98e8da1a0f71f4c91 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 9 Nov 2020 20:31:03 +0800 Subject: [PATCH 072/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 3a2c1e7..3fd7418 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -240,6 +240,18 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "不等于库位类型") private Integer notLocateType; + @Transient + @ApiParam(value = "总库位") + private Integer totalQty; + + @Transient + @ApiParam(value = "已用库位") + private Integer usedQty; + + @Transient + @ApiParam(value = "空库位") + private Integer emptyQty; + public WmsLocate() { } From 755d66dbce6287ff562f95206bb43d4fc6137826 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Nov 2020 10:47:29 +0800 Subject: [PATCH 073/107] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E5=81=9C=E7=BA=BF?= =?UTF-8?q?=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8D=95=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E2=80=9C=E5=B7=A1=E6=A3=80=E9=A1=B9=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=98=8E=E7=BB=86=E8=A1=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java index e49d31d..6840515 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -16,7 +16,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description: + * @Description: MES_QC_ORDER_DETAIL表的明细表 * @Reference: * @Author: jessica.chen * @CreateDate: 2019\11\15 10:01 From 7ec1bc61b029ceaba9c4d191d3eb9bacca841a11 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 10 Nov 2020 11:26:32 +0800 Subject: [PATCH 074/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.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/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 3d469ee..3dec39f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -114,7 +114,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "紧急程度") - private String urgentStatus; + private Integer urgentStatus; @Column(name = "SRC_NO") @ApiParam(value = "源单号") From 1ba56bc59a28e9e0436ac18c8d103c526333c512 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Nov 2020 15:24:33 +0800 Subject: [PATCH 075/107] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 37 ++++++++++++++++++++++ .../pojo/mes/model/QcCheckDataResultModel.java | 7 ++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 312c1f6..cee9cc7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3859,6 +3859,43 @@ public class MesPcnEnumUtil { } /** + * 产线管控-过程检验状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROCESS_INSPECTION { + NOT_CREATE(10, "未创建"), + CREATE(20, "创建"), + PROCESS(30, "执行中"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + PROCESS_INSPECTION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 整体检测结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java index 405f089..58803e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,19 +19,19 @@ public class QcCheckDataResultModel { private Integer isFirstCheck; @ApiParam("首检结果") - private List firstCheckResult; + private List firstCheckResult; @ApiParam("是否完成巡检") private Integer isOnSiteCheck; @ApiParam("巡检结果") - private List onSiteCheckResult; + private List onSiteCheckResult; @ApiParam("是否完成尾检") private Integer isEndCheck; @ApiParam("尾检结果") - private List endCheckResult; + private List endCheckResult; public QcCheckDataResultModel() { } From e18b6c727e7ca0b35138782a96c668628f3f1a65 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 10 Nov 2020 17:16:09 +0800 Subject: [PATCH 076/107] =?UTF-8?q?mgn-bj=E5=BC=BA=E5=88=B6=E5=B0=81?= =?UTF-8?q?=E7=AE=B1=E5=AE=8C=E6=88=90=E5=90=8E=E9=87=8D=E7=BD=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index cee9cc7..28db666 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -5974,4 +5974,58 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 预装产线，工位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRE_WORK_CENTER_CODE { + OP10("OP10", "OP10"), + OP20A("OP20a", "OP20a"), + OP20B("OP20b", "OP20b"); + + private String code; + private String description; + + PRE_WORK_CENTER_CODE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static PRE_WORK_CENTER_CODE getByCode(String code) { + for (PRE_WORK_CENTER_CODE workCenterCode : values()) { + if (workCenterCode.getCode().equals(code)) { + return workCenterCode; + } + } + return null; + } + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 2df948207c57d7c243c795aa24afc94f0a9b8630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 10 Nov 2020 17:29:02 +0800 Subject: [PATCH 077/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java index 5380410..f755466 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -39,5 +39,5 @@ public class MesLineFaultRecord extends BaseBean implements Serializable { @Column(name = "FAULT_TIME") @ApiParam("故障时长（分）") - private Double faultTime; + private Long faultTime; } From a300e6e2f8e1e1d533a4c80b24e14471f2eca53b Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 10 Nov 2020 19:30:20 +0800 Subject: [PATCH 078/107] =?UTF-8?q?idoc=20=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20erp=20=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 99798d6..1496c14 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -35,7 +35,8 @@ import javax.persistence.Table; @Index(columnList = "DEST_BEAN_NAME"), @Index(columnList = "SOFT_ADAPTOR_CODE"), @Index(columnList = "SID"), - @Index(columnList = "MOVE_TO_ERP_ID") + @Index(columnList = "MOVE_TO_ERP_ID"), + @Index(columnList = "ERP_DOC_NO") }) @Api("接口数据收发记录") public class WmsInterfaceDataRecord extends BaseBean { @@ -78,4 +79,17 @@ public class WmsInterfaceDataRecord extends BaseBean { @ApiParam("ERP文档编号") @Column(name = "ERP_DOC_NO") private String erpDocNo; + + @ApiParam("ERP状态代码") + @Column(name = "ERP_STATUS_CODE") + private String erpStatusCode; + + @ApiParam("ERP状态描述") + @Column(name = "ERP_STATUS_DESC") + private String erpStatusDesc; + + @ApiParam("ERP最后更新时间") + @Column(name = "ERP_LAST_MODIFY_TIME") + private String erpLastModifyTime; + } From c6031c2f2860f3672b82d7286396746e3e52e432 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 10 Nov 2020 21:33:19 +0800 Subject: [PATCH 079/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 9 ++++++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 2b75be8..f225d01 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -13,7 +11,11 @@ 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.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : 质检单明细信息 @@ -61,6 +63,7 @@ public class WmsQCDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_ITEM_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name = "REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 60fb5e9..f2131f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -54,7 +54,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS") public Integer orderStatus; From 30382c5585ae886c344e2e606dca55c527ed15a9 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 11 Nov 2020 09:38:21 +0800 Subject: [PATCH 080/107] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E5=85=AC=E5=B7=AE?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20=E5=85=AC=E5=B7=AE=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java | 8 ++++---- .../cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index 1df34df..707ff42 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -99,13 +99,13 @@ public class MesQualityStandard extends BaseBean implements Serializable { @ApiParam("检验值类型") private String checkValueType; - @Column(name = "DIFFERENCE_MAX_LIMIT") + @Column(name = "maximum") @ApiParam("公差上限") - private BigDecimal differenceMaxLimit; + private BigDecimal maximum; - @Column(name = "DIFFERENCE_MIN_LIMIT") + @Column(name = "minimum") @ApiParam("公差下限") - private BigDecimal differenceMinLimit; + private BigDecimal minimum; @Column(name = "IS_KEY_CHECK_ITEM") @ApiParam("是否关键检测项") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java index dce1aa2..fc27237 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -70,10 +70,10 @@ public class MesQualityStandardModel { private String checkValueType; @ApiParam("公差上限") - private BigDecimal differenceMaxLimit; + private BigDecimal maximum; @ApiParam("公差下限") - private BigDecimal differenceMinLimit; + private BigDecimal minimum; @ApiParam("是否关键检测项") private Integer isKeyCheckItem; From 5f9d597943a751387de15d87c6c2c5de240dcbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Nov 2020 10:48:28 +0800 Subject: [PATCH 081/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=AF=84=E5=AE=9A=E9=A1=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?DEC->DECEMBER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java index f909fde..13f0eab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java @@ -111,8 +111,8 @@ public class MesBoardMafactAssessment extends BaseBean implements Serializable { @ApiParam("NOV") private String nov; - @Column(name = "DEC") - @ApiParam("DEC") - private String dec; + @Column(name = "DECEMBER") + @ApiParam("DECEMBER") + private String december; } From a1dd0fa36bd1834aec6ac138450f14d86f77067e Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 11 Nov 2020 20:10:11 +0800 Subject: [PATCH 082/107] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B4=A8=E6=A3=80=E5=8D=95=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MesQcOrderDetailRecordModel.java | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java new file mode 100644 index 0000000..e4d935c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesQcOrderDetailRecordModel implements Serializable { + private static final long serialVersionUID = -7216132883079491432L; + + @ApiParam("检测人") + private String createUser; + + @ApiParam("检测时间") + private String createDatetime; + + @ApiParam("质检单号") + private String orderNo; + + @ApiParam("判定结果") + private Integer checkResult = 0; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("检测顺序") + private Integer checkSeq; + + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("是否允许让步") + private Integer isConcession = 0; + + @ApiParam("检验行号") + private Integer itemNo = 0; + +// @ApiParam("产品条码") +// private String serialNumber; + + @ApiParam("数量") + private Integer qty; + + @ApiParam("已检数量") + private Integer finishQty; + + @ApiParam("最大数") + private Double maximum = 0d; + + @ApiParam("最小数") + private Double minimum = 0d; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("数据源") + private String dataSource; + + @ApiParam("检测值类型") + private String checkValueType; + + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam(value = "检测项类型名称") + private String businessTypeName; + +} From d226c27c2beef85b561f8d134032fa256b39132f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 11 Nov 2020 20:15:27 +0800 Subject: [PATCH 083/107] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E9=99=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=8A=9F=E8=83=BD=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 15 ++++++++++----- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 4 +++- .../estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java | 7 ++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index f527605..8b34e26 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 推送信息配置 @@ -60,10 +57,14 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SQL_STR", columnDefinition = "TEXT") private String sqlStr; - @ApiParam("脚本编号") + @ApiParam("数据获取脚本编号") @Column(name = "SCRIPT_NO") private String scriptNo; + @ApiParam("附件文件路径获取脚本编号") + @Column(name = "ATTACH_SCRIPT_NO") + private String attachScriptNo; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") @@ -94,4 +95,8 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "CONTENT_LABEL") private String contentLabel; + // 临时存储 + @ApiParam("附件的文件路径") + @Transient + private String attachFilePath; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index e22e520..b8ef2ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -48,5 +48,7 @@ public class WmsPushLog extends BaseBean{ @ApiParam("推送地址") private String pathUrl; - + @ApiParam("附件地址") + @Column(name = "ATTACH_FILE_PATH") + private String attachFilePath; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 8c7abb5..26a77a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -1,12 +1,8 @@ package cn.estsh.i3plus.pojo.wms.modelbean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; -import java.util.Map; - @Data public class PushMessageModel { @@ -29,5 +25,6 @@ public class PushMessageModel { @ApiParam("工厂代码") private String organizeCode; - + @ApiParam("附件的文件路径") + private String attachFilePath; } From b124db3383af029a99a87c5b8514c3da943af3f6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 11 Nov 2020 20:20:16 +0800 Subject: [PATCH 084/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java | 7 +++++++ 2 files changed, 12 insertions(+) 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 674a987..7effd9e 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 @@ -1891,6 +1891,11 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java index d565516..065e3b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -58,6 +58,9 @@ public class WmsQCStatusModel { @ApiParam("标准质检时间") private Double stdCheckTime; + @ApiParam("质检时长") + private long qcCostTime; + public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) { this.asnOrderNo = asnOrderNo; this.qcOrderNo = qcOrderNo; @@ -68,4 +71,8 @@ public class WmsQCStatusModel { this.proportion = proportion; this.stdCheckTime = stdCheckTime; } + + public WmsQCStatusModel() { + + } } From 7b8597dde41b53330c4e0e21f9d67d62a2e66ae9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Nov 2020 13:25:54 +0800 Subject: [PATCH 085/107] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index f225d01..3c9b438 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -106,6 +106,28 @@ public class WmsQCDetails extends BaseBean { public WmsQCDetails() { } + public WmsQCDetails(String organizeCode, String partNo, String partNameRdd, String item, + Double qty, String unit, String orderNo, + Integer itemStatus, String remark, Double factQty, + Double passQty, Double rejectQty, + Integer orderStatus, String vendorNo, String vendorDesc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.qty = qty; + this.unit = unit; + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.remark = remark; + this.factQty = factQty; + this.passQty = passQty; + this.rejectQty = rejectQty; + this.orderStatus = orderStatus; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + } + public WmsQCDetails(String partNo, String partNameRdd, String item, Double qty, String unit, String orderNo, Integer itemStatus, String remark, Double factQty, From 2d9521e4122033ecee306474bf3fd41b9846342a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Nov 2020 15:17:52 +0800 Subject: [PATCH 086/107] BUG#12166 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index f527605..73bccbf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -12,6 +12,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.util.List; +import java.util.Map; /** * @Description : 推送信息配置 @@ -64,6 +66,10 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_NO") private String scriptNo; + @ApiParam("脚本入参") + @Column(name = "SCRIPT_PARAM") + private String scriptParam; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") @@ -94,4 +100,5 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "CONTENT_LABEL") private String contentLabel; + } From 7b6b97c1b7a6154c5a0550e82f93d98c98efe66e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 12 Nov 2020 16:56:31 +0800 Subject: [PATCH 087/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 6 ++++++ .../estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 19 +++++++++++++++++++ .../estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 20 +++++++++++++++++++- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index c7cdeb4..d5e92b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -77,4 +77,10 @@ public class MesDefect extends BaseBean implements Serializable { this.defectType = defectType; this.defectTypeName = defectTypeName; } + + public MesDefect(String defectType, String defectCode, String defectName) { + this.defectType = defectType; + this.defectCode = defectCode; + this.defectName = defectName; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index e7ae500..bd1dd11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -105,7 +105,26 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("缺陷类型名称") private String defectActionTypeName; + @Transient + @ApiParam("缺陷数量") + private Integer defectQty; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } + + public MesDefectRecord() { + + } + + public MesDefectRecord(String partNo, String partName, String workOrderNo, String defectActionType, + String defectCode, String defectName, Integer defectQty) { + this.partNo = partNo; + this.partName = partName; + this.workOrderNo = workOrderNo; + this.defectActionType = defectActionType; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectQty = defectQty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index fcf9501..c77b789 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -5,12 +5,13 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Transient; +import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Map; @Data -public class TJMgnBoardModel extends BaseBean { +public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("工单号") private String workOrderNo; @@ -21,6 +22,12 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("物料名称") private String partNameRdd; + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("条码数量") + private Integer snQty; + @ApiParam("颜色") private String partColor; @@ -74,4 +81,15 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("结束工单") private String workOrderNoEnd; + public TJMgnBoardModel() { + } + + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.workOrderNo = workOrderNo; + this.snQty = snQty; + } + } From fddd66796bace4045c6f1c622b34b19dc52cec7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 12 Nov 2020 17:41:31 +0800 Subject: [PATCH 088/107] =?UTF-8?q?=E3=80=9012276=2020027-PCN=E7=AB=AF=20-?= =?UTF-8?q?=20=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C-=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=87=8C=E9=9D=A2=E7=BB=B4=E6=8A=A4=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8E=BB=E7=94=9F=E6=88=90=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20-20201105=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/sqlpack/MesPcnHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index f585b43..a960c29 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -437,6 +437,8 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); } + DdlPreparedPack.getStringLikerPack(mesPackage.getLotNo(), "lotNo", packBean); + // 时间段查询 DdlPreparedPack.timeBuilder( mesPackage.getCreateDateTimeStart(), From 5f6a7c9a98e73bb84f8d37a699507540a75cd54b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Nov 2020 18:42:26 +0800 Subject: [PATCH 089/107] =?UTF-8?q?Fix=20bug#12380=2019048-=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91BOM=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index c276781..a2488f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 全量BOM @@ -103,4 +104,15 @@ public class WmsBomTotal extends BaseBean { public boolean hasChild() { return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD); } + + /** + * 导入列 + */ + @Transient + @ApiParam(value = "行数") + private Integer rows; + + @Transient + @ApiParam(value = "状态") + private Integer status; } From 86998e109ed4bb174195d7962340204d5c8370b5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Nov 2020 20:38:38 +0800 Subject: [PATCH 090/107] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java index 931906d..4cc7cf7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -42,4 +42,7 @@ public class DismantleRecordModel { @ApiParam("不良集合") private List defectList; + + @ApiParam("返修工位标志") + private String repairFlag; } From 89bf22521a4f93c0ac79cf8383c92ec8931e5004 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 13 Nov 2020 10:11:10 +0800 Subject: [PATCH 091/107] =?UTF-8?q?Fix=20bug#12380=2019048-=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91BOM=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 7effd9e..1d731cd 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 @@ -2349,6 +2349,21 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + 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 String valueOfDescription(int val) { + return valueOf(val); + } + } /** From cea2d334e307034ad7d9cb525100295fd1f64598 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 13 Nov 2020 14:56:35 +0800 Subject: [PATCH 092/107] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=85=AC=E5=B7=AE=E4=B8=8A=E7=BA=BF=E5=92=8C=E5=85=AC=E5=B7=AE?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java | 15 +++++++++------ .../i3plus/pojo/mes/model/MesQualityStandardModel.java | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index 707ff42..88a7573 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -69,11 +70,11 @@ public class MesQualityStandard extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String isConcession; + private Integer isConcession; @Column(name = "CHECK_INTERVAL") @ApiParam("间隔时间") - private String checkInterval; + private Integer checkInterval = 0; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @Column(name = "NUMBER_FLAG") @@ -99,13 +100,15 @@ public class MesQualityStandard extends BaseBean implements Serializable { @ApiParam("检验值类型") private String checkValueType; - @Column(name = "maximum") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公差上限") - private BigDecimal maximum; + private Double maximum = 0d; - @Column(name = "minimum") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公差下限") - private BigDecimal minimum; + private Double minimum = 0d; @Column(name = "IS_KEY_CHECK_ITEM") @ApiParam("是否关键检测项") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java index fc27237..8a023f4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -45,10 +45,10 @@ public class MesQualityStandardModel { private String checkFrequency; @ApiParam("是否允许让步") - private String isConcession; + private Integer isConcession; @ApiParam("间隔时间") - private String checkInterval; + private Integer checkInterval; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @ApiParam("个数标识") @@ -70,10 +70,10 @@ public class MesQualityStandardModel { private String checkValueType; @ApiParam("公差上限") - private BigDecimal maximum; + private Double maximum; @ApiParam("公差下限") - private BigDecimal minimum; + private Double minimum; @ApiParam("是否关键检测项") private Integer isKeyCheckItem; From 84986eb644ad991d179383121e36df024ad91417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 13 Nov 2020 15:51:12 +0800 Subject: [PATCH 093/107] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index cfcc146..90d847f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -168,4 +168,13 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.workCenterCode = workCenterCode; this.qcStatus = qcStatus; } + + public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.packageNo = packageNo; + this.itemQty = itemQty; + this.createDatetime = createDatetime; + } } From c6a3428cbe4967350426a05480ad5386a4cd63c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 13 Nov 2020 17:52:10 +0800 Subject: [PATCH 094/107] =?UTF-8?q?=E3=80=9012420=2019048=20=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E4=BA=8C=E6=A3=80=E5=A2=9E=E5=8A=A0UNPACK=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=2020201112=E3=80=91=2012391=2019048-=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A5=E6=89=93(=E5=8C=85=E8=A3=85)=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E8=81=94=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6-20201112=20=E5=BC=80=E7=BA=BF=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index a960c29..37bdaec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -437,7 +437,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); } - DdlPreparedPack.getStringLikerPack(mesPackage.getLotNo(), "lotNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean); // 时间段查询 DdlPreparedPack.timeBuilder( From 058bd05b4ac8142ff76d3e055f2b4e1b3c91bd20 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 13 Nov 2020 22:28:39 +0800 Subject: [PATCH 095/107] =?UTF-8?q?mgn-bj=20esop=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 2 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 3 +- .../pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 4 +++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index bc61bd2..a8890ef 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -75,7 +75,7 @@ public class AndonBoardModel implements Serializable { private String color; @ApiParam("停线时间比率") - private Integer downtimeRate; + private String downtimeRate; public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 28db666..fc5f9a9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -6028,4 +6028,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 9f15432..e79dec4 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 @@ -356,9 +356,10 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, + public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, String partNo, String prodCfgTypeCode) { this.id = id; + this.orderNo = orderNo; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index c1994c1..ebc4348 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -41,6 +41,10 @@ public class MgnBjBoardModel implements Serializable { private Integer onceQualityRate = 0; @ApiParam("待生产订单数量") private Integer waitProduceQty = 0; + @ApiParam("低于安全库存") + private Integer minStockQty; + @ApiParam("超出最大库存") + private Integer maxStockQty; @ApiParam(value = "显示颜色") private String color; From e3e4e1fc841e863b842367798442f3b69bbb6c5c Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 14 Nov 2020 18:39:38 +0800 Subject: [PATCH 096/107] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 10 ++++++++++ 1 file changed, 10 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 94e14e5..37d66bb 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 @@ -362,4 +362,14 @@ public class WmsPart extends BaseBean { this.snp = snp; this.partSpec = partSpec; } + + public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) { + this.partNo = partNo; + this.partName = partName; + this.partSpec = partSpec; + this.snp = snp; + this.buyUnit = buyUnit; + this.snControl = snControl; + this.qty = qty; + } } From fa01ec478addd530d24b45cc4558bf243ea59797 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 16 Nov 2020 10:25:34 +0800 Subject: [PATCH 097/107] =?UTF-8?q?Mes=5FPackage=20=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 77d9324..770fcc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -23,7 +23,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +@Table(name = "MES_PACKAGE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "WORK_ORDER_NO"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "IS_SEALED") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) From cbd0b1f1361396249c70506c511e738bfbabb50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Nov 2020 14:44:42 +0800 Subject: [PATCH 098/107] BUG#12496 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.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/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index fd5b258..bcfd661 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -65,7 +65,7 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_PARAM") private String scriptParam; - @ApiParam("附件文件路径获取脚本编号") + @ApiParam("附件脚本编号") @Column(name = "ATTACH_SCRIPT_NO") private String attachScriptNo; From 4c1add6ba4d074352bc091da250b6c9e15aa7dfc Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 16 Nov 2020 14:56:33 +0800 Subject: [PATCH 099/107] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.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/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 28db666..458a3cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3864,7 +3864,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROCESS_INSPECTION { NOT_CREATE(10, "未创建"), - CREATE(20, "创建"), + CREATE(20, "已创建"), PROCESS(30, "执行中"), COMPLETE(40, "完成"); From 4300201f99318ca4f13d9680430ed3c160d6943f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Nov 2020 15:48:44 +0800 Subject: [PATCH 100/107] BUG#12430,12495 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 4005ae5..89f6ed4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -324,11 +324,13 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; this.erpSrcNo = erpSrcNo; + this.item = item; this.partNo = partNo; + this.partNameRdd = partNameRdd; this.qty = qty; this.rcQty = rcQty; this.itemStatus = itemStatus; From 928c643031604d978ca813ae1b6cd8793cd91de0 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 16 Nov 2020 16:37:50 +0800 Subject: [PATCH 101/107] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 dac64cf..10d429d 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 @@ -3540,4 +3540,24 @@ public class MesHqlPack { } return packBean; } + + /** + * MES_看板自定义参数配置查询条件封装 + * + * @param boardCustomParamCfg + * @return + */ + public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) { + DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean); + } + return packBean; + } } From dc3e344f1159a86d2a35570dc17dffdbb67253d4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Nov 2020 15:57:26 +0800 Subject: [PATCH 102/107] =?UTF-8?q?Fix=20bug#12401=2019048-=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=94=AF=E6=8C=81=E5=85=B3=E8=81=94=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA470=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 3dec39f..cb532b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -696,10 +696,23 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } - public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) { + public WmsDocMovementDetails(String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + + public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode, String custNo) { this.orderNo = orderNo; this.pickQty = pickQty; this.prodCfgTypeCode = prodCfgTypeCode; + this.custNo = custNo; } } From 8d0e2b942b6a5f1e12780786e7b77ad6951f34ac Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 16:54:47 +0800 Subject: [PATCH 103/107] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 6 +- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackage | 81 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesContainerLocation | 44 ++++++++++++ .../i3plus/pojo/mes/bean/MesCustomerSnRule.java | 60 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 5 ++ .../i3plus/pojo/mes/bean/MesDefectLocation.java | 39 +++++++++++ .../i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++ .../pojo/mes/bean/MesPartContainerCapacity.java | 48 +++++++++++++ .../pojo/mes/bean/MesProduceCtgyPicture.java | 4 ++ .../repository/MesContainerLocationRepository.java | 16 +++++ .../repository/MesCustomerSnRuleRepository.java | 16 +++++ .../MesPartContainerCapacityRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 65 +++++++++++++++++ 13 files changed, 403 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 863a6fd..1023d06 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -25,7 +25,7 @@ import java.io.Serializable; @Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) - } +} ) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { @@ -35,6 +35,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage new file mode 100644 index 0000000..ec64f3a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage @@ -0,0 +1,81 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +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; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE") +@Api("料箱表") +public class IfPackage extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9099416791684702129L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; + + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation new file mode 100644 index 0000000..89a8a11 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation @@ -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 : MES_容器位置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 17:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_LOCATION") +@Api("MES_容器位置") +public class MesContainerLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = 8181007288150974903L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "LOCATION_CAPACITY") + @ApiParam(value = "默认容量") + private String locationCapacity; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java new file mode 100644 index 0000000..5d11d7c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -0,0 +1,60 @@ +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 : MES_客户条码规则 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_SN_RULE") +@Api("MES_客户条码规则") +public class MesCustomerSnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -3928160156339420471L; + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam(value = "长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam(value = "起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam(value = "至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam(value = "内容1") + private String fix1; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index d5e92b6..fb61ecb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Column(name = "DEFECT_FLAG_VALUE") @ApiParam("缺陷标识值") private String defectFlagValue; @@ -67,6 +71,7 @@ public class MesDefect extends BaseBean implements Serializable { @Transient @ApiParam("缺陷类型子集") private List mesDefectList; + public MesDefect() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java new file mode 100644 index 0000000..7bffe76 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java @@ -0,0 +1,39 @@ +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: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\13 09:59 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_LOCATION") +@Api("产品缺陷位置") +public class MesDefectLocation extends BaseBean implements Serializable { + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷位置名称") + private String defectName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..f8e410d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java new file mode 100644 index 0000000..6b864cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -0,0 +1,48 @@ +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; + +/** + * @Description : MES_产品容器容量配置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CONTAINER_CAPACITY") +@Api("MES_产品容器容量配置") +public class MesPartContainerCapacity extends BaseBean { + + private static final long serialVersionUID = 6438819635320965628L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "CT_QTY") + @ApiParam(value = "容量") + private Integer ctQty; +} \ No newline at end of file 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 ba53ce5..b18781d 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 @@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("面位") private String sideLocation; + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + @Column(name = "FILE_ID") @ApiParam("文件id") private Long fileId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java new file mode 100644 index 0000000..1118c74 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesContainerLocationRepository extends BaseRepository { +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java new file mode 100644 index 0000000..379d160 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesCustomerSnRuleRepository extends BaseRepository { +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java new file mode 100644 index 0000000..3d65339 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesPartContainerCapacityRepository extends BaseRepository { +} \ No newline at end of file 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 10d429d..abe8e5e 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 @@ -730,6 +730,7 @@ public class MesHqlPack { /** * 产线看板矩阵 + * * @param boardLineMatrix * @param organizeCode * @return @@ -3560,4 +3561,68 @@ public class MesHqlPack { } return packBean; } + + + /** + * MES容器位置查询条件封装 + * + * @param mesContainerLocation + * @return + */ + public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode()); + if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES产品容器容量配置查询条件封装 + * + * @param mesPartContainerCapacity + * @return + */ + public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES客户条码规则查询条件封装 + * + * @param mesCustomerSnRule + * @return + */ + public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode()); + if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean); + } + return packBean; + } } From eb7ed898df75cdb7e6533356b297d24f80d1a0c6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:10:26 +0800 Subject: [PATCH 104/107] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation index 89a8a11..0c12f1d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") -@Api("MES_容器位置") +@Api("MES_容器位置") public class MesContainerLocation extends BaseBean implements Serializable { private static final long serialVersionUID = 8181007288150974903L; From f1fedb53f4a8be438cbb020bb575c03b88a65d71 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:14:13 +0800 Subject: [PATCH 105/107] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/{MesContainerLocation => MesContainerLocation.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesContainerLocation => MesContainerLocation.java} (97%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java similarity index 97% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java index 0c12f1d..89a8a11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") -@Api("MES_容器位置") +@Api("MES_容器位置") public class MesContainerLocation extends BaseBean implements Serializable { private static final long serialVersionUID = 8181007288150974903L; From 785e8dbfe888296fd6a91a5691e54a16796c466d Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:32:21 +0800 Subject: [PATCH 106/107] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java index 7fd2655..bd948bd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; /** * @Author: Wynne.Lu From 61638c391a5300f2b3600248f213a37a723179f0 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:33:57 +0800 Subject: [PATCH 107/107] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=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/mes/bean/MesPackageDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 16cf9c5..8315005 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber;