From a601d5ddf345ddb1f57ad33d6c3ad6d1ac18e745 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 27 Sep 2019 10:07:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?orderBy=E6=96=B9=E6=B3=95=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 716a027..457b27d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable { String result = ""; if (orderByParam!=null&&orderByParam.trim().length()>0) { result = " order by " + orderByParam; - if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; }else{ result += " desc"; From fb9340fc0923473a0d97a60bd2fb52697c32f146 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 28 Sep 2019 16:03:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=EF=BC=8C=E5=BC=80=E7=BA=BF=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B=20=E5=AE=89=E7=81=AF=E9=99=84=E5=B1=9E=E8=A1=A8?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B7=BB=E5=8A=A0=EF=BC=9B=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E6=98=BE=E7=A4=BA=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=8A=B6=E6=80=81=EF=BC=9B=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=A9=E7=90=86=E5=AE=89=E7=81=AF=EF=BC=8C=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 4 + .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 46 +++++++++++ .../estsh/i3plus/pojo/andon/bean/MesWorkCell.java | 4 + .../repository/IAndonQueueAttachRepository.java | 17 ++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 96 +++++++++++++++++++++- 5 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index a58c464..8567ff4 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -157,6 +157,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "解决人") private String resetUser; + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue(); + @Transient @ApiParam(value = "解决人名字") private String resetUserName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java new file mode 100644 index 0000000..778baae --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 安灯任务附属表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-09-27 19:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_MANAGE_ATTACH") +@Api(value="安灯任务附属信息") +public class AndonQueueAttach extends BaseBean { + + @Column(name="PROD_INFO") + @ApiParam(value ="产品信息" , example ="-1") + private String prodInfo; + + @Column(name="LINE_INFO") + @ApiParam(value ="产线信息") + private String lineInfo; + + @Column(name="ANDON_ORDER_NO") + @ApiParam(value ="安灯任务编号") + private String andonOrderNo; + + @Column(name="STATUS_CODE") + @ApiParam(value ="安灯状态") + private String statusCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 7b95b63..e8f4a03 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -49,6 +49,10 @@ public class MesWorkCell extends BaseBean { private String areaCode; @Transient + @ApiParam(value ="工作单元中安灯队列标识") + private String workCellSignal; + + @Transient @ApiParam(value ="子集列表") @AnnoOutputColumn(hidden = true) private List childTreeList; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java new file mode 100644 index 0000000..d36bc9f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 安灯附属表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-09-28 + * @Modify: + **/ +@Repository +public interface IAndonQueueAttachRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index cc0ebe0..efbfada 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -58,6 +58,51 @@ public class AndonEnumUtil { } /** + * 标准类型 = 10，异常类型 = 20 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_TYPE{ + NORMAL("10","标准类型"), + ABNORMAL("20","异常类型"); + + private String value; + private String description; + + WORK_CELL_TYPE(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 (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -199,7 +244,7 @@ public class AndonEnumUtil { /** * 按灯业务状态 - * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60 + * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ @@ -208,7 +253,9 @@ public class AndonEnumUtil { READ_FLAG("30", "安灯读取状态"), STOP_FLAG("40", "停线状态"), DETAIL_TYPE("50", "安灯子类型"), - AC_CODE("60", "原因代码"); + AC_CODE("60", "原因代码"), + PROD_INFO("70", "产品信息"), + LINE_INFO("80", "产量信息"); private String value; private String description; @@ -362,6 +409,51 @@ public class AndonEnumUtil { } } + /** + * 安灯来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_SOURCE_TYPE{ + PHYSICAL("10","物理安灯"), + SOFT("20","软件安灯"); + + private String value; + private String description; + + ALARM_SOURCE_TYPE(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 (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 From 9a21e2d99fda3fc24e8c99579f279729d74407f5 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sat, 28 Sep 2019 16:08:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/wmsCSOrderDetailsModel.java | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java new file mode 100644 index 0000000..9957a5f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class wmsCSOrderDetailsModel implements Serializable { + + + /****** + * + * 库位编码 + */ + public String locateNo; + + /****** + * + * 订单编码 + */ + public String orderNo; + + + /****** + * + * 物料代码 + */ + public String partNo; + + /****** + * + * 物料名称 + */ + public String partNameRdd; + + /****** + * + * 冻结数量 + */ + public String qty; + + /****** + * + * 实盘数量 + */ + public String factQty; + + /****** + * + * 条码 + */ + public String sn; + + + /****** + * + * 仓库编码 + */ + public String whNo; + + /****** + * + * 区域编码 + */ + public String zoneNo; + + /****** + * + * 状态 + */ + public String wmStatus; +} From e20ee7b1ff1738bb81e89037882b7010e5a321ee Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 28 Sep 2019 19:18:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=94=BE=E8=A1=8C?= =?UTF-8?q?=E6=94=BE=E8=A1=8C=E8=AF=B4=E6=98=8E=E7=BB=B4=E6=8A=A4=EF=BC=8C?= =?UTF-8?q?=20=E5=AE=89=E7=81=AF=E5=93=8D=E5=BA=94=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=A0=87=E8=AF=86=EF=BC=8C=20=E7=94=A8=E6=88=B7=E7=BB=8F?= =?UTF-8?q?=E8=BF=87=E5=B7=A5=E5=8E=82=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 8567ff4..674dd65 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -283,6 +283,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "发送标志") private String sendFlag; + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + /** * 处理类型：10=标准处理，20=自处理 */ @@ -329,6 +333,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "驳回意见") private String rejectOpinion; + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + @Transient @ApiParam(value = "安灯状态集合") private List statusCodeList; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index f1fa3f0..b7aef8e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -264,6 +264,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "驳回意见") private String rejectOpinion; + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index efbfada..d3688eb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -717,7 +717,8 @@ public class AndonEnumUtil { CANCEL_ACTION("40", "撤销动作"), COMMIT_ACTION("50","提交动作"), PASS_ACTION("60","审批动作"), - REJECT_ACTION("70", "驳回动作"); + REJECT_ACTION("70", "驳回动作"), + OPEN_ACTION("80","放行动作"); private String value; private String description; From c2da7410ebfa51df5eae80713ef8e88307e49a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 28 Sep 2019 20:08:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= 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 | 6 +++++- 1 file changed, 5 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 7d6be83..ef96bed 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 @@ -767,7 +767,11 @@ public class WmsEnumUtil { INSTOCK("INSTOCK", "入库"), MOVESTOCK("MOVESTOCK", "移库"), CS("CS", "盘点"), - VDARC("VDARC", "VDA收货"); + VDARC("VDARC", "VDA收货"), + VDAINSTOCK("VDAINSTOCK", "VDA入库"), + VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"), + VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"), + VDAREPORT("VDAREPORT", "VDA生产报工"); private String value; private String description;