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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1081,7 +1081,8 @@ public class ImppEnumUtil {
         BASIS(5, "基础"),
         CONFIG(6, "系统配置"),
         LOG(7, "日志配置"),
-        WORK_WECHAT(8, "企业微信配置");
+        WORK_WECHAT(8, "企业微信配置"),
+        SMS(9, "短信配置");
 
         private int value;
         private String description;
@@ -1471,4 +1472,166 @@ public class ImppEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 短信供应商
+     */
+    public enum SMS_SUPPLIER {
+
+        ALI_CLOUD(1, "阿里云");
+
+        private int value;
+        private String description;
+
+        SMS_SUPPLIER() {
+        }
+
+        SMS_SUPPLIER(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 SMS_SUPPLIER valueOf(int val) {
+            SMS_SUPPLIER tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 短信模板状态
+     */
+    public enum SMS_TEMPLATE_STATUS {
+        VER_CODE(10, "审核中"),
+        NOTICE_SMS(20, "审核通过"),
+        PROMOTE_SMS(30, "审核失败");
+
+        private int value;
+        private String description;
+
+        SMS_TEMPLATE_STATUS() {
+        }
+
+        SMS_TEMPLATE_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 enum SMS_TEMPLATE_TYPE {
+        VER_CODE(10, "验证码"),
+        NOTICE_SMS(20, "短信通知"),
+        PROMOTE_SMS(30, "推广短信"),
+        INTL_SMS(40, "国际/港澳台消息");
+
+        private int value;
+        private String description;
+
+        SMS_TEMPLATE_TYPE() {
+        }
+
+        SMS_TEMPLATE_TYPE(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 enum SMS_SEND_STATUS {
+        WAIT_RECEIPT(10, "等待回执"),
+        FAIL(20, "发送失败"),
+        SUCCESS(30, "发送成功");
+
+        private int value;
+        private String description;
+
+        SMS_SEND_STATUS() {
+        }
+
+        SMS_SEND_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;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -355,7 +355,7 @@ public class MesPcnEnumUtil {
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
         UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
-        PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"),
         PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"),
         SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes");
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -294,6 +294,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 不建议使用该方法，仅在特殊情况下使用。
+     * 如sqlserver库中不允许对长数据字段进行=判断，可使用like替换
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringLikeEqualPack(String val, String columnName, DdlPackBean packBean) {
+        if (val != null && val.trim().length() > 0) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " like  :m_" + columnName, val);
+        }
+    }
+
+    /**
      * 封装String对象成不等于语句
      *
      * @param columnName 列名

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java

@@ -31,7 +31,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_PACKAGE")
-@Api("料箱表")
+@Api("包装条码接口表")
 public class IfPackage extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 9099416791684702129L;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java

@@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("维修状态名称")
     private String repairStatusName;
 
+    @Transient
+    @ApiParam("产品二维码")
+    private String productSn;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,4 +21,8 @@ public class ProductBiSeriesModel {
     private String type;
     @ApiParam("显示的数据")
     private List<Double> data;
+    @ApiParam("实际数量集合")
+    private List<Double> snQtyList = new ArrayList<>();
+    @ApiParam("计划数量集合")
+    private List<Double> planQtyList = new ArrayList<>();
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -156,10 +156,10 @@ public class MesHqlPack {
     public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
@@ -177,10 +177,10 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
@@ -208,7 +208,7 @@ public class MesHqlPack {
                     mesWorkOrder.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
-        DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         return packBean;
     }
@@ -2081,10 +2081,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode);
         if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
-            DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
             DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
@@ -2093,7 +2093,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (mesProduceSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
@@ -2102,7 +2102,7 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
         }
         if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @Description : Impp短信内容
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-12-24 20:31
+ * @Modify:
+ **/
+@Data
+@ApiModel("Impp短信内容")
+public class ImppSmsContent implements Serializable {
+
+    private static final long serialVersionUID = 3329812596753451793L;
+
+    @ApiModelProperty(value = "软件模块")
+    private Integer softType;
+
+    @ApiModelProperty(value = "接收手机号")
+    private String receivePhoneNumber;
+
+    @ApiModelProperty(value = "短信签名代码")
+    private String smsSignCode;
+
+    @ApiModelProperty(value = "模板代码")
+    private String templateCode;
+
+    @ApiModelProperty(value = "短信参数")
+    private Map<String, Object> paramMap;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java

@@ -49,4 +49,19 @@ public class WmsCSOrderDetailsModel implements Serializable {
 
     @ApiParam("目标库位")
     public String  destLocateNo;
+
+    @ApiParam("应盘人")
+    public String detailsCreateUser;
+
+    @ApiParam("应盘时间")
+    public String detailsCreateDatetime;
+
+    @ApiParam("实盘人")
+    public String factCreateUser;
+
+    @ApiParam("实盘时间")
+    public String factCreateDatetime;
+
+
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java

@@ -0,0 +1,128 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-12-13 16:13
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SYS_SMS_SEND_RECORD")
+@ApiModel(value = "短信发送记录", description = "短信发送记录")
+public class SysSmsSendRecord extends BaseBean {
+
+    private static final long serialVersionUID = -3745690058553350416L;
+
+    /**
+     * 发送回执ID
+     */
+    @Column(name = "BIZ_ID")
+    @ApiModelProperty(value = "回执id")
+    private String bizId;
+
+    /**
+     * 软件模块
+     */
+    @Column(name = "SOFT_TYPE")
+    @ApiModelProperty(value = "软件模块")
+    private Integer softType;
+
+    /**
+     * 接收手机号
+     */
+    @Column(name = "RECEIVE_PHONE_NUMBER")
+    @ApiModelProperty(value = "接收手机号")
+    private String receivePhoneNumber;
+
+    /**
+     * 模板代码
+     */
+    @Column(name = "TEMPLATE_CODE")
+    @ApiModelProperty(value = "模板代码")
+    private String templateCode;
+
+    /**
+     * 模板名称
+     */
+    @Column(name = "TEMPLATE_NAME")
+    @ApiModelProperty(value = "模板名称")
+    private String templateName;
+
+    /**
+     * 短信签名代码
+     */
+    @Column(name = "SMS_SIGN_CODE")
+    @ApiModelProperty(value = "短信签名代码")
+    private String smsSignCode;
+
+    /**
+     * 短信签名
+     */
+    @Column(name = "SMS_SIGN")
+    @ApiModelProperty(value = "短信签名")
+    private String smsSign;
+
+    /**
+     * 短信内容
+     */
+    @Column(name = "SMS_CONTENT")
+    @ApiModelProperty(value = "短信内容")
+    private String smsContent;
+
+    /**
+     * 短信内容
+     */
+    @Column(name = "SMS_Param", length = 1000)
+    @ApiModelProperty(value = "短信参数")
+    private String smsParam;
+
+    /**
+     * 短信发送状态
+     */
+    @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SEND_STATUS.class)
+    @Column(name = "SMS_SEND_STATUS")
+    @ApiModelProperty(value = "短信发送状态")
+    private Integer smsSendStatus;
+
+    /**
+     * 短信发送时间
+     */
+    @Column(name = "SEND_DATE_TIME")
+    @ApiModelProperty(value = "短信发送时间")
+    private String sendDateTime;
+
+    /**
+     * 短信接收日期和时间
+     */
+    @Column(name = "RECEIVE_DATE_TIME")
+    @ApiModelProperty(value = "短信接收日期和时间")
+    private String receiveDateTime;
+
+    /**
+     * 短信发送异常信息
+     */
+    @Lob
+    @Column(name = "SEND_ERR_MSG")
+    @ApiModelProperty(value = "短信发送异常信息")
+    private String sendErrMsg;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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 : yunhao
+ * @CreateDate : 2020-12-13 16:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SYS_SMS_SIGN")
+@ApiModel(value = "短信签名", description = "短信签名")
+public class SysSmsSign extends BaseBean {
+
+    private static final long serialVersionUID = -8979657974497978428L;
+
+    /**
+     * 签名
+     */
+    @Column(name = "SIGN_NAME")
+    @ApiModelProperty(value = "签名")
+    private String signName;
+
+    /**
+     * 签名代码
+     */
+    @Column(name = "SIGN_CODE")
+    @ApiModelProperty(value = "签名代码")
+    private String signCode;
+
+    /**
+     * 签名描述
+     */
+    @Column(name = "SIGN_DESC")
+    @ApiModelProperty(value = "签名描述")
+    private String signDesc;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java

@@ -0,0 +1,101 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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 : yunhao
+ * @CreateDate : 2020-12-13 16:11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SYS_SMS_TEMPLATE")
+@ApiModel(value = "短信模板", description = "短信模板")
+public class SysSmsTemplate extends BaseBean {
+
+    private static final long serialVersionUID = -3879367761511016412L;
+
+    /**
+     * 模板名称
+     */
+    @Column(name = "TEMPLATE_NAME")
+    @ApiModelProperty(value = "模板名称")
+    private String templateName;
+
+    /**
+     * 模板代码
+     */
+    @Column(name = "TEMPLATE_CODE")
+    @ApiModelProperty(value = "模板代码")
+    private String templateCode;
+
+    /**
+     * 模板代码
+     */
+    @Column(name = "SUPPLIER_TEMPLATE_CODE")
+    @ApiModelProperty(value = "模板代码")
+    private String supplierTemplateCode;
+
+    /**
+     * 模板类型
+     */
+    @Column(name = "TEMPLATE_TYPE")
+    @ApiModelProperty(value = "模板类型")
+    private Integer templateType;
+
+    /**
+     * 供应商类型
+     */
+    @Column(name = "SUPPLIER_TYPE")
+    @ApiModelProperty(value = "供应商类型")
+    private Integer supplierType;
+
+    /**
+     * 模板状态
+     */
+    @Column(name = "TEMPLATE_STATUS")
+    @ApiModelProperty(value = "模板状态")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class)
+    private Integer templateStatus;
+
+    /**
+     * 模板内容
+     */
+    @Column(name = "TEMPLATE_CONTENT")
+    @ApiModelProperty(value = "模板内容")
+    private String templateContent;
+
+    /**
+     * 模板描述
+     */
+    @Column(name = "TEMPLATE_DESC")
+    @ApiModelProperty(value = "模板描述")
+    private String templateDesc;
+
+
+    /**
+     * 审批备注
+     */
+    @Transient
+    @ApiModelProperty(value = "审批备注")
+    private String reason;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysSmsSendRecord;
+
+/**
+ * @Description : 短信发送记录
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-12-14 17:52
+ * @Modify:
+ **/
+public interface SysSmsSendRecordRepository extends BaseRepository<SysSmsSendRecord, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysSmsSign;
+
+/**
+ * @Description : 短信签名
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-12-14 17:51
+ * @Modify:
+ **/
+public interface SysSmsSignRepository extends BaseRepository<SysSmsSign, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysSmsTemplate;
+
+/**
+ * @Description : 短信模板
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-12-14 17:52
+ * @Modify:
+ **/
+public interface SysSmsTemplateRepository extends BaseRepository<SysSmsTemplate, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -584,11 +584,11 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result);
 //        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
 
-        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result);
-        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result);
-        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result);
-        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result);
-        DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(), "userEmpNo", result);
 //        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         DdlPreparedPack.getInPackList(idList, "id", result);
@@ -1143,66 +1143,68 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){
+    public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan);
 
-        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(), "id", ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(), "name", ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(), "groupName", ddlPackBean);
 
         return ddlPackBean;
     }
-    public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){
+
+    public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
 
-        DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(), "id", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean);
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){
+    public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
 
-        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean);
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin){
+    public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLogUserLogin);
 
