合并代码

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

@@ -1070,7 +1070,7 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AUTH_PLATFORM {
         PC_IMPP_CORE(10, "PC-IMPP", "PC平台管理端"),
-        PC_WMS_SWEB(20, "PC-SWEB", "PC_SWEB后台管理端");
+        PC_WMS_SWEB(20, "PC-SWEB", "PC_SWEB供应商客户端");
 
 
         private int value;

modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java

@@ -0,0 +1,8 @@
+package cn.estsh.i3plus.pojo.eam.bean;
+
+/**
+ * @author ns
+ * @create 2022/3/28 0028 下午 14:11
+ */
+public class BaseBean {
+}

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

@@ -94,6 +94,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("最小下达批次")
     private Integer minGenLot;
 
+    @Column(name = "ALREADY_LANDED_QTY")
+    @ApiParam("已下达箱数")
+    private Integer alreadyLandedQty;
+
     @Transient
     @ApiParam("已下达箱数")
     private Integer alreadyLandedNum;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author ns
+ * @create 2022/3/30 0030 上午 10:12
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("钉钉单聊机器人批量推送消息")
+public class DingSendBatchRequestModel {
+
+    @ApiModelProperty(value ="手机号" , access ="手机号")
+   private  List<String> phoneNumberList ;
+    @ApiModelProperty(value ="消息标题" , access ="消息标题")
+    private String title ;
+    @ApiModelProperty(value ="消息内容" , access ="消息内容")
+    private String content;
+
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @author ns
+ * @create 2022/3/17 0017 上午 10:33
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_TABLE_TEMPLATE",indexes =
+        {
+                @Index(name="page",columnList = "page"),
+        })
+@ApiModel(value="自定义表格结构",description = "自定义表格结构")
+public class SysTableTemplate extends BaseBean {
+    /**
+     * 产品类型 属于哪个产品
+     */
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
+    @AnnoOutputColumn
+    private Integer softType;
+
+    @Column(name="PAGE")
+    @ApiParam(value ="表格所属页面")
+    private String page;
+
+    @Column(name="TEMPLATE_TYPE")
+    @ApiParam(value ="模板类型")
+    private String templateType;
+
+    @Lob
+    @Column(name="TEMPLATE_DATA")
+    @ApiParam(value ="模板数据")
+    private String templateData;
+}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysTableTemplate;
+
+/**
+ * @author ns
+ * @create 2022/3/17 0017 上午 10:51
+ */
+public interface SysTableTemplateRepository  extends BaseRepository<SysTableTemplate, Long> {
+}

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

@@ -475,6 +475,9 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean);
 
+        DdlPreparedPack.getStringEqualPack(message.getOrganizeCode(), "organizeCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(message.getMessageReceiversId(), "messageReceiversId", ddlPackBean);
+
         DdlPreparedPack.getOrderDefault(message);
         ddlPackBean.setOrderByStr(message.orderBy());
 
@@ -857,6 +860,8 @@ public class CoreHqlPack {
         HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(), "receiverTime", result);
         HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(), "receiverId", result);
 
+        HqlPack.getStringEqualPack(sysRefUserMessage.getOrganizeCode(), "organizeCode", result);
+
         // 添加默认排序
         HqlPack.getOrderDefault(sysRefUserMessage);