Merge branch 'test'

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -338,9 +338,10 @@ public class AndonManageQueue extends BaseManageQueue {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
+    public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
         this.organizeCode = organizeCode;
         this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellCode = workCellCode;
         this.workCellNameRdd = workCellNameRdd;
         this.resetUser = resetUser;
         this.alarmCode = alarmCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -21,6 +21,12 @@ public class AndonBoardModel {
     @ApiParam("工作单元名称")
     private String workCellName;
 
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @ApiParam("生产线名称")
+    private String workCenterName;
+
     @ApiParam("安灯任务编号")
     private String andonOrderNo;
 
@@ -36,9 +42,12 @@ public class AndonBoardModel {
     @ApiParam("响应时长  单位：分钟")
     private Long responseTimeCount = 0L;
 
-    @ApiParam("解决时长  单位：分钟")
+    @ApiParam("响应时长  单位：分钟")
     private Long resetTimeCount = 0L;
 
+    @ApiParam("响应时长/响应时长(通用)  单位：分钟")
+    private Long commonTimeCount = 0L;
+
     @ApiParam("安灯正常处理的次数")
     private Integer inTime = 0;
 
@@ -60,6 +69,8 @@ public class AndonBoardModel {
     @ApiParam("工位运行状态")
     private String  cellStatus;
 
+    @ApiParam("图表类型颜色")
+    private String color;
 
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
@@ -85,6 +96,8 @@ public class AndonBoardModel {
         return resetTimeCount == null ? 0 : resetTimeCount;
     }
 
-
+    public double getCommonTimeCountVal() {
+        return commonTimeCount == null ? 0 : commonTimeCount;
+    }
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.andon.model;
 
 import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -40,27 +42,54 @@ public class AndonMenuInterfaceModel{
     @ApiParam("当前安灯类型故障比例")
     private Double  proportion = 0D;
 
-    @ApiParam("当前工厂的产线故障统计")
+    @ApiParam("图表类型颜色")
-    private List<AndonMenuInterfaceModel> andonWorkcenterList;
+    private String color;
 
-    @ApiParam("当前产线的所有故障统计")
+    @ApiParam("安灯状态")
-    private List<AndonBoardModel> alarmBrokenInfoList;
+    private Integer actionCode;
 
-    @ApiParam("当前产线的未解决故障统计")
+    @ApiParam("安灯状态名称")
-    private List<AndonBoardModel> pendingSolveBrokenInfoList;
+    private String actionName;
+
+    @ApiParam("mes微服调用-故障次数占比")
+    private List<AndonBoardModel> mesBrokenRatioList;
 
-    @ApiParam("当前产线的响应时长top10")
+    @ApiParam("故障时长类型占比 / 故障次数占比 / 工厂故障信息-产线故障时长-产线时长集合")
-    private List<AndonBoardModel> responseInfoList;
+    private List<AndonBoardModel> brokenRatioList;
 
-    @ApiParam("当前产线的解决时长top10")
+    @ApiParam("工厂故障信息-产线故障时长-安灯类型集合")
-    private List<AndonBoardModel> solveInfoList;
+    private List<AndonMenuInterfaceModel> workcenterBrokenTimeList;
 
-    @ApiParam("当前产线的异常时长top10")
+    @ApiParam("工厂故障信息-产线故障时长-产线集合")
-    private List<AndonBoardModel> exceptionInfoList;
+    private List<MesWorkCenter> workCenterList;
 
-    @ApiParam("当前产线的站点状态统计")
+    @ApiParam("产线整体状态")
+    private List<AndonMenuInterfaceModel> andonWorkcenterList;
+
+    @ApiParam("产品运行状态示意图")
     private List<CellGroupStatusModel> andonCellGroupStatusList;
 
+    @ApiParam("事件设备时长TOP10")
+    private List<AndonMenuInterfaceModel> equTimeList;
+
+    @ApiParam("事件设备时长TOP10-次数")
+    private List<String> equInTimeList;
+
+    @ApiParam("事件质量时长TOP10")
+    private List<AndonMenuInterfaceModel> qualityTimeList;
+
+    @ApiParam("事件质量时长TOP10-次数")
+    private List<String> qualityInTimeList;
+
+    @ApiParam("事件物料时长TOP10")
+    private List<AndonMenuInterfaceModel> partTimeList;
+
+    @ApiParam("事件物料时长TOP10-次数")
+    private List<String> partInTimeList;
+
+    @ApiParam("当前产线的未解决故障统计")
+    private List<AndonBoardModel> pendingSolveBrokenInfoList;
+
     public double getExceptionTimeVal() {
         return exceptionTime == null ? 0 : exceptionTime;
     }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -867,4 +867,13 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    public static DdlPackBean packHqlAndonMenu(String organizeCode, String workCenterCode, String startDateTime, String endDateTime) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(workCenterCode)) {
+            DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", result);
+        }
+        DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true);
+        return result;
+    }
 }

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

@@ -947,21 +947,24 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 110060104, "物料"),
+        //下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序
-        QUALITY("QUALITY_ALARM", 110060105, "质量"),
+        EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"),
-        EQUIP("EQUMENT_ALARM", 110060106, "设备"),
+        QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"),
-        PROCESS("ROUTING_ALARM", 110060107, "工艺"),
+        PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
-        CHECK("OTHER_ALARM", 110060108, "自处理"),
+        PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
-        FIX_ERROR("FIX_ERROR", 110060109, "自动报警");
+        CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"),
+        FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
 
         private String value;
         private Integer code;
         private String description;
