Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java

@@ -96,7 +96,7 @@ public class PagerHelper {
         }
 
         int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize();
-        pager.setStartRow(startRow == 0 ? 1 : startRow);
+        pager.setStartRow(startRow);
 
         int endRow;
         if (startRow + pager.getPageSize() <= rowCount) {

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

@@ -936,9 +936,9 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FTP_CONNECTION_MODE {
         LOCAL_ACTIVE_MODE(10,  "本地主动模式"),
-        LOCAL_PASSIVE_MODE(20, "本地被动模式"),
+        LOCAL_PASSIVE_MODE(20, "本地被动模式");
 //        REMOTE_ACTIVE_MODE(30, "远程主动模式"),
-        REMOTE_PASSIVE_MODE(40, "远程被动模式");
+//        REMOTE_PASSIVE_MODE(40, "远程被动模式");
 
         private final int value;
         private final String description;

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

@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+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;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :IF_客户月度订单数据
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-11-06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_CUST_ORDER_DATA")
+@Api("IF_客户月度订单数据")
+public class IfCustOrderData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 855289009053695346L;
+
+    @Column(name = "RGANIZTION_CODE")
+    @ApiParam("工厂代码")
+    private String rganiztionCode;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name = "CUSTOMER_NAME")
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private Integer year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private Integer month;
+
+    @Column(name = "QTY")
+    @ApiParam("订单数量")
+    private Integer qty = 0;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Transient
+    @ApiParam("年度客户月度订单集合")
+    private List<Map<String,Object>> ifCustOrderDataMap = new ArrayList<>();
+}

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

@@ -57,4 +57,8 @@ public class MesCustomer extends BaseBean implements Serializable {
     @Column(name = "CUST_DELIVERY_LOCATION")
     @ApiParam("客户发往地")
     private String custDeliveryLocation;
+
+    @Column(name = "IS_BI_DISPLAY")
+    @ApiParam("是否BI显示")
+    private Integer isBiDisplay = 2;
 }

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

@@ -16,7 +16,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description:
+ * @Description: MES_QC_ORDER_DETAIL表的明细表
  * @Reference:
  * @Author: jessica.chen
  * @CreateDate: 2019\11\15 10:01

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

@@ -53,11 +53,8 @@ public class MgnBoardListModel {
     @ApiParam("车间")
     private String areaCode;
 
-    @ApiParam("绿线值")
+    @ApiParam("颜色")
-    private Double planPassYield;
+    private String color;
-
-    @ApiParam("上下偏差值")
-    private Double yieldDiffValue;
 
     @ApiParam("产线集合")
     private List<MgnBoardListColorModel> workCenterList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfCustOrderData;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface IfCustOrderDataRepository extends BaseRepository<IfCustOrderData, Long> {
+}

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -50,10 +51,11 @@ public class SysMessage extends BaseBean {
         if (this.messageType == null) {
             return 0;
         } else {
-            return this.messageType.intValue();
+            return this.messageType;
         }
     }
 
+    @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE_CONTENT.class)
     @Column(name = "MESSAGE_TYPE_CONTENT")
     @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1")
     private Integer messageContentType;
@@ -154,4 +156,16 @@ public class SysMessage extends BaseBean {
     @ApiParam(value = "附件集合")
     private List<SysFileAttach> sysFileAttachList;
 
+    @Transient
+    @ApiParam(value = "附件id集合")
+    private List<Long> fileAttachIdList;
+
+    public void addFileAttachId(Long attachId){
+        if(fileAttachIdList == null){
+            fileAttachIdList = new ArrayList<>();
+        }
+
+        fileAttachIdList.add(attachId);
+    }
+
 }

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

@@ -476,6 +476,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean);
 
         DdlPreparedPack.getOrderDefault(message);
+        ddlPackBean.setOrderByStr(message.orderBy());
 
         return ddlPackBean;
     }