-        DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(),"logLoginStatus",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(), "logLoginStatus", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(),"logLoginPlatform",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(), "logLoginPlatform", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(),"logLoginName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(), "logLoginName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginHost(), "logLoginHost", ddlPackBean);
         DdlPreparedPack.timeBuilder(sysLogUserLogin.getLogLoginDateTime(), "logLoginDateTime", ddlPackBean, false, true);
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef,List<String> valueList){
+    public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef, List<String> valueList) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean);
-        DdlPreparedPack.getInPackList(valueList,"valueList",ddlPackBean);
+        DdlPreparedPack.getInPackList(valueList, "valueList", ddlPackBean);
 
         return ddlPackBean;
     }
-    public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef,List<Long> userIdList){
+
+    public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef, List<Long> userIdList) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean);
-        DdlPreparedPack.getInPackList(userIdList,"userId",ddlPackBean);
+        DdlPreparedPack.getInPackList(userIdList, "userId", ddlPackBean);
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal){
+    public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysRefUserExternal);
 
         DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getUserId(), "userId", ddlPackBean);
@@ -1213,7 +1215,7 @@ public class CoreHqlPack {
     }
 
 
-    public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord){
+    public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord);
 
         DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean);
@@ -1224,7 +1226,7 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord){
+    public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord);
 
         DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean);
