From dd000b33a313792b360b7b11374c3b2390511691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 27 Apr 2021 16:16:23 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E3=80=9015573=2020027-PCN=E7=AB=AF=20-?= =?UTF-8?q?=20=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C-=20WMS=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=B0=86=E6=95=B0=E6=8D=AE=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E4=BA=86=E4=B8=AD=E9=97=B4=E6=8E=A5=E5=8F=A3=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E4=BD=86MES=E8=BF=98=E6=9C=AA=E7=94=9F=E6=88=90=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=20-20210429?= =?UTF-8?q?=E3=80=91=20=E3=80=9015546=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF-?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8-?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=92=8C=E7=8F=AD=E9=95=BF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF-20210421=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 514a5bc..0593668 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -163,4 +163,12 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient @ApiParam("质检单集合") private List orderNoList; + + @Transient + @ApiParam("控制计划编号") + private String controlPlanId; + + @Transient + @ApiParam("班组") + private String shiftGroupName; } From f20e000957a3a9891ee8467686e5e11a4e1a1f39 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 27 Apr 2021 17:51:05 +0800 Subject: [PATCH 02/23] =?UTF-8?q?15608=2019081-=E8=BF=94=E5=B7=A5=E8=BF=94?= =?UTF-8?q?=E4=BF=AE-=E6=8A=A5=E5=BA=9F=E5=8D=95=E6=8D=AE=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=92=8C=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/mes/bean/IfDismantleRecord.java | 21 +++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQuarantineRecord.java | 12 ++++++++++++ 2 files changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index defd057..ce62778 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -111,4 +111,25 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java index 25aa552..46a5850 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java @@ -73,4 +73,16 @@ public class MesQuarantineRecord extends BaseBean { @Column(name = "SCRAP_No") @ApiParam("报废单号") private String scrapNo; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; } From c6e80ad9a70231b5a8f9ba89b617f87d073ed730 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 27 Apr 2021 17:57:18 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E3=80=903391=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E6=A3=80=E4=B8=8D=E8=89=AF=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E8=A1=A8-=E5=90=8E=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 27 ++++++++++++++++++++++ 1 file changed, 27 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 21f9178..89eba5c 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 @@ -130,6 +130,33 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工序") + private String workCellCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; @Transient @ApiParam(value = "完成状态") From cd351e443ff26aa10a3e5876817274c4f604b497 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Apr 2021 09:58:21 +0800 Subject: [PATCH 04/23] =?UTF-8?q?15627=2019048-=E5=96=B7=E6=B6=82=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=9C=A8=E4=B8=8D=E5=90=8C=E5=B7=A5=E4=BD=8D=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=8A=A5=E5=B7=A5-20210430=20->=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95?= =?UTF-8?q?:=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81+=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E7=BC=96=E5=8F=B7+=E5=8E=9F=E6=9D=90=E6=96=99=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 797fa82..03cd270 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 @@ -5,17 +5,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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; +import javax.persistence.*; import java.io.Serializable; /** @@ -31,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_PRODUCT_OFF_LINE") +@Table(name = "IF_PRODUCT_OFF_LINE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "ITEM_PART_NO"}) +}) @NoArgsConstructor @AllArgsConstructor @Api("生产报工表") From 60408db7b07e98c0e57bef56fb5036ef2dcb2325 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 28 Apr 2021 16:40:35 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E3=80=9015642=2019108+wms=5Fprinting=5Fq?= =?UTF-8?q?ueue=20=E6=96=B0=E5=A2=9E=20part=5Fno=20=E5=AD=97=E6=AE=B5+0429?= =?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/wms/bean/WmsPrintingQueue.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 19ed55a..1e586b1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -60,6 +60,10 @@ public class WmsPrintingQueue extends BaseBean{ @ApiParam("供应商编码") private String vendorNo; + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + public WmsPrintingQueue() { } From 30048f4ce12dbe72a7f1a432272623182080c5d8 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Apr 2021 10:13:32 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 9aaaa9d..485e93d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -769,6 +769,7 @@ public class ApsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_TYPE { FICTITIOUS("FICTITIOUS", "虚拟工作"), + DYNAMIC_FICTITIOUS("DYNAMIC_FICTITIOUS", "动态虚拟工作"), NORMAL("NORMAL", "普通工作"); private String value; @@ -1179,14 +1180,14 @@ public class ApsEnumUtil { * 库存订单状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum INVENTORY_ORDER_STATUS { + public enum SAFE_STOCK_ORDER_STATUS { UNCOMMIT("UNCOMMIT", "待处理"), COMMIT("COMMIT", "确认"); private String value; private String description; - INVENTORY_ORDER_STATUS(String value, String description) { + SAFE_STOCK_ORDER_STATUS(String value, String description) { this.value = value; this.description = description; } From b396d9cfd9df1d67c1d3f927e0b741c001c58d57 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Apr 2021 10:19:45 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/bean/InterMediateDetail.java | 50 ++++++++++++++++ .../i3plus/pojo/aps/bean/InterMediateResult.java | 67 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 5 -- .../estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 14 +++-- .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 3 +- .../pojo/aps/holders/EInterMediateDetail.java | 5 ++ .../pojo/aps/holders/EInterMediateResult.java | 7 +++ .../pojo/aps/validator/ShiftTimeValidator.java | 4 ++ .../resources/relations/InterMediateResult.xml | 9 +++ 10 files changed, 158 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java new file mode 100644 index 0000000..2f8136f --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EInterMediateDetail; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :计算中间结果明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-27 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_INTER_MEDIATE_DETAIL") +@Api("计算中间结果") +public class InterMediateDetail extends BaseAPS { + private static final long serialVersionUID = -2588016171684238811L; + + @Column(name="RESULT_ID") + @ApiParam(value ="中间结果") + @FieldAnnotation(relation = "InterMediateResult") + private Long resultId; + + @Column(name="RULE") + @ApiParam(value ="评估规则") + private String rule; + + @Column(name="EVALUATE_VALUE") + @ApiParam(value ="评估值") + private Double evaluateValue; + + public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); } + + public void setResult(InterMediateResult result) { + this.resultId = result != null ? result.getId() : 0; + BeanRelation.set(this, EInterMediateDetail.Result, result); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java new file mode 100644 index 0000000..8368fd4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EInterMediateResult; +import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; +import com.fasterxml.jackson.annotation.JsonBackReference; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.List; + +/** + * @Description :计算中间结果 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-25 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_INTER_MEDIATE_RESULT") +@Api("计算中间结果") +public class InterMediateResult extends BaseAPS { + private static final long serialVersionUID = -1869359887027950540L; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(relation = "Work") + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(relation = "Resource") + private Long resourceId; + + @Column(name="EVALUATE_VALUE") + @ApiParam(value ="评估值") + private Double evaluateValue; + + public Work getWork() { + return BeanRelation.get(this, EInterMediateResult.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EInterMediateResult.Work, work); + } + + public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); } + + public void setResource(Resource resource) { + this.resourceId = resource != null ? resource.getId() : 0l; + BeanRelation.set(this, EInterMediateResult.Resource, resource); + } + + @JsonBackReference + public List getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index dc3d2dd..2c0ea75 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -33,11 +33,6 @@ import java.util.List; public class Inventory extends BaseOrder { private static final long serialVersionUID = 2378846162007550439L; - @Column(name="ORDER_STATUS") - @ApiParam(value ="订单状态") - @FieldAnnotation(defaultValue = "UNCOMMIT") - private ApsEnumUtil.INVENTORY_ORDER_STATUS orderStatus = ApsEnumUtil.INVENTORY_ORDER_STATUS.UNCOMMIT; - @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index fa8db20..3a5c573 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -30,16 +31,21 @@ public class SafeStockOrder extends BaseOrder { private static final long serialVersionUID = 5944067344390531794L; - @JsonIgnore - public Work getWork() { - return BeanRelation.get(this, EBaseOrder.Works); - } + @Column(name="ORDER_STATUS") + @ApiParam(value ="订单状态") + @FieldAnnotation(defaultValue = "UNCOMMIT") + private ApsEnumUtil.SAFE_STOCK_ORDER_STATUS orderStatus = ApsEnumUtil.SAFE_STOCK_ORDER_STATUS.UNCOMMIT; @Column(name="INVENTORY_ID") @ApiParam(value ="库存") @FieldAnnotation(relation = "Inventory", notEmpty = true) private Long inventoryId; + @JsonIgnore + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } + public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); } public void setInventory(Inventory inventory) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 95847b4..a754400 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -49,4 +49,8 @@ public class SysParam extends BaseAPS { @Column(name="INVENTORY_RATE") @ApiParam(value ="库存误差百分比") private Double inventoryRate; + + @Column(name="RECORD_RESULT") + @ApiParam(value ="记录资源评估结果") + private Boolean recordResult; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index a1d2b89..3601ad9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -161,7 +161,7 @@ public class Work extends BaseAPS { @Column(name="DYN_SPLIT_WORK_ID") @ApiParam(value ="动态拆分的工作ID") - @FieldAnnotation(property = false) +// @FieldAnnotation(property = false) private Long dynSplitWorkId; private transient boolean hasOptimized = false; @@ -223,6 +223,7 @@ public class Work extends BaseAPS { return BeanRelation.get(this, EWork.PlanFeedback); } + @JsonBackReference public WorkPlan getMainPlan() { return BeanRelation.get(this, EWork.MainPlan); } public void setMainPlan(WorkPlan plan) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java new file mode 100644 index 0000000..0683e8f --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInterMediateDetail { + Result +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java new file mode 100644 index 0000000..0465f7d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInterMediateResult { + Work, + Resource, + Details +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java index 3b9bad9..c5bcd46 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.validator; import cn.estsh.i3plus.pojo.aps.annotation.ShiftTimeAnnotation; import cn.estsh.i3plus.pojo.aps.model.TimeBlock; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -13,6 +14,9 @@ public class ShiftTimeValidator implements ConstraintValidator + + + + + + + + \ No newline at end of file From b06b49866f89d67842e2d80c04d49f4522328f4a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 29 Apr 2021 13:58:28 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E5=AE=B9=E5=99=A8=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.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/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index fe7e8ae..21b5ba5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -60,5 +60,5 @@ public class MesWorkCellDefect extends BaseBean implements Serializable { @Transient @ApiParam("缺陷名称") - private String defectCodeName; + private String defectName; } From efaafcdcc959db555c0c5c9561159b21dc885337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E7=94=9F?= <337942886@qq.com> Date: Thu, 29 Apr 2021 14:21:27 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 42ee4f1..c867054 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 @@ -945,4 +945,8 @@ public class WmsStockSn extends BaseBean { this.zoneNo = zoneNo; this.vendorNo = vendorNo; } + public WmsStockSn(String partNo, Double qty) { + this.partNo = partNo; + this.qty = qty; + } } From 99b43a667780d7d1b2db12b167bc9e5ae464264e Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Apr 2021 15:01:00 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java | 7 +++++++ 5 files changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index 5965305..2b43199 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -44,6 +44,10 @@ public class InsertedOrder extends BaseOrder { @FieldAnnotation(property = false) private Long productRoutingId; + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + private Double finishCount; + @Column(name="REMARK") @ApiParam(value ="备注") private String remark; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index ce7887a..14bb66a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -98,6 +98,10 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(defaultValue = "false", display = false) private Boolean autoSupply; + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + private Double finishCount; + @Column(name="PRODUCT_ROUTING_ID") @ApiParam(value ="工艺路线") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index 3a5c573..0e9fa45 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -41,6 +41,10 @@ public class SafeStockOrder extends BaseOrder { @FieldAnnotation(relation = "Inventory", notEmpty = true) private Long inventoryId; + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + private Double finishCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 3601ad9..6aeff65 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -242,4 +243,11 @@ public class Work extends BaseAPS { this.specifyResourceId = resource != null ? resource.getId() : 0; BeanRelation.set(this, EWork.SpecifyResource, resource); } + + public double getWorkCount() { + if (!APSDoubleTool.isZero(getSpecifyCount())) { + return getSpecifyCount(); + } + return getCount(); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java new file mode 100644 index 0000000..6c4e2ba --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.tool; + +public class APSDoubleTool { + public static boolean isZero(Double value) { + return (value == null) || (value > -0.000001 && value < 0.000001); + } +} From 021e05ebafe3902f5b731dd6eace6ec01b74df77 Mon Sep 17 00:00:00 2001 From: Fightgoo Date: Thu, 29 Apr 2021 15:22:45 +0800 Subject: [PATCH 11/23] =?UTF-8?q?15635=2020027-=E8=B0=83=E8=A7=92=E5=99=A8?= =?UTF-8?q?BH-=20BH=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E7=B1=BB=E5=9E=8B=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20-=2020210430?= 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 | 6 +++++- 1 file changed, 5 insertions(+), 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 a571907..9798c9d 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 @@ -3271,7 +3271,11 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); - DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); + /** + * @Author : gsz 2021/04/09 + * 15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430 + **/ + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { From 9ace046d1d38dea9f5a4a4970ecabadd3d1ff9bb Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Apr 2021 19:59:14 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 23 ++++++++++++++++++---- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 2 ++ .../src/main/resources/relations/Work.xml | 2 ++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 6aeff65..c29893b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -160,10 +160,13 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private Long mainPlanId; - @Column(name="DYN_SPLIT_WORK_ID") - @ApiParam(value ="动态拆分的工作ID") -// @FieldAnnotation(property = false) - private Long dynSplitWorkId; +// @Column(name="DYN_SPLIT_WORK_ID") +// @ApiParam(value ="动态拆分的工作ID") +// private Long dynSplitWorkId; + + @Column(name="ORIGIN_WORK_ID") + @ApiParam(value ="动态拆分前工作ID") + private Long originWorkId; private transient boolean hasOptimized = false; @@ -250,4 +253,16 @@ public class Work extends BaseAPS { } return getCount(); } + + @JsonBackReference + public List getDynSplitWorks() { return BeanRelation.list(this, EWork.DynSplitWorks); } + + public Work getOriginWork() { + return BeanRelation.get(this, EWork.OriginWork); + } + + public void setOriginWork(Work work) { + this.originWorkId = work != null ? work.getId() : 0; + BeanRelation.set(this, EWork.OriginWork, work); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index b9f6294..70d265e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -13,4 +13,6 @@ public enum EWork { MainPlan, // 关联的为主资源的计划 WorkPlans, // 关联的工作计划 SpecifyResource, // 指定资源 + DynSplitWorks, // 动态拆分后的工作 + OriginWork, // 动态拆分前的工作 } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 2942714..da892ce 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -20,4 +20,6 @@ + + \ No newline at end of file From db23233a8f9cd24c962416358219929f07ab33b9 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 1 May 2021 12:32:43 +0800 Subject: [PATCH 13/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesContainerSnRecord.java | 55 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++ .../repository/MesContainerSnRecordRepository.java | 13 +++++ 3 files changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java new file mode 100644 index 0000000..5438adf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_CONTAINER_SN_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO"), + @Index(columnList = "CT_NO") +}) +@Api("容器条码记录表") +public class MesContainerSnRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -1630924042562178494L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "CT_NO") + @ApiParam("容器号") + private String ctNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; +} 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 57fe9f5..6d92fb6 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 @@ -393,6 +393,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("生产节拍") private Integer takt; + @Transient + @ApiParam("容器号") + private String ctNo; + /********************** 动态冗余字段（界面维护大写） *********************************/ @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java new file mode 100644 index 0000000..86ae6e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/5/1 12:21 PM + * @Modify: + */ +public interface MesContainerSnRecordRepository extends BaseRepository { +} From 0ec0bc2592011e3eeacdc3119eff819aa792d72d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 2 May 2021 16:20:15 +0800 Subject: [PATCH 14/23] =?UTF-8?q?15690=2019108+PCN=20=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=20=E8=AE=B0=E5=BD=95plc=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesContainerSnRecord.java | 2 +- .../i3plus/pojo/mes/bean/MesPlcDataRecord.java | 49 ++++++++++++++++++++++ .../mes/repository/MesPlcDataRecordRepository.java | 13 ++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java index 5438adf..0e5f898 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java @@ -31,8 +31,8 @@ import java.io.Serializable; }) @Api("容器条码记录表") public class MesContainerSnRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -1630924042562178494L; + private static final long serialVersionUID = -303802118993255101L; @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java new file mode 100644 index 0000000..ff0e1e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlcDataRecord.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.model.ProductDataModel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate:2019\10\9 0009 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_PLC_DATA_RECORD", indexes = { + @Index(columnList = "PLC_CODE") +}) +@Api("PLC数据记录表") +public class MesPlcDataRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8789141495695469898L; + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "PLC_VLAUE") + @ApiParam("PLC型号") + private String plcValue; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java new file mode 100644 index 0000000..aaea5fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcDataRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPlcDataRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/5/2 4:11 PM + * @Modify: + */ +public interface MesPlcDataRecordRepository extends BaseRepository { +} From c09a078ce4bea62f81ca5e8e6b801815cbc7431a Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 6 May 2021 16:39:00 +0800 Subject: [PATCH 15/23] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=92=8C?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=8E=BB=E9=99=A4service?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 1b91d43..74dfeaf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -48,7 +48,7 @@ public class BeanRelation { return result; } for (Enum holder : beanInfo.getAllHolders()) { - result.put(holder, new LinkedList<>()); + result.put(holder, new ArrayList<>()); } return result; } From dbd14c9d6ef1fa8cbafb4974ec43e6910de8fa27 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 7 May 2021 10:11:02 +0800 Subject: [PATCH 16/23] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +++ 2 files changed, 8 insertions(+) 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 42ee4f1..0b34d07 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -237,6 +237,11 @@ public class WmsStockSn extends BaseBean { // @ApiParam(value = "乐观锁", example = "1") // public Integer lockVersion; + @ApiParam("托盘(容器)类型编号") + @Column(name = "CT_CODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String ctCode; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; 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 a571907..0b07b3e 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 @@ -3222,6 +3222,9 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result); } getStringBuilderPack(details, result); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, + new String[]{"seq"}, result); return result; } From eef6f8e18be71d9f2c4da11bfd8992a3f3dd1ac8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 7 May 2021 18:49:26 +0800 Subject: [PATCH 17/23] =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=20=E6=B3=B0?= =?UTF-8?q?=E5=9B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/mes/bean/MesHolidayVacation.java | 42 ++++++++++++++++++++++ .../repository/MesHolidayVacationRepository.java | 13 +++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 39e23fe..882c57a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2100,7 +2100,8 @@ public class MesEnumUtil { MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_JISA(640, "jisaExcelService", "JISA导入"), - MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"); + MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), + MES_HOLIDAY_VACATION(650, "holidayVacationExcelService", "节假日导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java new file mode 100644 index 0000000..e1b40ba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHolidayVacation.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 2:55 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_HOLIDAY_VACTION") +@Api("节假日") +public class MesHolidayVacation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1620451254243818560L; + @Column(name = "YEAR") + @ApiParam("年") + private String year; + + @Column(name = "MONTH") + @ApiParam("月") + private String month; + + @Column(name = "DAY") + @ApiParam("日") + private String day; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java new file mode 100644 index 0000000..561c2f2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHolidayVacationRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesHolidayVacation; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/5/7 4:44 PM + * @Modify: + */ +public interface MesHolidayVacationRepository extends BaseRepository { +} From 3dd67766b25c1d9567f87bf4b457006d068044f4 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 7 May 2021 19:31:22 +0800 Subject: [PATCH 18/23] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index c29893b..eddc7c7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -48,7 +48,7 @@ public class Work extends BaseAPS { @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") - @FieldAnnotation(property = false) + @FieldAnnotation(display = false) private ApsEnumUtil.WORK_TYPE workType; @Column(name="count", columnDefinition = "decimal(18,8)") @@ -165,7 +165,7 @@ public class Work extends BaseAPS { // private Long dynSplitWorkId; @Column(name="ORIGIN_WORK_ID") - @ApiParam(value ="动态拆分前工作ID") + @ApiParam(value ="动态拆分工作ID") private Long originWorkId; private transient boolean hasOptimized = false; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 485e93d..a74762b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -669,13 +669,14 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_SORT_RULE { - ORDER_LET("ORDER_LET", "订单交货期"), + ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"), ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), ORDER_EST("ORDER_EST", "订单最早开始时刻"), ORDER_COUNT("ORDER_COUNT", "订单数量"), ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"), ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"), ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"), + ORDER_CODE("ORDER_CODE", "订单编码"), NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"), REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"), MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"), @@ -685,7 +686,7 @@ public class ApsEnumUtil { HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"), WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"), TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"), - TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"), + TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单编码"), TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"), CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); From 3e0df2027394fcdaad9f001b2aa2aa9b8c9d6c6d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 8 May 2021 10:15:45 +0800 Subject: [PATCH 19/23] =?UTF-8?q?=E3=80=9015693=2019108+=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=87=BA=E5=BA=93=E5=8D=95-=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86-=E5=8F=8C=E5=87=BB-?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=AD=90=E8=A1=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9Ewms=5Fstock=5Fsn.package=5Fno?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA+0506=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index abae0c0..9833571 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 移库单条码表 @@ -96,6 +100,9 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "目标库位代码") public String destLocateNo; + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; @Transient @ApiParam("前端表格编辑使用") From 49f709959db8920a00cd5333efc5a5453fcf25c3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 8 May 2021 13:10:18 +0800 Subject: [PATCH 20/23] =?UTF-8?q?15711=2019081-=E9=82=AE=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E9=86=92=E5=86=85=E5=AE=B9=E6=AF=8F=E4=B8=80=E6=9D=A1=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E5=A2=9E=E5=8A=A0=E6=8D=A2=E8=A1=8C=E5=92=8C=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 882c57a..f4df909 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2101,7 +2101,7 @@ public class MesEnumUtil { MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_JISA(640, "jisaExcelService", "JISA导入"), MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), - MES_HOLIDAY_VACATION(650, "holidayVacationExcelService", "节假日导入"); + MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"); private int value; private String service; From a0f6fa5a7ef8937be65883cfca72eee596223526 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sat, 8 May 2021 17:19:26 +0800 Subject: [PATCH 21/23] =?UTF-8?q?15609=2020135--=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=BF=87=E7=A8=8B=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8--=E3=80=8B=E7=BC=BA=E9=99=B7=E4=BF=A1=E6=81=AF--?= =?UTF-8?q?=E3=80=8B=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE--2021-04-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java index 97085b3..bc450c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 产品履历报表-缺陷信息 + * * @author yumingxing * @version 1.0 * @date 2020/12/18 15:16 @@ -51,8 +52,11 @@ public class DefectRecordModel implements Serializable { @ApiParam(value = "扫描时间") public String createDatetime; + @ApiParam(value = "图片路径") + private String pictureUrl; - public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) { + + public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime, String pictureUrl) { this.workCenterName = workCenterName; this.processName = processName; this.qcStatus = qcStatus; @@ -62,5 +66,6 @@ public class DefectRecordModel implements Serializable { this.serialNumber = serialNumber; this.createUser = createUser; this.createDatetime = createDatetime; + this.pictureUrl = pictureUrl; } } From 23e5b87cebb7626bbc90d92bdfe29a5f9320f50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 10 May 2021 13:38:55 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E3=80=9015607=2020027-PCN=E7=AB=AF=20-?= =?UTF-8?q?=20=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C-=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=A1=E6=95=B0=20-20210429=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 0593668..78c3128 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -123,6 +123,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("任务单类型") private String checkOrderType; + @Column(name = "ON_SITE_FREQUENCY") + @ApiParam("巡检次数") + private Integer onSiteFrequency = 0; + @Deprecated @ApiParam(value = "检测结果") @Transient From 7a4ab204836121c958468addeae32d06bf040771 Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Mon, 10 May 2021 15:08:58 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=A6=81=E7=94=A8=E5=92=8C=E5=90=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java index 6e7cc79..874d299 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -22,6 +22,7 @@ public class MdmHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean); return ddlPackBean; }