Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

6 years ago · ba7fe81978
parent 5956d5a08e 07749b50ec
commit ba7fe81978
9 changed files with 206 additions and 7 deletions
--- 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,13 +51,13 @@ public class AndonDisposalCfg extends BaseBean {
    @ApiParam(value = "呼叫原因描述")
    private String acNameRdd;

-    @Column(name = "EC_CODE")
+    @Column(name = "EM_CODE")
    @ApiParam(value = "事件方法代码")
-    private String ecCode;
+    private String emCode;

-    @Column(name = "EC_NAME_RDD")
+    @Column(name = "EM_NAME_RDD")
    @ApiParam(value = "事件方法描述")
-    private String ecNameRdd;
+    private String emNameRdd;

    @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description")
    @Column(name = "FLOW_STATUS")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java
@ -40,7 +40,7 @@ public class MesEquTask extends BaseBean {
    private Integer taskType;

    @Column(name = "TASK_STATUS")
-    @ApiParam("作业状态")
+    @ApiParam("任务状态")
    private Integer taskStatus;

    @Column(name = "WORK_CENTER_CODE")
@ -80,6 +80,10 @@ public class MesEquTask extends BaseBean {
    private String planTimeEnd;

    @Transient
+    @ApiParam(value = "用于设备点检保养维修作业页面开窗查询任务，点检保养=1，维修=2")
+    private String pageType;
+
+    @Transient
    @ApiParam(value ="明细列表")
    private List<MesEquTaskDetail> mesEquTaskDetailList;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java
@ -0,0 +1,73 @@
+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 javax.persistence.Transient;
+
+/**
+ * @Description :设备点检保养作业记录
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_TASK_STANDARD_RECORD")
+@Api("设备点检保养作业记录")
+public class MesEquTaskStandardRecord extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @Column(name = "TASK_TYPE")
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "EQUIPMENT_NAME")
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Column(name = "ACTION_ITEM")
+    @ApiParam("操作项")
+    private String actionItem;
+
+    @Column(name = "ACTION_STANDARD")
+    @ApiParam("操作标准")
+    private String actionStandard;
+
+    @Column(name = "ACTION_GUIDE")
+    @ApiParam("操作指导")
+    private String actionGuide;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("判定结果")
+    private Integer checkResult;
+
+    @Column(name = "FINAL_RESULT")
+    @ApiParam("整体结果")
+    private Integer finalResult;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java
@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.model;

+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

 import java.io.Serializable;
+import java.util.List;

@Data
 public class MesEquTaskDetailModel implements Serializable {
@ -70,6 +72,12 @@ public class MesEquTaskDetailModel implements Serializable {
    @ApiParam("作业类型")
    private String taskTypeName;

+    @ApiParam("设备点检保养记录修改标识")
+    private Boolean isUpdate;
+
+    @ApiParam("设备点检保养记录")
+    private List<MesEquTaskStandardRecord> equTaskStandardRecordList;
+

    public MesEquTaskDetailModel() {

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.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.MesEquTaskStandardRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskStandardRecordRepository extends BaseRepository<MesEquTaskStandardRecord, Long> {
+}
--- 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
@ -1530,4 +1530,27 @@ public class MesHqlPack {
        }
        return packBean;
    }
+
+    /**
+     * 按条件分页查询mes设备点检保养维修作业
+     * @param mesEquTaskDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskDetailByTaskNo(MesEquTaskDetail mesEquTaskDetail, String organizeCode) {
+        DdlPackBean packBean = getMesAllData(organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getTaskNo())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskDetail.getTaskNo(), "taskNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getEquipmentCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquTaskDetail.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getActionStatus())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getActionStatus(), "actionStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskDetail.getFinalResult())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getFinalResult(), "finalResult", packBean);
+        }
+        return packBean;
+    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java
@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 物料清单模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2019/10/22 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="领料单模板",description = "领料单模板")
+public class WmsBomTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607611L;
+
+    @ApiParam(value = "父物料号")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "父物料描述")
+    @AnnoOutputColumn
+    private String partName;
+
+    @ApiParam(value = "父计量单位")
+    @AnnoOutputColumn
+    private String unit;
+
+    @ApiParam(value = "父级数量")
+    @AnnoOutputColumn
+    private Double qty;
+
+    @ApiParam(value = "子物料号")
+    @AnnoOutputColumn
+    private String itemPartNo;
+
+    @ApiParam(value = "子物料描述")
+    @AnnoOutputColumn
+    private String itemPartName;
+
+    @ApiParam(value = "子计量单位")
+    @AnnoOutputColumn
+    private String itemUnit;
+
+    @ApiParam(value = "子用量")
+    @AnnoOutputColumn
+    private Double itemQty;
+
+    @ApiParam(value = "BOM编号")
+    @AnnoOutputColumn
+    private String bomNum;
+
+    @ApiParam(value = "BOM版本号")
+    @AnnoOutputColumn
+    private String bomVersion;
+
+    @ApiParam(value = "有效起始日期")
+    @AnnoOutputColumn
+    private String effStartTime;
+
+    @ApiParam(value = "有效截止日期")
+    @AnnoOutputColumn
+    private String effEndTime;
+
+}
--- 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
@ -116,6 +116,10 @@ public class WmsPOMaster extends BaseBean {
    @ApiParam("集装箱号")
    public String containerNo;

+    @Column(name = "PRIOR_RC")
+    @ApiParam("预收货")
+    public Integer priorRC;
+
    @Transient
    @ApiParam(value = "工厂名称")
    public String organizeName;
--- 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
@ -2383,8 +2383,8 @@ public class WmsHqlPack {
        DdlPackBean result = new DdlPackBean();


-        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
-        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+        DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
        // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
        DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
        getStringBuilderPack(wmsRouting, result);