From 0fdabe49507df48e0c6cb957537927466d522e13 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 19 Oct 2019 19:36:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=20=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=A4=84=E7=90=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonDisposalCfg.java | 10 +++- .../pojo/andon/bean/AndonDisposalMaintenCfg.java | 65 ++++++++++++++++++++++ .../IAndonDisposalMaintenCfgRepository.java | 14 +++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 44 +++++++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 47 ++++++++++++++++ 5 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 26d333c..96463f0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -51,8 +51,12 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acNameRdd; - @AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description") - @Column(name = "APPROVAL_STATUS") + @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description") + @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") - private String approvalStatus; + private Integer flowStatus; + + @Column(name = "FLOW_MEMO") + @ApiParam(value = "审批意见") + private String flowMemo; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java new file mode 100644 index 0000000..a0b4eed --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.BaseModelBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +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-10-19-14:56 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_DISPOSAL_MAINTEN_CFG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("Andon自处理维护配置") +public class AndonDisposalMaintenCfg extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "EM_CODE") + @ApiParam(value = "处理措施代码") + private String emCode; + + @Column(name = "RP_WHERE") + @ApiParam(value = "有效时长") + private Integer rpWhere; + + @Column(name = "FAIL_TIME") + @ApiParam(value = "失败次数") + private Integer failTime; + + @Column(name = "SUCCESS_TIME") + @ApiParam(value = "成功次数") + private Integer successTime; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java new file mode 100644 index 0000000..53bb9fd --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description: 自处理维护配置 + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-19-15:02 + * @Modify: + **/ +public interface IAndonDisposalMaintenCfgRepository extends BaseRepository { +} 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 044f313..f46add5 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 @@ -113,6 +113,23 @@ public class AndonHqlPack { } /** + * 自处理维护配置 + * @param andonDisposalMaintenCfg + * @return + */ + public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean); + DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean); + return packBean; + } + + /** * 安灯附属表 * @param andonQueueAttach * @return @@ -306,6 +323,32 @@ public class AndonHqlPack { } /** + * 按条件查询安灯知识库 + * @param andonKnowledgeBase + * @return + */ + public static DdlPackBean packAndonKnowlegeBase(AndonKnowledgeBase andonKnowledgeBase){ + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getNumEqualPack(andonKnowledgeBase.getFlowStatus(), "flowStatus", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAcCode(), "acCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean); + + if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){ + DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true); + } + + getStringBuilderPack(andonKnowledgeBase, packBean); + packBean.setOrderByStr(andonKnowledgeBase.orderBy()); + return packBean; + } + + /** * 按条件查询按灯队列信息 * @param andonManageQueue * @return @@ -350,6 +393,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result); + DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result); getStringBuilderPack(andonDisposalCfg, result); return result; 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 ce28bb4..230f235 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 @@ -12,6 +12,53 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonEnumUtil { /** + * 按灯状态 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum KNOWLEDGE_AUDIT_STATUS { + PENDING(10,"待审批"), + PASS(20,"审批通过"), + STOP(99,"审批不通过"); + + private int value; + private String description; + + KNOWLEDGE_AUDIT_STATUS(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; + } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 语音播报类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 63e225026cefec0b8d6afcfd02703f0ee4f8d625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 21 Oct 2019 10:08:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=20=E6=89=A9=E5=B1=95=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=B8=8E=E8=BD=AF=E9=80=82=E9=85=8D=E7=9A=84=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0abcde9..ac86f7e 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 @@ -126,7 +126,7 @@ public class WmsInterfaceDataMapper extends BaseBean { * 扩展脚本编号，用于扩展接口功能 */ @Column(name = "SCRIPT_NO") - public String ScriptNo; + public String scriptNo; /** * 调用脚本方法获取数据 From 69e8357c69fb74c0b8dc4d955e7c9556261389d8 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Mon, 21 Oct 2019 10:48:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/FindWriteModel.java | 11 ++++++++ .../i3plus/pojo/wms/modelbean/SnDifferModel.java | 30 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java new file mode 100644 index 0000000..4371202 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +@Data +public class FindWriteModel { + private List snList; + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java new file mode 100644 index 0000000..04f7e69 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("盘点条码差异返回Model") +public class SnDifferModel { + + //盘点单号 + private String orderNo; + //条码 + private String sn; + //源库位编码 + private String locateNo; + //物料代码 + private String partNo; + //物料名称 + private String partNameRdd; + //应盘数量 + private String qty; + //实盘数量 + private String factQty; + // + private String whNo; + //仓库编码 + private String zoneNo ; + //差异状态 + private String wmStatus; +}