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

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

@@ -870,7 +870,7 @@ public class WmsEnumUtil {
         OTHER_IN(730, "OTHER_IN", "其它入库"),
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
         COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
-        SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
+        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
 
         private int value;
         private String code;

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

@@ -185,6 +185,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("客户名称")
     private String custName;
 
+    @Transient
+    @ApiParam("汇总数量")
+    private Integer gatherQty = 0;
+
     public MesPackage() {
     }
 

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

@@ -91,6 +91,9 @@ public class GenSerialNoModel {
     @ApiParam("客户工厂代码")
     private String custProdLineCode;
 
+    @ApiParam("工序代码")
+    private String processCode;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

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

@@ -38,6 +38,9 @@ public class MgnBoardListModel {
     @ApiParam("计划完成率")
     private String planCompleteRate;
 
+    @ApiParam("当前数据标识")
+    private boolean currentInfo;
+
     @ApiParam("呼叫异常数量")
     private Integer exceptQty;
 

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

@@ -45,10 +45,14 @@ public class MgnPackageSnTraceReportModel {
     @ApiParam(value = "修改日期查询用，查询结束日期")
     public String createDateTimeEnd;
 
+
+    @ApiParam(value = "工单号")
+    public String workOrderNo;
+
     public MgnPackageSnTraceReportModel() {
     }
 
-    public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) {
+    public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName, String workOrderNo) {
         this.packageNo = packageNo;
         this.packageNo2 = packageNo2;
         this.serialNumber = serialNumber;
@@ -58,5 +62,7 @@ public class MgnPackageSnTraceReportModel {
         this.createDatetime = createDatetime;
         this.workCenterCode = workCenterCode;
         this.workCenterName = workCenterName;
+        this.workOrderNo = workOrderNo;
+
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -67,6 +67,12 @@ public class MgnBjBoardModel implements Serializable {
     @ApiParam("时段")
     private String timeInterval;
 
+    @ApiParam("温度")
+    private String temperature;
+
+    @ApiParam("湿度")
+    private String humidity;
+
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 

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

@@ -2491,7 +2491,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) {
-            DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean);
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "relationVinCode", packBean);
         }
         if (queueJitActual.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);