@@ -1235,20 +1237,105 @@ public class CoreHqlPack {
     }
 
 
-    public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){
+    public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment);
 
         DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean);
 
         return ddlPackBean;
     }
 
-    public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){
+    public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize);
 
         DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 封装检查短信签名唯一hql
+     *
+     * @param sysSmsSign 短信签名信息
+     * @return 封装信息
+     */
+    public static DdlPackBean packHqlCheckSysSmsSignOnly(SysSmsSign sysSmsSign) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign);
+
+        DdlPreparedPack.getNumNOEqualPack(sysSmsSign.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 封装短信签名查询hql
+     *
+     * @param sysSmsSign 短信签名信息
+     * @return 封装信息
+     */
+    public static DdlPackBean packHqlFindSysSmsSign(SysSmsSign sysSmsSign) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign);
+
+        DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignName(), "signName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 封装检查短信模板唯一hql
+     *
+     * @param sysSmsTemplate 短信模板信息
+     * @return 封装信息
+     */
+    public static DdlPackBean packHqlCheckSysSmsTemplateOnly(SysSmsTemplate sysSmsTemplate) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate);
+
+        DdlPreparedPack.getNumNOEqualPack(sysSmsTemplate.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 封装短信模板查询hql
+     *
+     * @param sysSmsTemplate 短信模板信息
+     * @return 封装信息
+     */
+    public static DdlPackBean packHqlFindSysSmsTemplate(SysSmsTemplate sysSmsTemplate) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate);
+
+        DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 封装短信发送记录查询hql
+     *
+     * @param sysSmsSendRecord 短信发送记录
+     * @return 封装信息
+     */
+    public static DdlPackBean packHqlFindSysSmsSendRecord(SysSmsSendRecord sysSmsSendRecord) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSendRecord);
+
+        DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateCode(), "templateCode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateName(), "templateName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getReceivePhoneNumber(), "receivePhoneNumber", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getBizId(), "bizId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSoftType(), "softType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSmsSendStatus(), "smsSendStatus", ddlPackBean);
+        DdlPreparedPack.timeBuilder(sysSmsSendRecord.getSendDateTime(), "smsSendStatus", ddlPackBean,false,true);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java

