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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java

@@ -4,8 +4,7 @@ import lombok.Data;
 
 @Data
 public class GanttLineModel {
-    private long id;
+    private long from;
-    private long source;
+    private long to;
-    private long target;
     private int type;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * KPI接口数据
+ */
+@Data
+public class KPIModel {
+    private Integer salesOrderCount;
+
+    private Integer productOrderCount;
+
+    private Integer schedWorkCount;
+
+    private Integer noSchedWorkCount;
+
+    private Integer confirmOrderCount;
+
+    private String produceTimes;
+
+    private String settingTimes;
+
+    private Integer overdueSalesCount;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ResourceLodaRequest {
+    private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date begin;     // 统计开始时间
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date end;       // 统计结束时间
+
+    private Long[] resourceIds;
+}

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

@@ -1079,4 +1079,35 @@ public class ApsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 资源符合时间间隔类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RESOURCE_LOAD_SPAN {
+        ONE_HOUR("ONE_HOUR", "1小时"),
+        TWO_HOUR("TWO_HOUR", "2小时"),
+        SIX_HOUR("SIX_HOUR", "6小时"),
+        EIGHT_HOUR("EIGHT_HOUR", "8小时"),
+        TWELVE_HOUR("TWELVE_HOUR", "12小时"),
+        ONE_DAY("ONE_DAY", "1天"),
+        ONE_WEEK("ONE_WEEK", "1周"),
+        ONE_MONTH("ONE_MONTH", "1月");
+
+        private String value;
+        private String description;
+
+        RESOURCE_LOAD_SPAN(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -3572,7 +3572,8 @@ public class MesEnumUtil {
         PCN_LOGIN(160, "PCN_LOGIN", ""),
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
-        PCN_LOGOUT(190, "PCN_LOGOUT", "");
+        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
+        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
 
 
         private int value;

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

@@ -131,7 +131,8 @@ public class MesPcnEnumUtil {
         PCN_LOGIN(160, "PCN_LOGIN", ""),
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
-        PCN_LOGOUT(190, "PCN_LOGOUT", "");
+        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
+        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
 
 
         private int value;
@@ -214,6 +215,7 @@ public class MesPcnEnumUtil {
         }
 
     }
+
     /**
      * MES_TYPE_CFG 类型信息
      */
@@ -253,6 +255,7 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
     /**
      * MesProdBindRecord 是否是关键件
      */
@@ -2097,6 +2100,9 @@ public class MesPcnEnumUtil {
 
         NEVER(-1, "不过期"),
         ONE_HOUR(3600, "一小时"),
+        FIVE_MINS(300, "5分钟"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
         ONE_MIN(60, "一分钟");
 
         private int value;
@@ -2433,7 +2439,6 @@ public class MesPcnEnumUtil {
     }
 
 
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ONLINE_SEND_TYPE {
 

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

@@ -925,8 +925,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
+        CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"),
-        FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
+        FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
 
         private int value;
         private int code;
@@ -981,7 +981,6 @@ public class WmsEnumUtil {
 
     /**
      * 业务表：库存条码状态
-     * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
@@ -991,7 +990,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        //SCRAP(70, "报废"),
+        SCRAP(70,"报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -4656,7 +4655,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 计划拉动明细表状态创建
+     * 计划拉动主表状态创建
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -4709,4 +4708,40 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VENDOR_TYPE {
+        VENDOR(10, "供应商"), CARRIERS(20, "承运商");
+
+        private int value;
+        private String description;
+
+        VENDOR_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;
+        }
+    }
+
+
 }

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

@@ -39,10 +39,18 @@ public class MesPcn extends BaseBean {
     @ApiParam("区域")
     private String areaCode;
 
+    @Column(name = "AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
     @Column(name = "PCN_VERSION")
     @ApiParam("PCN版本")
     private String pcnVersion;

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

@@ -39,10 +39,18 @@ public class MesPcn extends BaseBean {
     @ApiParam("区域")
     private String areaCode;
 
+    @Column(name = "AREA_NAME")
+    @ApiParam("区域")
+    private String areaName;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心")
+    private String workCenterName;
+
     @Column(name = "PCN_VERSION")
     @ApiParam("PCN版本")
     private String pcnVersion;

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

@@ -50,6 +50,9 @@ public class MesPartObjectModel {
     @ApiParam("对象名称")
     private String objectName;
 
+    public MesPartObjectModel() {
+    }
+
     public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) {
         this.id = id;
         this.organizeCode = organizeCode;

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

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesDefectRecordRepositoty extends BaseRepository<MesDefectRecord, Long> {
+public interface MesDefectRecordRepository extends BaseRepository<MesDefectRecord, Long> {
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -48,7 +48,9 @@ public class SuitClientModel {
     /**
      * 适配结果信息
      */
+    @XStreamCDATA
     private String suitMessage;
+
     /**
      * 请求来源
      */

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -44,6 +43,7 @@ public class SuitServerModel {
      * 适配结果信息
      */
 //    @XStreamImplicit
+    @XStreamCDATA
     private String suitMessage;
 
     /**

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

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 盘点批量操作
+ * @author qianhs
+ */
+@Data
+public class WmsCSOrderMasterModel implements Serializable {
+
+    private static final long serialVersionUID = -5490167040159056107L;
+
+    @ApiParam("盘点订单主表")
+    public List<WmsCSOrderMaster> wmsCSOrderMasterList;
+
+    @ApiParam("工厂代码")
+    public String  organizeCode;
+}

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 条码FIFO推荐
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-12-17 20:41
+ * @Modify:
+ **/
+@Data
+public class WmsStockFifoModel {
+
+    @ApiParam(value = "工厂代码")
+    String organizeCode;
+
+    @ApiParam(value = "物料集合")
+    List<String> partNos;
+
+    @ApiParam(value = "存储区集合")
+    List<String> zoneNos;
+
+    @ApiParam(value = "物料对应的存储区")
+    Map<String, String> partToZoneMap;
+
+    @ApiParam(value = "单据号")
+    String orderNo;
+
+    @ApiParam(value = "物料对应的存储区集合")
+    Map<String,List<String>> partToZonesMap;
+}

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

@@ -54,6 +54,9 @@ public class SessionUser implements Serializable {
     @ApiParam("列表默认分页数量")
     private Integer pageDefaultSize;
 
+    @ApiParam("文件展示地址")
+    private String fileViewUrl;
+
     public SessionUser() {
     }
 

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

@@ -81,9 +81,10 @@ public class CoreHqlPack {
 
         if(resource != null){
             DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
+            DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
             DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
             DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
-            DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result);
+            DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result);
             DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result);
         }
 

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

@@ -98,6 +98,19 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配结果")
     private Integer suitResult;
 
+    @Column(name = "SUIT_START_DATE_TIME")
+    @ApiParam(value = "适配开始时间")
+    private String suitStartTime;
+
+    @Column(name = "SUIT_END_DATE_TIME")
+    @ApiParam(value = "适配结束时间")
+    private String suitEndTime;
+
+    @Column(name = "EXECUTE_TIME")
+    @ApiParam(value = "执行耗时")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long executeTime;
+
     @Lob
     @Column(name = "SUIT_MESSAGE")
     @ApiParam(value = "适配信息")

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

@@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean {
 
     @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false)
     @ApiParam(value = "是否自动开窗")
+    @AnnoOutputColumn
     private Integer isAutoOpenWindow;
 
     @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")

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

@@ -119,6 +119,19 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "物料数量", example = "1")
     public Double sumPartQty;
 
+    /**
+     * 条码状态:1=创建,10=已收货,20=已质检,
+     * 30=已入库,40=待出库,50=已出库,
+     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     */
+    @Transient
+    @ApiParam(value = "条码状态", example = "1")
+    public Integer snStatus;
+
+    @Transient
+    @ApiParam(value = "条码状态(冻结时)", example = "1")
+    public Integer destSnStatus;
+
     @Transient
     @ApiParam("存储区编号组")
     public String[] zoneNos;

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

@@ -93,6 +93,11 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
+    @Column(name = "DEST_SN_STATUS")
+    @ApiParam(value = "条码状态(冻结时)", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer destSnStatus;
+
     /**
      * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
      */

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.Objects;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -205,6 +206,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
     private Integer printStatus;
 
+    @Transient
+    @ApiParam("优先级")
+    private String priority;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }
@@ -254,4 +259,17 @@ public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "IS_SN")
     @ApiParam(value = "条码生成状态", example = "20")
     public Integer isSn;
+
+
+    public WmsDocMovementDetails () {
+
+    }
+
+    public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {
+        this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+    }
+
 }

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

@@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{
 
     @Column(name="WROKORDER_NO")
     @ApiParam("工单号")
-    private String wrokorderNo;
+    private String woekorderNo;
 
     @Column(name="ITEM")
     @ApiParam(value = "行号", example = "0")
@@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{
     private Double bootLotNo = 0d;
 
     @Column(name="ORDER_STATUS")
-    @ApiParam(value = "单据状态", example = "0")
+    @ApiParam(value = "明细状态", example = "0")
     private Integer orderStatus = 0;
 
     public Integer getOrderStatus() {

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

@@ -53,8 +53,6 @@ public class WmsRouting extends BaseBean {
 
     @Column(name = "FOR_PRODUCT")
     @ApiParam(value = "适用产品")
-    
-     
     private Integer forProduct;
 
 	@Transient

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

@@ -109,6 +109,10 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("关联单号")
     private String refOrderNo;
 
+    @Column(name="PATH_URL")
+    @ApiParam("回执单地址")
+    private String pathUrl;
+
     @Transient
     @ApiParam("打印模板列表")
     private List<WmsTmsShipModel> shipModels;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -58,4 +58,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam(value ="车牌号RDD")
     private String carNo;
+
+    @ApiParam("回执单地址")
+    private String pathUrl;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java

@@ -23,4 +23,10 @@ public class WmsTmsShipModel {
     private Double recQty;
     @ApiParam("单位")
     private String unit;
+
+    @ApiParam("序号")
+    private Integer item;
+
+    @ApiParam("装车时间")
+    private String modifyDatetime;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2618,7 +2618,18 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getInPack(statusList, "orderStatus", result);
+        List<String> stringList = null;
+        List<Integer> integerList = null;
+        //List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+        if(StringUtils.isNotBlank(statusList)){
+            stringList = Arrays.asList(statusList.split(","));
+            integerList = new ArrayList<>();
+            for(String sl : stringList){
+                integerList.add(Integer.valueOf(sl));
+            }
+        }
+
+        DdlPreparedPack.getInPackList(integerList, "orderStatus", result);
         DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
         DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
@@ -2637,7 +2648,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsPullTaskDetails, result);