+        private String colour;
 
-        ALARM_TYPE(String value, Integer code, String description) {
+        ALARM_TYPE(String value, Integer code, String description, String colour) {
             this.value = value;
             this.code = code;
             this.description = description;
+            this.colour = colour;
         }
 
         public String getValue() {
@@ -976,6 +979,10 @@ public class AndonEnumUtil {
             return description;
         }
 
+        public String getColour() {
+            return colour;
+        }
+
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -995,6 +1002,16 @@ public class AndonEnumUtil {
             }
             return tmp;
         }
+
+        public static String colourOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].colour;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

@@ -1461,7 +1461,9 @@ public class MesEnumUtil {
         MES_PART_OJBECT(340, "物料对象"),
         MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
         MES_DATASOURCE(360, "DB地址清单"),
-        MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置");
+        MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
+        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
+        MES_PLC(390,"PLC地址清单");
 
         private int value;
         private String description;
@@ -1871,7 +1873,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * pcn 动作类型
+     * MesProdBindRecord 动作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_TYPE {
@@ -3161,6 +3163,7 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 质量标准配置
      */
@@ -3168,7 +3171,8 @@ public class MesEnumUtil {
     public enum QUALITY_STANDARD_TYPE {
 
         NG_RATE(10, "不良率"),
-        PPM(20, "PPM");
+        INNER_PPM(20, "PPM"),
+        ONLINE_PPM(30, "线上PPM");
 
         private int value;
         private String description;
@@ -3233,6 +3237,7 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
     /**
      * MesProduceSn实体对应的qcStatus值  条码表条码质量状态
      */

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

@@ -3023,6 +3023,8 @@ public class WmsEnumUtil {
         }
     }
 
+
+
     /**
      * 任务数据来源：检查子数据
      */
@@ -4427,8 +4429,9 @@ public class WmsEnumUtil {
         WAIT_RECEIVING(10, "待收货"),
         RECEIVING(20, "收货中"),
         COMPLETE_RECEIVING(30, "收货完成"),
-        UN_RECEIVED(40, "延迟未收货"),
+        CLOSE(40,"已关闭"),
-        ELSE(50,"其他");
+        CANCEL(50,"已取消"),
+        UN_RECEIVED(60, "延迟未收货");
 
         private int value;
         private String description;
@@ -4565,4 +4568,145 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 是否贵重物料
+     * 默认为2
+     */
+    public enum IS_VALUABLE {
+        TRUE(1, "贵重物料"), FALSE(2, "非贵重物料");
+
+        private int value;
+        private String description;
+
+        IS_VALUABLE(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;
+        }
+    }
+
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_DETAILS_STATUS {
+        BE_HANDLE(10,"BE_HANDLE", "待处理"),
+        CANCELLATION(20,"CANCELLATION", "已处理");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PULL_TASK_DETAILS_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_MASTER_STATUS {
+        CREATE(10,"CREATE", "创建"),
+        ENABLED(20,"ENABLED", "已启动"),
+        COMPLETE(30,"COMPLETE", "已完成"),
+        CLOSE(40,"CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PULL_TASK_MASTER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java

@@ -16,8 +16,6 @@ public class StringUtil {
 		return false;
 	}
 
-
-
 	/**
 	 * 获取对象所有属性名
 	 * @param clazz
@@ -47,14 +45,6 @@ public class StringUtil {
 		for(int i = 0;i < superFields.length; i++){
 			fieldNames.add(superFields[i].getName());
 		}
-//		fieldNames.add("id");
-//		fieldNames.add("organizeCode");
-//		fieldNames.add("isValid");
-//		fieldNames.add("isDeleted");
-//		fieldNames.add("createUser");
-//		fieldNames.add("createDatetime");
-//		fieldNames.add("modifyUser");
-//		fieldNames.add("modifyDatetime");
 		return fieldNames;
 	}
 
@@ -75,18 +65,4 @@ public class StringUtil {
 			return null;
 		}
 	}
-
-	/**
-	 * 拼接对象所有属性名
-	 * @return
-	 */
-	public static String getFieldNames(String[] fieldNames) {
-		StringBuffer stringBuffer = new StringBuffer();
-		for (String fieldName : fieldNames) {
-			stringBuffer.append(fieldName).append(",");
-		}
-		int stringBufferLength = stringBuffer.length();
-		stringBuffer.delete(stringBufferLength - 1, stringBufferLength);
-		return stringBuffer.toString();
-	}
 }

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/12 4:00 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_WMS_PPM")
+@Api("WMS PPM 接口表")
+public class IfWmsPpm extends BaseBean {
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private String year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private String month;
+
+    @Column(name = "PPM_VALUE")
+    @ApiParam("PPM值")
+    private String ppmValue;
+
+    @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;
+}

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

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -138,6 +139,31 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("下线结束时间")
     private String outWorkCenterTimeEnd;
 
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
+    public MesProduceSn() {
+    }
+
+    public MesProduceSn(String partNo, Integer qcStatus, Double qty) {
+        this.partNo = partNo;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+    }
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -138,6 +138,22 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("下线结束时间")
     private String outWorkCenterTimeEnd;
 
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
+
+    @Transient
+    @ApiParam("条码状态名称")
+    private String snStatusName;
+
+    @Transient
+    @ApiParam("质量状态名称")
+    private String qcStatusName;
+
+    @Transient
+    @ApiParam("条码类型名称")
+    private String snTypeName;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -47,7 +47,7 @@ public class MesRawPartSn extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("数量")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("生产批次")
@@ -65,7 +65,7 @@ public class MesRawPartSn extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 

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

@@ -39,7 +39,7 @@ public class IfRawPartDataModel extends BaseBean {
     private String serialNumber;
 
     @ApiParam("数量")
-    private BigDecimal qty;
+    private Double qty;
 
     @ApiParam("单位")
     private String unit;

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

@@ -74,6 +74,12 @@ public class ProdBindRecordModel implements Serializable {
     @ApiParam(value = "动作类型")
     private String actionType;
 
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
+    @ApiParam(value = "动作类型名称")
+    private String actionTypeName;
+
     public ProdBindRecordModel() {
 
     }

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

@@ -66,6 +66,9 @@ public class ProductBiModel {
     @ApiParam("x坐标内容")
     private List<String> xAxis;
 
+    @ApiParam("一些携带值 eg:异常类型，异常次数")
+    private Map<String, Object> carryMap;
+
     @ApiParam("图表显示的数据")
     private List<ProductBiSeriesModel> series;
 

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

@@ -82,11 +82,17 @@ public class QcCheckDataModel {
     @ApiParam("物料名称")
     private String partName;
 
+    @ApiParam(value = "修改人")
+    private String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    private String modifyDatetime;
+
     public QcCheckDataModel() {
 
     }
 
-    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName) {
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partName, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.organizeCode = organizeCode;
         this.createUser = createUser;
@@ -112,5 +118,7 @@ public class QcCheckDataModel {
         this.squadLeader = squadLeader;
         this.workCellName = workCellName;
         this.partName = partName;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
     }
 }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfWmsPpm;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface IfWmsPpmRepository extends BaseRepository<IfWmsPpm, Long> {
+}

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

@@ -85,6 +85,10 @@ public class BasVendor extends BaseBean{
     @ApiParam("小数位符号")
     private String decimals;
 
+    //20-承运商
+    @Column(name = "VENDOR_TYPE")
+    private Integer vendorType;
+
     public BasVendor() {
     }
 

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

@@ -170,6 +170,11 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "待质检比例", example = "1")
     private Double proportion;
 
+    @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
+    @ApiParam(value = "贵重物料")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
+    private Integer isValuable;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

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 woekorderNo;
+    private String wrokorderNo;
 
     @Column(name="ITEM")
     @ApiParam(value = "行号", example = "0")
@@ -47,8 +47,8 @@ public class WmsPullTaskDetails extends BaseBean{
     private String locateNo;
 
     @Column(name="LOCATE_CAPACITY")
-    @ApiParam("库位容量")
+    @ApiParam(value = "库位容量", example = "0")
-    private String locateCapacity;
+    private Integer locateCapacity = 0;
 
     @Column(name="PART_NO")
     @ApiParam("零件编号")
@@ -58,49 +58,53 @@ public class WmsPullTaskDetails extends BaseBean{
     @ApiParam("零件名称")
     private String partNameRdd;
 
+    @Column(name="PLAN_PACK_QTY")
+    @ApiParam(value = "计划数量", example = "0d")
+    private Double planPackQty = 0d;
+
     @Column(name="PLAN_PACK_COUNT")
-    @ApiParam(value = "计划容器数", example = "0")
+    @ApiParam(value = "计划容器数", example = "0d")
-    private Integer planPackCount = 0;
+    private Double planPackCount = 0d;
 
     @Column(name="FIRST_BATCH_QTY")
-    @ApiParam(value = "首批批量", example = "0")
+    @ApiParam(value = "首批批量", example = "0d")
-    private Integer firstBatchQty = 0;
+    private Double firstBatchQty = 0d;
 
     @Column(name="FIRST_PACK_COUNT")
-    @ApiParam(value = "首批容器数", example = "0")
+    @ApiParam(value = "首批容器数", example = "0d")
-    private Integer firstPackCount = 0;
+    private Double firstPackCount = 0d;
 
     @Column(name="REQUEST_QTY")
-    @ApiParam(value = "补货批量", example = "0")
+    @ApiParam(value = "补货批量", example = "0d")
-    private Integer requestQty = 0;
+    private Double requestQty = 0d;
 
     @Column(name="REQUEST_PACK_COUNT")
-    @ApiParam(value = "补货容器数", example = "0")
+    @ApiParam(value = "补货容器数", example = "0d")
-    private Integer requestPackCount = 0;
+    private Double requestPackCount = 0d;
 
     @Column(name="REQUEST_LOT_NO")
-    @ApiParam(value = "补货批次", example = "0")
+    @ApiParam(value = "补货批次", example = "0d")
-    private Integer requestLotNo = 0;
+    private Double requestLotNo = 0d;
 
     @Column(name="REQUEST_TOTAL_COUNT")
-    @ApiParam(value = "补货累加次数", example = "0")
+    @ApiParam(value = "补货累加次数", example = "0d")
-    private Integer requestTotalCount = 0;
+    private Double requestTotalCount = 0d;
 
     @Column(name="LAST_REQUEST_TIME")
     @ApiParam("上一次补货时间")
     private String lastRequestTtime;
 
     @Column(name="BOOT_QTY")
-    @ApiParam(value = "尾箱批量", example = "0")
+    @ApiParam(value = "尾箱批量", example = "0d")
-    private Integer bootQty = 0;
+    private Double bootQty = 0d;
 
     @Column(name="BOOT_PACK_COUNT")
-    @ApiParam(value = "尾箱容器数", example = "0")
+    @ApiParam(value = "尾箱容器数", example = "0d")
-    private Integer bootPackCount = 0;
+    private Double bootPackCount = 0d;
 
     @Column(name="BOOT_LOT_NO")
-    @ApiParam(value = "尾箱批次", example = "0")
+    @ApiParam(value = "尾箱批次", example = "0d")
-    private Integer bootLotNo = 0;
+    private Double bootLotNo = 0d;
 
     @Column(name="ORDER_STATUS")
     @ApiParam(value = "单据状态", example = "0")
@@ -110,48 +114,56 @@ public class WmsPullTaskDetails extends BaseBean{
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }
 
-    public Integer getBootLotNo() {
+    public Double getBootLotNo() {
-        return bootLotNo == null ? 0 : this.bootLotNo.intValue();
+        return bootLotNo == null ? 0d : this.bootLotNo.doubleValue();
     }
 
-    public Integer getBootPackCount() {
+    public Double getBootPackCount() {
-        return bootPackCount == null ? 0 : this.bootPackCount.intValue();
+        return bootPackCount == null ? 0d : this.bootPackCount.doubleValue();
     }
 
-    public Integer getBootQty() {
+    public Double getBootQty() {
-        return bootQty == null ? 0 : this.bootQty.intValue();
+        return bootQty == null ? 0d : this.bootQty.doubleValue();
     }
 
-    public Integer getRequestTotalCount() {
+    public Double getRequestTotalCount() {
-        return requestTotalCount == null ? 0 : this.requestTotalCount.intValue();
+        return requestTotalCount == null ? 0d : this.requestTotalCount.doubleValue();
     }
 
-    public Integer getRequestLotNo() {
+    public Double getRequestLotNo() {
-        return requestLotNo == null ? 0 : this.requestLotNo.intValue();
+        return requestLotNo == null ? 0d : this.requestLotNo.doubleValue();
     }
 
-    public Integer getRequestPackCount() {
+    public Double getRequestPackCount() {
-        return requestPackCount == null ? 0 : this.requestPackCount.intValue();
+        return requestPackCount == null ? 0d : this.requestPackCount.doubleValue();
     }
 
-    public Integer getRequestQty() {
+    public Double getRequestQty() {
-        return requestQty == null ? 0 : this.requestQty.intValue();
+        return requestQty == null ? 0d : this.requestQty.doubleValue();
     }
 
-    public Integer getFirstPackCount() {
+    public Double getFirstPackCount() {
-        return firstPackCount == null ? 0 : this.firstPackCount.intValue();
+        return firstPackCount == null ? 0d : this.firstPackCount.doubleValue();
     }
 
-    public Integer getFirstBatchQty() {
+    public Double getFirstBatchQty() {
-        return firstBatchQty == null ? 0 : this.firstBatchQty.intValue();
+        return firstBatchQty == null ? 0d : this.firstBatchQty.doubleValue();
     }
 
-    public Integer getPlanPackCount() {
+    public Double getPlanPackCount() {
-        return planPackCount == null ? 0 : this.planPackCount.intValue();
+        return planPackCount == null ? 0d : this.planPackCount.doubleValue();
     }
 
     public Integer getItem() {
         return item == null ? 0 : this.item.intValue();
     }
 
+    public Double getLocateCapacity() {
+        return locateCapacity == null ? 0d : this.locateCapacity.doubleValue();
+    }
+
+    public Double getPlanPackQty() {
+        return planPackQty == null ? 0d : this.planPackQty.doubleValue();
+    }
+
 }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -13,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 车辆信息
@@ -103,4 +105,11 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("物料编码")
     private String partNo;
 
+    @Transient
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    @Transient
+    @ApiParam("打印模板列表")
+    private List<WmsTmsShipModel> shipModels;
 }

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

@@ -19,10 +19,12 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam("物料号")
     private String partNo;
+
     @ApiParam("运输状态")
-    private String carriageStatus;
+    private String orderStatus;
+
     @ApiParam("单据号")
-    private String orderNo;
+    private String moveNo;
 
     @ApiParam("是否删除，默认否")
     protected Integer isDeleted = 2;

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 装车单打印
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsTmsShipModel {
+
+    @ApiParam("物料编码")
+    private String partNo;
+    @ApiParam("物料名称")
+    private String partName;
+    @ApiParam("需求数量")
+    private Double qty;
+    @ApiParam("实际数量")
+    private Double recQty;
+    @ApiParam("单位")
+    private String unit;
+}

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

@@ -6,18 +6,14 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -420,6 +416,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result);
+        DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result);
 
         getStringBuilderPack(basVendor, result);
 
@@ -1203,6 +1200,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
         DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        //单据状态
+        DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderStatus(), "orderStatus", result);
 
         getStringBuilderPack(wmsQCMaster, result);
 
@@ -2611,4 +2610,39 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 拉动计划主表信息分页查询条件
+     *
+     * @param wmsPullTaskMaster
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getInPack(statusList, "orderStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
+        DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
+        DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result);
+
+        getStringBuilderPack(wmsPullTaskMaster, result);
+
+        return result;
+    }
+
+    /**
+     * 拉动计划明细表信息分页查询条件
+     *
+     * @param wmsPullTaskDetails
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsPullTaskDetails, result);
+
+        return result;
+    }
+
 }