@@ -53,4 +53,15 @@ public class SwebPurchaseChangeLog extends BaseBean {
     @Column(name = "REMARK")
     @ApiParam("备注")
     private String remark;
+
+    public SwebPurchaseChangeLog() {
+
+    }
+
+    public SwebPurchaseChangeLog(Integer itemStatus, String remark, String modifyDatetime, String modifyUser) {
+        this.itemStatus = itemStatus;
+        this.remark = remark;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -278,10 +278,11 @@ public class WmsPOMasterDetails extends BaseBean {
         this.rcQty = rcQty;
     }
 
-    public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){
+    public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode, String createDatetime){
         this.orderNo = orderNo;
         this.erpAreaNo = erpAreaNo;
         this.organizeCode = organizeCode;
+        this.createDatetime = createDatetime;
     }
 
     public WmsPOMasterDetails(

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -8,8 +8,6 @@ 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;
@@ -19,6 +17,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 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;
 import java.util.Date;
@@ -923,4 +923,14 @@ public class WmsStockSn extends BaseBean {
         this.snStatus = snStatus;
         this.lotNo = lotNo;
     }
+
+    public WmsStockSn(String organizeCode, String sn, String partNo, String locateNo, String whNo, String zoneNo, String vendorNo) {
+        this.organizeCode = organizeCode;
+        this.sn = sn;
+        this.partNo = partNo;
+        this.locateNo = locateNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.vendorNo = vendorNo;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+/**
+ * @Description : 自动生成领料看板model
+ * @Author : shun.cui
+ * @CreateDate : 2020/12/17 10:34
+ * @Modify :
+ **/
+@Data
+@Api("自动生成领料看板")
+public class AutoPickingModel {
+    @ApiParam("工厂名")
+    private String organizeCode;
+    @ApiParam("计划日期")
+    private String planDate;
+    @ApiParam("sap单号")
+    private String erpSrcNo;
+    @ApiParam("状态")
+    private int orderStatus;
+    @ApiParam("父零件号")
+    private String partNo;
+    @ApiParam("简称")
+    private String partNameRdd;
+    @ApiParam("完成数量")
+    private Double printQty;
+    @ApiParam("总数量")
+    private Double qty;
+    @ApiParam("操作时间")
+    private String modifyDateTime;
+    @ApiParam("操作人")
+    private String modifyUser;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 最低库存/最高库存 预警看板 Model
+ * @Author : shun.cui
+ * @CreateDate : 2020/12/17 10:55
+ * @Modify :
+ **/
+@Data
+@Api("最低库存/最高库存预警看板")
+public class MinAndMaxStockModel {
+    @ApiParam("工厂名")
+    private String organizeCode;
+    @ApiParam("存储区")
+    private String zoneNo;
+    @ApiParam("库位")
+    private String locateNo;
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("简称")
+    private String partNameAdd;
+    @ApiParam("数量")
+    private Double qty;
+    @ApiParam("最低库存")
+    private Double min;
+    @ApiParam("最高库存")
+    private Double max;
+    @ApiParam("件号")
+    private String partTypeDesc;
+    @ApiParam("包装规格")
+    private Double snp;
+
+}

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./