From 0e9315cd895e1c53f91d2232cb76a626da7ca8eb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 29 Mar 2019 21:40:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BA=8B=E5=8A=A1=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 24b41f8..20b4193 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 作业任务表信息 @@ -72,4 +73,8 @@ public class WmsTaskInfo extends BaseBean { @Transient public String opTypeName; + @ApiParam("作业任务明细") + @Transient + public List taskDetailsList; + } From 9b8ebb562858df115d0fff8f625fe6b02f97c2e7 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 1 Apr 2019 10:22:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index afe6d77..eeeff68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -141,10 +141,16 @@ public class WmsDocMovementDetails extends BaseBean { public String destAreaNo; @Transient + @ApiParam("实际批次") + private String actualLot; + + @Transient @ApiParam("推荐批次") private String recommondLot; @Transient @ApiParam("推荐库位") private String recommondLocateNo; + + public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index fd7244e..234adad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -171,4 +171,6 @@ public class WmsStockSn extends BaseBean { public WmsStockSn(String partNo){ this.partNo = partNo; } + + public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } } From 1b97e377f2f00e7dac070247eac4d6ddbf8acbcd Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 1 Apr 2019 10:25:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?pojo=E5=BC=95=E5=85=A5jar=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d9f2e52..642c9a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -38,6 +38,10 @@ i3plus.pojo i3plus-pojo-wms + + i3plus.pojo + i3plus-pojo-form + From acc8e97825fb15fb0d005bb367d9eea739cbe04d Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 1 Apr 2019 14:39:28 +0800 Subject: [PATCH 4/6] sweb bean init 9 files --- .../pojo/sweb/bean/SwebOrderDeliveryLog.java | 46 ++++++ .../estsh/i3plus/pojo/sweb/bean/SwebPackage.java | 46 ++++++ .../pojo/sweb/bean/SwebProcurementPlanOrder.java | 46 ++++++ .../sweb/bean/SwebProcurementPlanOrderdetails.java | 54 +++++++ .../pojo/sweb/bean/SwebPurchaseChangeLog.java | 46 ++++++ .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 98 ++++++++++++ .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 169 +++++++++++++++++++++ .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 104 +++++++++++++ .../estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java | 42 +++++ 9 files changed, 651 insertions(+) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java new file mode 100644 index 0000000..dfa3f3e --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java new file mode 100644 index 0000000..a420d5e --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java new file mode 100644 index 0000000..7990af5 --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java new file mode 100644 index 0000000..5106375 --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java new file mode 100644 index 0000000..800016a --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java new file mode 100644 index 0000000..0eb0740 --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java new file mode 100644 index 0000000..4935cf0 --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java new file mode 100644 index 0000000..0eb6e4c --- /dev/null +++ b/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; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java new file mode 100644 index 0000000..ba03cc8 --- /dev/null +++ b/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; +} From da3490acbfd9d65136c56ae8e17210066f37f0f0 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 1 Apr 2019 15:09:23 +0800 Subject: [PATCH 5/6] sweb repository init 9 files --- ...rdetails.java => SwebProcurementPlanOrderDetails.java} | 2 +- .../sweb/repository/SwebOrderDeliveryLogRepository.java | 14 ++++++++++++++ .../pojo/sweb/repository/SwebPackageRepository.java | 14 ++++++++++++++ .../SwebProcurementPlanOrderDetailsRepository.java | 14 ++++++++++++++ .../repository/SwebProcurementPlanOrderRepository.java | 15 +++++++++++++++ .../sweb/repository/SwebPurchaseChangeLogRepository.java | 14 ++++++++++++++ .../repository/SwebPurchaseOrderDetailsRepository.java | 14 ++++++++++++++ .../pojo/sweb/repository/SwebPurchaseOrderRepository.java | 14 ++++++++++++++ .../sweb/repository/SwebPurchaseOrderSnRepository.java | 14 ++++++++++++++ .../pojo/sweb/repository/SwebVendorRelRepository.java | 14 ++++++++++++++ 10 files changed, 128 insertions(+), 1 deletion(-) rename modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/{SwebProcurementPlanOrderdetails.java => SwebProcurementPlanOrderDetails.java} (95%) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java similarity index 95% rename from modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java rename to modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 5106375..144cf36 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("开口合同明细表") -public class SwebProcurementPlanOrderdetails extends BaseBean { +public class SwebProcurementPlanOrderDetails extends BaseBean { @ApiParam("单据号") @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java new file mode 100644 index 0000000..5d8568c --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java new file mode 100644 index 0000000..caff5af --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java new file mode 100644 index 0000000..3f52f37 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java new file mode 100644 index 0000000..5795ba0 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java new file mode 100644 index 0000000..8efe954 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java new file mode 100644 index 0000000..dfd6da4 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java new file mode 100644 index 0000000..6ef21fb --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java new file mode 100644 index 0000000..00477a6 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java new file mode 100644 index 0000000..f3ed325 --- /dev/null +++ b/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 { +} From 9beafd1bc6ba985f5115e45f59e835ac1d93ec54 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 1 Apr 2019 18:02:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=20=E5=BE=AE=E6=9C=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E5=B9=B3=E5=8F=B0=E8=A7=92=E8=89=B2=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfRefMethodRole.java | 21 ++++++++-------- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 29 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java index d41e560..929fe5c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java +++ b/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; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 6fdcbef..428758e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/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