Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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;
 }

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;
+}

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<AndonDisposalMaintenCfg, Long> {
+}

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;

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)

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<String> snList;
+    private String organizeCode;
+}

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;
 
     /**
      * 调用脚本方法获取数据

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;
+}