新增初始化

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

@@ -184,4 +184,45 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 数据状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_STATUS {
+        YES(1, "是", "fa fa-success cell-fa fa-check"),
+        NO(2, "否", "fa fa-disabled cell-fa fa-times-circle");
+
+        private int value;
+        private String description;
+        private String code;
+
+        DATA_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        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].getDescription();
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -43,4 +43,8 @@ public class SwebProcurementPlanOrder extends BaseBean {
     @ApiParam("供应商代码")
     @Column(name = "VENDOR_CODE")
     private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.sweb.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;
@@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -98,5 +100,20 @@ public class SwebPurchaseOrder extends BaseBean {
 
     @Column(name = "EXPECTED_TIME")
     @ApiParam(value = "预计到货时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     public String expectedTime;
+
+    @Column(name = "REF_NO")
+    @ApiParam(value = "合同号")
+    public String refNo;
+
+    @Transient
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiParam(value = "预计到货时间 开始时间")
+    public String expectedTimeStart;
+
+    @Transient
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiParam(value = "预计到货时间 结束时间")
+    public String expectedTimeEnd;
 }

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

@@ -128,7 +128,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
 
     @Column(name = "IS_STEEL")
     @ApiParam("是否为钢卷料")
-    private Integer IS_STEEL;
+    private Integer isSteel;
 
     @Column(name = "EXPECTED_TIME")
     @ApiParam(value = "预计到货日期")

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

@@ -29,9 +29,9 @@ import javax.persistence.Table;
 @Api("采购订单表-条码明细表")
 public class SwebPurchaseOrderSn extends BaseBean {
 
-    @Column(name = "ORDER_ITEM_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("单据明细编号")
-    public String orderItemNo;
+    public String orderNo;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "零件号")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java

@@ -29,7 +29,7 @@ public class SwebPODetailsUpdateHistoryModel extends BaseBean {
     private String partName;
 
     @ApiParam(value = "订单数量")
-    private Double refQty;
+    private Double orderQty;
 
     @ApiParam(value = "确认到货数量")
     private Double confirmQty;

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

@@ -47,6 +47,9 @@ public class SwebHqlPack {
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
+        DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
+                purchaseOrder.getExpectedTimeEnd(), "expectedTime", result,false);
+        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
         return buildHql(purchaseOrder, result);
     }