Merge branch 'dev' into test

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

@@ -80,7 +80,7 @@ public class MesQueueOrder extends BaseBean {
         return this.status == null ? 0 : this.status;
     }
 
-    public double getSeq() {
+    public double getSeqVal() {
         return this.seq == null ? 0.0d : this.seq;
     }
 }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -9,12 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.util.Date;
 
 /**
  * @Description :BOM清单
@@ -71,12 +70,12 @@ public class MesBom extends BaseBean {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam(value = "生效时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam(value = "失效时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String effEndTime;
 
     public double getQtyVal() {

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

@@ -84,8 +84,8 @@ public class MesQueueOrder extends BaseBean {
         return this.status == null ? 0 : this.status;
     }
 
-    public double getSeq() {
+    public double getSeqVal() {
         return this.seq == null ? 0.0d : this.seq;
     }
-    
+
 }

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

@@ -663,6 +663,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(packSpec.getSpecName())){
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
         }
+        if (StringUtils.isNotEmpty(packSpec.getParentSpec())){
+            DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean);
+        }
 
         return packBean;
     }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -186,4 +186,8 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @Transient
     @ApiParam(value = "关联单号")
     private String refOrderNo;
+
+    @Transient
+    @ApiParam(value = "条码")
+    private String barCode;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -74,7 +74,7 @@ public class SwebHqlPack {
 
 
     // DdlPackBean方法中的 getNumNOEqualPack（） 方法存在问题，所有先用  HqlPack
-    public static String getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
+    public static String getPurchaseOrderDetailsWhereHqlByItemStatus(SwebPOForPubListEnterModel model) {
         StringBuffer result = new StringBuffer();
         HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.CREATE.getValue(),"itemStatus",result);
         HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result);
@@ -91,6 +91,19 @@ public class SwebHqlPack {
         return  result.toString();
     }
 
+    public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
+        DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
+        // 封装有效状态和删除状态
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(model, result);
+    }
+
     public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);