@@ -487,6 +488,7 @@ public class CoreHqlPack {
      * @return
      */
     public static DdlPackBean packHqlSysFile(SysFile file) {
+        DdlPreparedPack.getOrderDefault(file);
         DdlPackBean result = DdlPackBean.getDdlPackBean(file);
 
         // hql拼接

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -120,6 +121,19 @@ public class BsSuitCaseFTP extends BaseBean {
         return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal());
     }
 
+    @ColumnDefault("2")
+    @Column(name = "IS_CHECK_FILE")
+    @ApiParam(value = "是否校验文件")
+    private Integer isCheckFile;
+
+    public boolean isCheckFile(){
+        return isCheckFile != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isCheckFile);
+    }
+
+    @Column(name = "CHECK_FILE_PATH")
+    @ApiParam(value = "校验文件路径")
+    private String checkFilePath;
+
     @Transient
     @ApiParam(value = "临时适配路径")
     private String tempSuitFilePath;

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

@@ -114,7 +114,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam(value = "紧急程度")
-    private String urgentStatus;
+    private Integer urgentStatus;
 
     @Column(name = "SRC_NO")
     @ApiParam(value = "源单号")

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

@@ -240,6 +240,18 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "不等于库位类型")
     private Integer notLocateType;
 
+    @Transient
+    @ApiParam(value = "总库位")
+    private Integer totalQty;
+
+    @Transient
+    @ApiParam(value = "已用库位")
+    private Integer usedQty;
+
+    @Transient
+    @ApiParam(value = "空库位")
+    private Integer emptyQty;
+
     public WmsLocate() {
     }
 

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

@@ -127,6 +127,9 @@ public class WmsLocatePart extends BaseBean {
     public double getMinValue(){
         return this.min ==null?0:this.min.doubleValue();
     }
+    public double getSafetyStockVal(){
+        return this.safetyStock ==null?0:this.safetyStock.doubleValue();
+    }
 
     public WmsLocatePart() {
     }

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

@@ -76,6 +76,10 @@ public class WmsStockQuan extends BaseBean {
     private Boolean includeZeroStock = false;
 
     @Transient
+    @ApiParam(value = "无差异库存显示")
+    private Boolean showNoDiffStock = false;
+
+    @Transient
     @ColumnDefault("0")
     @ApiParam(value = "库存数量总和")
     private Double sumQty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java

@@ -33,7 +33,7 @@ import javax.persistence.Table;
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "SRC_TABLE_NAME"),
         @Index(columnList = "DEST_BEAN_NAME"),
-        @Index(columnList = "SOFT_ADAPATOR_CODE"),
+        @Index(columnList = "SOFT_ADAPTOR_CODE"),
         @Index(columnList = "SID"),
         @Index(columnList = "MOVE_TO_ERP_ID")
 })
@@ -43,35 +43,39 @@ public class WmsInterfaceDataRecord extends BaseBean {
 
     @ApiParam("来源表名")
     @Column(name = "SRC_TABLE_NAME", length = 50)
-    public String srcTableName;
+    private String srcTableName;
 
     @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔")
     @Column(name = "DEST_BEAN_NAME", length = 500)
-    public String destBeanName;
+    private String destBeanName;
 
     @ApiParam("软适配编号")
-    @Column(name = "SOFT_ADAPATOR_CODE")
+    @Column(name = "SOFT_ADAPTOR_CODE")
-    public String softAdaptorCode;
+    private String softAdaptorCode;
 
     @ApiParam("接口名称")
     @Column(name = "INTERFACE_NAME")
-    public String interfaceName;
+    private String interfaceName;
 
     @ApiParam("报文唯一编号")
     @Column(name = "SID")
-    public Long sid;
+    private Long sid;
 
     @ApiParam("MOVE_TO_ERP表的ID")
     @Column(name = "MOVE_TO_ERP_ID")
-    public Long moveToErpID;
+    private Long moveToErpID;
 
     @ApiParam("报文校验状态")
     @Column(name = "VERIFY_STATUS")
     @ColumnDefault("10")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false)
-    public int verifyStatus;
+    private int verifyStatus;
 
     @ApiParam("备注信息")
     @Column(name = "REMARK")
-    public String remark;
+    private String remark;
+
+    @ApiParam("ERP文档编号")
+    @Column(name = "ERP_DOC_NO")
+    private String erpDocNo;
 }