From 060fa564da59a4bc2130bfa54931a4711eb1f345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 16:11:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0AndonHqlPack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/MesWorkCenter.java | 7 +++ .../sqlpack/AndonHqlPack.java | 55 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index ab85f95..2fc7aec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -64,4 +64,11 @@ public class MesWorkCenter extends BaseBean { @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + + public MesWorkCenter(String organizeCode) { + this.organizeCode = organizeCode; + } + + public MesWorkCenter() { + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 12b3098..34e5258 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,5 +1,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + /** * @Description : 安灯对象查询封装 * @Reference : @@ -8,4 +16,51 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; * @Modify: **/ public class AndonHqlPack { + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 按条件查询工作中心 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(mesWorkCenter, result); + + return result; + } + + /** + * 按条件查询工作单元（工位） + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesWorkCell, result); + + return result; + } } From fe23d7003fd681060e2565d01f74757f1941d93b Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 13 May 2019 18:02:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?sweb=20po=E8=AF=A6=E6=83=85=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2=E9=87=8D=E5=86=99=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 10 +++++++-- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 8 +++++++ .../pojo/sweb/modelbean/SwebLoginUserModel.java | 3 +++ .../sweb/modelbean/SwebPOForPubListEnterModel.java | 3 +++ .../SwebPOUpdatePublishForPublishModel.java | 25 ++++++++++++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java 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 index d54f472..eb78593 100644 --- 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 @@ -66,8 +66,11 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; + /** + * 不冗余主表数据 + */ @ApiParam(value = "行项目状态", example = "1") - @Column(name = "ITEM_STATUS") + @Transient private Integer itemStatus; @Column(name = "BOX_QTY") @@ -131,7 +134,10 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer isSteel; - @Column(name = "EXPECTED_TIME") + /** + * 不冗余主表数据 + */ + @Transient @ApiParam(value = "预计到货日期") public String expectedTime; 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 index 4dc38bb..895d0e0 100644 --- 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 @@ -34,6 +34,14 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam("单据明细编号") private String orderNo; + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + @Column(name = "PART_NO") @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 3594480..1c9cb27 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -20,6 +20,9 @@ public class SwebLoginUserModel implements Serializable { @ApiParam(value = "用户ID") private Long id; + @ApiParam(value = "用户code（供应商编号）") + private String code; + @ApiParam(value = "用户名") private String userName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java index fc22889..4f50d7f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -23,6 +23,9 @@ public class SwebPOForPubListEnterModel extends BaseBean { @ApiParam(value = "订单类型", example = "1") public Integer orderType; + @ApiParam(value = "订单状态", example = "10") + public Integer orderStatus; + @ApiParam(value = "预计到货日期开始日期") public String expectedTimeStart; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java new file mode 100644 index 0000000..31ee5c5 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 待发布订单列表发布输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-05-13 13:13 + * @Modify: + **/ +@Data +public class SwebPOUpdatePublishForPublishModel extends BaseBean { + + @ApiParam(value = "拆分请求时间数量列表", example = "1") + private List reqTimeList; + + @ApiParam(value = "列表项", example = "1") + private SwebPOForPubListResultItemModel item; +}