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

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

@@ -1987,4 +1987,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 单据是否散件
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_PART {
+        IS_ADJUST(1, "散件"), ADJUST(2, "非散件");
+
+        private int value;
+        private String description;
+
+        IS_PART(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java

@@ -33,13 +33,17 @@ public class BfCascadeDetail extends BaseBean {
     @Column(name = "CASCADE_ID")
     @ApiParam(value = "级联ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long cascade_id;
+    private Long cascadeId;
 
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long elementId;
 
+    @Column(name = "DETAIL_LABEL_TEXT")
+    @ApiParam(value = "提示信息")
+    private String detailLabelText;
+
     @Column(name="ELEMENT_NAME")
     @ApiParam(value ="元素名称")
     private String elementName;
@@ -51,7 +55,7 @@ public class BfCascadeDetail extends BaseBean {
     @Column(name = "PARENT_ID")
     @ApiParam(value = "父级ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long parent_id;
+    private Long parentId;
 
     @Column(name = "ELEMENT_PROPERTY_VALUE_ID")
     @ApiParam(value = "对象属性-元素属性ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java

@@ -46,7 +46,7 @@ public class BfElementGrid extends BaseBean {
 
     @Column(name = "IS_OBJECT_EDIT")
     @ApiParam(value = "是否编辑")
-    private Integer isObject_edit;
+    private Integer isObjectEdit;
 
     @Column(name = "IS_OBJECT_DEL")
     @ApiParam(value = "是否删除")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java

@@ -9,7 +9,6 @@ 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;
@@ -26,26 +25,26 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BF_REF_METHOD_ROLE")
-@Api(value="功能角色关系",description = "功能角色关系")
+@Table(name = "BF_REF_METHOD_ROLE")
+@Api(value = "功能角色关系", description = "功能角色关系")
 public class BfRefMethodRole extends BaseBean {
 
-    @Column(name="METHOD_ID")
-    @ApiParam(value ="表单功能id")
+    @Column(name = "METHOD_ID")
+    @ApiParam(value = "表单功能id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
-    @Column(name="METHOD_NAME_RDD")
-    @ApiParam(value ="表单功能名称")
+    @Column(name = "METHOD_NAME_RDD")
+    @ApiParam(value = "表单功能名称")
     private String methodNameRdd;
 
-    @Column(name="ROLE_ID")
-    @ApiParam(value ="角色id")
+    @Column(name = "ROLE_ID")
+    @ApiParam(value = "角色id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
-    @Column(name="ROLE_NAME_RDD")
-    @ApiParam(value ="角色名称")
+    @Column(name = "ROLE_NAME_RDD")
+    @ApiParam(value = "角色名称")
     private String roleNameRdd;
 
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -45,6 +45,35 @@ public final class FormHqlPack {
     }
 
     /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @param isDeleted 数据状态
+     * @return hql
+     */
+    public static String packHqlIdsAndIsDeleted(String columnName, String[] params, Integer isDeleted) {
+        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+
+        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result.toString();
+    }
+
+
+    /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @param isDeleted 数据状态
+     * @return hql
+     */
+    public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
+        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+
+        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result.toString();
+    }
+
+    /**
      * 表单布局复杂查询
      * @param bfLayout 表单布局
      * @return hql

modules/i3plus-pojo-model/pom.xml

@@ -38,6 +38,10 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-wms</artifactId>
         </dependency>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-form</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_ORDER_DELIVERY_LOG")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("订单发货通知记录表")
+public class SwebOrderDeliveryLog extends BaseBean {
+
+    @Column(name = "ORDER_ITEM_NO")
+    @ApiParam("单据明细编号")
+    public String orderItemNo;
+
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "发运车号")
+    public String carNo;
+
+    @Column(name = "CONTACT")
+    @ApiParam("联系人")
+    public String contact;
+
+    @Column(name = "CONTACT_TEL")
+    @ApiParam(value = "联系人电话")
+    public String contactTel;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_PACKAGE")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("物理包装")
+public class SwebPackage extends BaseBean {
+
+    @Column(name="PACKAGE_NO")
+    @ApiParam("包装编号")
+    public String packageNo;
+
+    @Column(name="PACKAGE_TYPE_ID")
+    @ApiParam(value = "包装类型", example = "1")
+    public Integer packTypeId;
+
+    @Column(name="PARENT_PACKAGE_NO")
+    @ApiParam("上级包装编号")
+    public String parentPackageNo;
+
+    @Column(name="PACKAGE_QTY")
+    @ApiParam(value = "包装件数", example = "1")
+    public Integer packageQty;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_PROCUREMENT_PLAN_ORDER")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("开口合同主表")
+public class SwebProcurementPlanOrder extends BaseBean {
+
+    @ApiParam("合同号")
+    @Column(name = "ORDER_NO")
+    private String orderNo;
+
+    @ApiParam(value = "订单类型", example = "1")
+    @Column(name = "ORDER_TYPE")
+    private Integer orderType;
+
+    @ApiParam(value = "订单状态", example = "10")
+    @Column(name = "ORDER_STATUS")
+    private Integer orderStatus;
+
+    @ApiParam("供应商代码")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+}

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_PROCUREMENT_PLAN_ORDER_DETAILS")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("开口合同明细表")
+public class SwebProcurementPlanOrderDetails extends BaseBean {
+
+    @ApiParam("单据号")
+    @Column(name = "ORDER_NO")
+    private String orderNo;
+
+    @ApiParam(value = "零件号")
+    @Column(name = "PART_NO")
+    private String partNo;
+
+    @ApiParam(value = "零件名称")
+    @Column(name = "PART_NAME")
+    private String partName;
+
+    @ApiParam(value = "单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @ApiParam("标准包装")
+    @Column(name = "SNP_QTY")
+    private Double snpQty;
+
+    @ApiParam(value = "行项目状态", example = "1")
+    @Column(name = "ITEM_STATUS")
+    private Integer itemStatus;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_PURCHASE_CHANGE_LOG")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("订单修改日志记录表")
+public class SwebPurchaseChangeLog extends BaseBean {
+
+    @Column(name = "ORDER_ITEM_NO")
+    @ApiParam("单据明细编号")
+    public String orderItemNo;
+
+    @ApiParam(value = "订单当前状态")
+    @Column(name = "ITEM_STATUS")
+    private Integer itemStatus;
+
+    @Column(name = "QTY")
+    @ApiParam("零件数量")
+    public Double qty;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+}

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

@@ -0,0 +1,98 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_PURCHASE_ORDER")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("采购订单表-主表")
+public class SwebPurchaseOrder extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单据号")
+    public String orderNo;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
+    @ApiParam("计划员代码")
+    @Column(name = "PLANNER_CODE")
+    private String plannerCode;
+
+    @ApiParam(value = "订单类型", example = "1")
+    @Column(name = "ORDER_TYPE")
+    public Integer orderType;
+
+    @ApiParam(value = "订单状态", example = "1")
+    @Column(name = "ORDER_STATUS")
+    public Integer orderStatus;
+
+    @Column(name = "PARENT_PACKAGE_NO")
+    @ApiParam("上级包装编号")
+    public String parentPackageNo;
+
+    @Column(name = "DOCK")
+    @ApiParam("道口")
+    public String dock;
+
+    @Column(name = "ERP_WAREHOUSE")
+    @ApiParam(value = "库存地")
+    public String erpWarehouse;
+
+    @Column(name = "PO_STATUS")
+    @ApiParam(value = "PO状态", example = "1")
+    public Integer poStatus;
+
+    @Column(name = "SHIP_TIME")
+    @ApiParam(value = "发运时间")
+    public String shipTime;
+
+    @Column(name = "PUBLISH_TIME")
+    @ApiParam(value = "发布时间")
+    public String publishTime;
+
+    @Column(name = "DELIVERY_TIME")
+    @ApiParam(value = "交货时间")
+    public String deliveryTime;
+
+    @Column(name = "REC_TIME")
+    @ApiParam(value = "交货时间")
+    public String recTime;
+
+    @Column(name = "IS_SYN")
+    @ApiParam(value = "是否收货", example = "2")
+    public Integer isSyn;
+
+    @Column(name = "ORDER_TIME")
+    @ApiParam(value = "订单时间")
+    public String orderTime;
+
+    @Column(name = "REF_ORDER_NO")
+    @ApiParam(value = "关联单号")
+    public String refOrderNo;
+}

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

@@ -0,0 +1,169 @@
+package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_PURCHASE_ORDER_DETAILS")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("采购订单表-明细表")
+public class SwebPurchaseOrderDetails extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单据号")
+    public String orderNo;
+
+    @Column(name = "PART_VERSION")
+    @ApiParam("零件版本")
+    private Integer partVersion;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam("零件类型")
+    @Column(name = "PART_TYPE")
+    private Integer partType;
+
+    @ApiParam(value = "单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @ApiParam(value = "行项目状态", example = "1")
+    @Column(name = "ITEM_STATUS")
+    private Integer itemStatus;
+
+    @Column(name = "BOX_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "箱数", example = "0")
+    private Integer boxQty;
+
+    @Column(name = "SNP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "默认包装规格", example = "0")
+    private Double snpQty;
+
+    @Column(name = "PRINT_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "打印数", example = "0")
+    private Double printQty;
+
+    @Column(name = "REC_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "收货数量", example = "0")
+    private Double recQty;
+
+    @Column(name = "REC_BOX_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "已收箱数", example = "0")
+    private Double recBoxQty;
+
+    @Column(name = "UPLOAD_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "上传数量", example = "0")
+    private Double uploadQty;
+
+    @Column(name = "ERP_WAREHOUSE")
+    @ApiParam("库存地")
+    private String erpWarehouse;
+
+    @Column(name = "REF_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "订单数量", example = "0")
+    private Double refQty;
+
+    @Column(name = "ORDER_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数", example = "0")
+    private Double orderQty;
+
+    @Column(name = "SHIP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "发运数量", example = "0")
+    private Double shipQty;
+
+    @Column(name = "PRINT_TIME")
+    @ApiParam(value = "打印时间")
+    private String printTime;
+
+    @Column(name = "PRINT_USER_CODE")
+    @ApiParam("打印用户code")
+    private String printUserCode;
+
+    @Column(name = "IS_STEEL")
+    @ApiParam("是否为钢卷料")
+    private Integer IS_STEEL;
+
+    @Column(name = "REC_TIME")
+    @ApiParam(value = "预计到货日期")
+    public String recTime;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("是否同步")
+    @Column(name = "IS_SYN")
+    private String isSyn;
+
+    @Column(name = "INSTOCK_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "入库数量", example = "0")
+    private Double instockQty;
+
+    @Column(name = "INSTOCK_BOX_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "入库箱数", example = "0")
+    private Double instockBoxQty;
+
+    @Column(name = "NC_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "不良数", example = "0")
+    private Double ncQty;
+
+    @Column(name = "NC_BOX_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "不良箱数", example = "0")
+    private Double ncBoxQty;
+
+    @Column(name = "ITEM_NO")
+    @ColumnDefault("0")
+    @ApiParam(value = "行号", example = "0")
+    private Integer itemNo;
+
+    @Column(name = "COMFIRM_TIME")
+    @ApiParam(value = "确认时间")
+    public String comfirmTime;
+
+    @Column(name = "DELIVERY_TIME")
+    @ApiParam(value = "交货时间")
+    public String deliveryTime;
+
+    @Column(name = "REF_NO")
+    @ApiParam(value = "合同号")
+    public String refNo;
+}

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

@@ -0,0 +1,104 @@
+package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_PURCHASE_ORDER_SN")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("采购订单表-条码明细表")
+public class SwebPurchaseOrderSn extends BaseBean {
+
+    @Column(name = "ORDER_ITEM_NO")
+    @ApiParam("单据明细编号")
+    public String orderItemNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam("零件类型")
+    @Column(name = "PART_TYPE")
+    private Integer partType;
+
+    @ApiParam(value = "单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @Column(name = "BOX_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "箱数", example = "0")
+    private Integer boxQty;
+
+    @Column(name = "SERIAL_NO")
+    @ApiParam(value = "序列号")
+    private String serialNo;
+
+    @Column(name = "BAR_CODE")
+    @ApiParam(value = "箱条码")
+    private String barCode;
+
+    @Column(name = "ERP_WAREHOUSE")
+    @ApiParam("库存地")
+    private String erpWarehouse;
+
+    @Column(name = "PRODUCTION_TIME")
+    @ApiParam(value = "产生时间")
+    private String productionTime;
+
+    @Column(name = "PRINT_TIME")
+    @ApiParam(value = "打印时间")
+    private String printTime;
+
+    @Column(name = "PRINTS")
+    @ApiParam("打印次数")
+    private Integer prints;
+
+    @Column(name = "CHECK_CODE")
+    @ApiParam(value = "检验编号")
+    public String CHECK_CODE;
+
+    @Column(name = "STOVE_NO")
+    @ApiParam(value = "炉批号")
+    public String stoveNo;
+
+    @Column(name = "BATCH_NO")
+    @ApiParam(value = "批次号")
+    public String batchNo;
+
+    @ApiParam("是否同步")
+    @Column(name = "IS_SYN")
+    private String isSyn;
+
+    @Column(name = "REC_TIME")
+    @ApiParam(value = "收货时间")
+    public String recTime;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam(value = "包装编号")
+    public String packageNo;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 11:21
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_VENDOR_REL")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("供应商关系表")
+public class SwebVendorRel extends BaseBean {
+
+    @ApiParam("计划员代码")
+    @Column(name = "PLANNER_CODE")
+    private String plannerCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
+    @ApiParam("供应商代码")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebOrderDeliveryLog;
+
+/**
+ * @Description :订单发货通知记录表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebOrderDeliveryLogRepository extends BaseRepository<SwebOrderDeliveryLog, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage;
+
+/**
+ * @Description :物理包装 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebPackageRepository extends BaseRepository<SwebPackage, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrderDetails;
+
+/**
+ * @Description :开口合同明细表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebProcurementPlanOrderDetailsRepository extends BaseRepository<SwebProcurementPlanOrderDetails, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrder;
+
+/**
+ * @Description :开口合同主表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebProcurementPlanOrderRepository extends BaseRepository<SwebProcurementPlanOrder, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseChangeLog;
+
+/**
+ * @Description :订单修改日志记录表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebPurchaseChangeLogRepository extends BaseRepository<SwebPurchaseChangeLog, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderDetails;
+
+/**
+ * @Description :采购订单表-明细表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebPurchaseOrderDetailsRepository extends BaseRepository<SwebPurchaseOrderDetails, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder;
+
+/**
+ * @Description :采购订单表-主表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebPurchaseOrderRepository extends BaseRepository<SwebPurchaseOrder, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderSn;
+
+/**
+ * @Description :采购订单表-条码明细表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebPurchaseOrderSnRepository extends BaseRepository<SwebPurchaseOrderSn, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorRel;
+
+/**
+ * @Description :供应商关系表 dao
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 14:51
+ * @Modify:
+ **/
+public interface SwebVendorRelRepository extends BaseRepository<SwebVendorRel, Long> {
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.sweb.sqlpack;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.tool.SqlPack;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @Description : hql 封装
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-01 17:59
+ * @Modify:
+ **/
+public class SwebHqlPack {
+
+    /**
+     * 通用封装isValid、isDeleted等参数
+     * @param bean
+     * @param hqlStr
+     * @return
+     */
+    private static String buildHql(BaseBean bean, StringBuffer hqlStr){
+        // 判断工厂代码是否为空
+        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+            SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
+        }
+
+        // 封装有效状态和删除状态
+        SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+        return hqlStr.toString();
+    }
+
+    public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
+        HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
+        return buildHql(purchaseOrder,result);
+    }
+}

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

@@ -141,10 +141,26 @@ public class WmsDocMovementDetails extends BaseBean {
     public String destAreaNo;
 
     @Transient
+    @ApiParam("实际批次")
+    private String actualLot;
+
+    @Transient
+    @ApiParam("实际数量")
+    private Double actualQty;
+
+    @Transient
     @ApiParam("推荐批次")
     private String recommondLot;
 
     @Transient
     @ApiParam("推荐库位")
     private String recommondLocateNo;
+
+    @Transient
+    @ApiParam("前端表格编辑使用")
+    private Boolean isSet = false;
+
+    public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
+
+    public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
 }

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

@@ -175,4 +175,8 @@ public class WmsStockSn extends BaseBean {
     public WmsStockSn(String partNo){
         this.partNo = partNo;
     }
+
+    public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
+
+    public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
 }

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

@@ -1036,15 +1036,6 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result);
         //单号
         HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
-        //业务类型
-        HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
-        //关联单据类型
-        HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
-        //关联单据号
-        HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
-        //入库单号
-        HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);
-
         getStringBuilderPack(wmsQCMaster, result);
 
         return result.toString();