From 6c37a60ff4c3525e0d79a93033ccaafdd456a4bf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 19 Aug 2019 17:40:52 +0800 Subject: [PATCH 01/16] =?UTF-8?q?MES-PCN=E8=8E=B7=E5=8F=96=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=89=93=E5=8D=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 47 +++++++++++++++++++ .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 54 ++++++++++++++++++++++ .../MesLabelTemplateParamRepository.java | 17 +++++++ .../pcn/repository/MesLabelTemplateRepository.java | 17 +++++++ 4 files changed, 135 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java new file mode 100644 index 0000000..901111a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.*; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="Mes_LABEL_TEMPLATE") +@Api(value="打印模板",description = "打印模板") +public class MesLabelTemplate extends BaseBean { + + private static final long serialVersionUID = 5371856566557305323L; + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Lob + @Column(name="TEMPLATE_CONTENT") + @ApiParam(value ="模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数拼接") + @Transient + private String paramsPack; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java new file mode 100644 index 0000000..bb87217 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.*; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="Mes_LABEL_TEMPLATE_PARAM") +@Api(value="打印模板参数",description = "打印模板参数") +public class MesLabelTemplateParam extends BaseBean { + + private static final long serialVersionUID = 6476163540527157643L; + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_PARAM") + @ApiParam(value ="模板参数") + private String templateParam; + + @Lob + @Column(name="TEMPLATE_PARAM_TEXT") + @ApiParam(value ="模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java new file mode 100644 index 0000000..6236031 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java new file mode 100644 index 0000000..8b71fac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesLabelTemplateRepository extends BaseRepository { +} From de381d438ad130624b32ac31f3a8e077a7d1a660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 20 Aug 2019 11:03:52 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPickingMovement.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java new file mode 100644 index 0000000..2b345d4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** +* @Description : 领料单模板 +* @Reference : +* @author: amy.liu +* @date: 2019/8/19 17:10 +* @Modify: +*/ + +@Data +@Api(value="领料单模板",description = "领料单模板") +public class WmsPickingMovement extends BaseBean { + + private static final long serialVersionUID = 2167743108452607620L; + + @ApiParam(value = "领料单号") + @AnnoOutputColumn + private String orderNo; + + @ApiParam(value = "物料编码") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "领料数量") + @AnnoOutputColumn + private Double qty; + + @ApiParam(value = "源存储区") + @AnnoOutputColumn + private String srcZoneNo; + + @ApiParam(value = "目标存储区") + @AnnoOutputColumn + private String destZoneNo; + + @ApiParam(value = "目标库位") + @AnnoOutputColumn + private String destLocateNo; + + @ApiParam(value = "工厂") + @AnnoOutputColumn + private String factory; +} From bc953bb2c8211970706cb8e182a5d16e3161bd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 20 Aug 2019 11:05:35 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 30eeaec..56c260d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -172,6 +172,24 @@ public class WmsHqlPack { } /** + * 移库单号集合查询条件封装 + * @param orderNoList + * @param organizeCode + * @return + */ + public static DdlPackBean packWmsDocMovementMasterByOrderNos(List orderNoList,String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + + return packBean; + } + + + /** * PO订单主表信息 分页查询 * * @param wmsPOMaster From 02d60ed1a8b35cc96ffa8ebf95cfcdef7c7aaa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 20 Aug 2019 14:15:42 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8-=E6=95=B0=E6=8D=AE=E9=80=82=E9=85=8D=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/bean/BsParamAdapter.java | 4 +-- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java index dc12e39..275709a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java @@ -34,9 +34,9 @@ public class BsParamAdapter extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseId; - @Column(name = "SUIT_CASE_NAME") + @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") - private String suitCaseName; + private String suitCaseNameRdd; @Column(name = "SUIT_CASE_CODE") @ApiParam(value = "适配套件代码") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index ccea28f..96b25e9 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; @@ -110,4 +111,38 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 数据适配转换规则查询条件封装 + * @param bsParamAdapter 数据适配转换规则 + * @return + */ + public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean); + + ddlPackBean.setOrderByStr(bsParamAdapter.orderBy()); + + return ddlPackBean; + } + + /** + * 数据适配装换规则唯一校验 + * @param bsParamAdapter 数据适配转换规则 + * @return + */ + public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(), "suitCaseCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamId(), "suitParamId", ddlPackBean); + + return ddlPackBean; + } + } From 070bacf20ef3685a7edb47feadcc31517107e6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 20 Aug 2019 18:04:19 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E5=88=9B=E5=BB=BA=E4=BA=BA=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c9fc769..7595fc4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -124,7 +124,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); - + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getCreateUser(), "createUser", result); DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true); getStringBuilderPack(wmsDocMovementDetails, result); @@ -165,6 +165,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCreateUser(),"createUser",packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); @@ -187,7 +188,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - + DdlPreparedPack.getStringLikerPack(wmsPOMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),wmsPOMaster.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsPOMaster, result); return result; @@ -572,6 +574,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + DdlPreparedPack.getStringLikerPack(wmsASNMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),wmsASNMaster.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsASNMaster, result); @@ -602,6 +606,9 @@ public class WmsHqlPack { //单据来源 DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); + DdlPreparedPack.getStringLikerPack(wmsShipping.getCreateUser(), "createUser", result); + DdlPreparedPack.timeBuilder(wmsShipping.getCreateDateTimeStart(),wmsShipping.getCreateDateTimeEnd(),"createDatetime",result,true); + getStringBuilderPack(wmsShipping, result); getStringBuilderPack(wmsShipping, result); return result; @@ -688,6 +695,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCreateUser(), "createUser", result); + DdlPreparedPack.timeBuilder(wmsFGInStock.getCreateDateTimeStart(),wmsFGInStock.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsFGInStock, result); From 1b30b927cea74101271eb9cfc19cb1b7c7512d66 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 20 Aug 2019 18:13:19 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/codemaker/SnowflakeIdMaker.java | 71 +++++++++++++++++++++- .../pojo/base/enumutil/BlockFormEnumUtil.java | 21 ++++++- 2 files changed, 87 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java index 6a7d958..50b1ca8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java @@ -1,5 +1,16 @@ package cn.estsh.i3plus.pojo.base.codemaker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import sun.management.VMManagement; + +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.InetAddress; +import java.net.NetworkInterface; + /** * @Description : 使用SnowFlake，生成分布式ID * @Reference : SnowFlake可以保证： @@ -11,13 +22,15 @@ package cn.estsh.i3plus.pojo.base.codemaker; **/ public class SnowflakeIdMaker { + public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class); + private long workerId; private long datacenterId; private long sequence = 0L; public SnowflakeIdMaker(){ - this.workerId = 1; - this.datacenterId = 1; + this.workerId = getWorkerMacId(); + this.datacenterId = getDatacenterPid(); this.sequence = 0L; } @@ -89,6 +102,60 @@ public class SnowflakeIdMaker { return timestamp; } + /** + * 使用本机Mac 地址的HashCode 取摸 32 + * @return + */ + private long getWorkerMacId() { + long result; + try { + InetAddress ia; + byte[] mac = null; + //获取本地IP对象 + ia = InetAddress.getLocalHost(); + //获得网络接口对象（即网卡），并得到mac地址，mac地址存在于一个byte数组中。 + mac = NetworkInterface.getByInetAddress(ia).getHardwareAddress(); + //下面代码是把mac地址拼装成String + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < mac.length; i++) { + if (i != 0) { + sb.append("-"); + } + //mac[i] & 0xFF 是为了把byte转化为正整数 + String s = Integer.toHexString(mac[i] & 0xFF); + sb.append(s.length() == 1 ? 0 + s : s); + } + + //把字符串所有小写字母改为大写成为正规的mac地址并返回 + result = sb.toString().toUpperCase().hashCode(); + }catch (Exception e){ + e.printStackTrace(); + result = 31; + LOGGER.error("[SnowflakeIdMaker] 获取设备ID错误：{}",e.getMessage()); + } + + result = result + timeGen(); + return result < 0 ? (0 - result) % 32 : result % 32; + } + + private long getDatacenterPid() { + long result; + try { + RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean(); + Field jvm = runtime.getClass().getDeclaredField("jvm"); + jvm.setAccessible(true); + VMManagement mgmt = (VMManagement) jvm.get(runtime); + Method pidMethod = mgmt.getClass().getDeclaredMethod("getProcessId"); + pidMethod.setAccessible(true); + result = (Integer) pidMethod.invoke(mgmt); + } catch (Exception e) { + result = 31; + } + + result = result + timeGen(); + return result < 0 ? (0 - result) % 32 : result % 32; + } + private long timeGen(){ return System.currentTimeMillis(); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 2fa0f79..650d294 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -833,7 +833,7 @@ public class BlockFormEnumUtil { TEXT(200, "TEXT", "文本"), NUMBER(210, "NUMBER", "数字"), PASSWORD(230, "PASSWORD", "密码"), - DATE_TIME(300, "DATE", "日期"), + DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN), // DATE(300, "DATE", "日期(yyyy-MM-dd)"), // DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), @@ -847,10 +847,22 @@ public class BlockFormEnumUtil { private String code; private String description; - private PROPERTY_CONTROL_TYPE(int value, String code, String description) { + /** + * 默认查询关系 + */ + private SQL_WHERE defaultWhere; + + PROPERTY_CONTROL_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) { this.value = value; this.code = code; this.description = description; + this.defaultWhere = defaultWhere; } public int getValue() { @@ -865,6 +877,10 @@ public class BlockFormEnumUtil { return description; } + public SQL_WHERE getDefaultWhere() { + return defaultWhere; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2476,7 +2492,6 @@ public class BlockFormEnumUtil { } public static SQL_WHERE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; From 7eed51791f6073ca32cd9d8d3be170fdd50dc50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 20 Aug 2019 21:40:13 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8-=E5=AE=9A=E6=97=B6=E9=80=82=E9=85=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysTask.java | 8 +++ .../pojo/softswitch/bean/BsSuitSchedule.java | 29 ++++++++- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 69 ++++++++++++++++++++-- 3 files changed, 99 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index 2b54d99..366a100 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -34,6 +34,10 @@ public class SysTask extends BaseBean { @ApiParam(value ="名称") private String name; + @Column(name="TASK_CODE") + @ApiParam(value ="任务代码") + private String taskCode; + // 软件类型 CommonEnumUtil.SOFT_TYPE @Column(name="TASK_SOFT_TYPE") @ApiParam(value = "软件类型") @@ -47,6 +51,10 @@ public class SysTask extends BaseBean { @ApiParam(value ="任务类名") private String taskClass; + @Column(name="IS_SYSTEM") + @ApiParam(value ="是否是系统job") + private String isSystem; + @Column(name="TASK_DESCRIPTION") @ApiParam(value ="任务描述" , access ="任务描述") private String taskDescription; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index f938368..c5b13a1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -9,6 +9,7 @@ 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; @@ -38,9 +39,31 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; - @Column(name = "EXECUTE_CRON") - @ApiParam(value = "执行时间表达式") - private String executeCron; + @Column(name = "SCHEDULE_NAME") + @ApiParam(value = "任务名称") + private String scheduleName; + + @Column(name = "SCHEDULE_GROUP_NAME") + @ApiParam(value = "任务组名称") + private String scheduleGroupName; + + @Column(name = "TASK_PLAN_ID") + @ApiParam(value = "任务计划id") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskPlanId; + + @Column(name = "TASK_CYCLE_ID") + @ApiParam(value = "任务周期id") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskCycleId; + + @Column(name = "TASK_CYCLE_NAME_RDD") + @ApiParam(value = "任务周期名称") + private String taskCycleName; + + @Column(name = "TASK_CYCLE_EXECUTE_RDD") + @ApiParam(value = "任务周期表达式表达式") + private String taskCycleExecuteRdd; @Column(name = "LAST_EXECUTE_DATE_TIME") @ApiParam(value = "最后一次执行时间") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 96b25e9..e10ea61 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -3,10 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; -import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import cn.estsh.i3plus.pojo.softswitch.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -145,4 +142,68 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 定时适配任务查询条件封装 + * @param bsSuitSchedule 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getTaskCycleId(),"taskCycleId",ddlPackBean); + + ddlPackBean.setOrderByStr(bsSuitSchedule.orderBy()); + + return ddlPackBean; + } + + /** + * 定时适配任务唯一校验 + * @param bsSuitSchedule + * @return + */ + public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean); + + return ddlPackBean; + } + + /** + * 安全证书查询条件分页 + * @param bsSslKey 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean); + + ddlPackBean.setOrderByStr(bsSslKey.orderBy()); + + return ddlPackBean; + } + + /** + * 安全证书唯一校验 + * @param bsSslKey + * @return + */ + public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean); + + return ddlPackBean; + } + } From 39a00d3a1975a1de5ba73c4d7ccdb511fff7f6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 21 Aug 2019 11:58:20 +0800 Subject: [PATCH 08/16] =?UTF-8?q?order=20by=20=E5=88=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=A3=85=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 3d0a639..035229e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -150,7 +150,12 @@ public class DdlPreparedPack { } else { order[i] = "desc"; } - sqlStr += " model." + columnName[i] + " " + order[i].toString() + ","; + if(columnName[i].indexOf(" model.") == -1){ + sqlStr += " model." + columnName[i]; + }else{ + sqlStr += columnName[i]; + } + sqlStr += " " + order[i].toString() + ","; } } @@ -506,4 +511,23 @@ public class DdlPreparedPack { packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); } } + + /** + * 转换排序列 + * @param columnName + * @param basisType + * @return + */ + public static String orderColConvertType(String columnName,int basisType){ + String name =" model." + columnName; + + if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { + name = " cast(" + name+ " as integer)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){ + name = " cast(" + name+ " as double)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){ + name = " cast(" + name+ " as long)"; + } + return name; + } } From 1d55cd22a60e54e6c1e78c5dc554041a14c313dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 21 Aug 2019 11:58:37 +0800 Subject: [PATCH 09/16] =?UTF-8?q?order=20by=20=E5=88=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=A3=85=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 5b16871..2328a81 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1030,6 +1030,57 @@ public class CommonEnumUtil { } } + /** + * 变量类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BASIS_TYPE { + INT(1, "int"), + DOUBLE(2, "double"), + LONG(3, "long"), + FLOAT(4, "float"), + CHAR(5, "char"), + BOOLEAN(6,"boolean"), + BYTE(7, "byte"), + SHORT(8, "short"); + + private int value; + private String description; + + private BASIS_TYPE(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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + // 数据有效的静态常量 public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); From 0b13c6dd70503c365ae330977aede7b4714dd9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 21 Aug 2019 13:47:08 +0800 Subject: [PATCH 10/16] =?UTF-8?q?order=20by=20=E5=88=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=A3=85=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 035229e..22b0e41 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -514,11 +514,12 @@ public class DdlPreparedPack { /** * 转换排序列 - * @param columnName - * @param basisType + * @param columnName 列名 + * @param basisType 基本类型 + * @see CommonEnumUtil.BASIS_TYPE * @return */ - public static String orderColConvertType(String columnName,int basisType){ + public static String getOrderColConvertType(String columnName,int basisType){ String name =" model." + columnName; if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { From 4f37dc42ef657f3bf82f24fd2444fd6529116ee0 Mon Sep 17 00:00:00 2001 From: wangjie Date: Wed, 21 Aug 2019 09:16:11 -0700 Subject: [PATCH 11/16] pojo-mes-time-update-wangjie --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 ++++---- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 0047cff..090477f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -97,25 +97,25 @@ public abstract class BaseBean implements Serializable { public String modifyDatetime; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String createDateTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) public String createDateTimeEnd; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String modifyDateTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) public String modifyDateTimeEnd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index b9a6c36..dba4d9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -70,12 +70,12 @@ public class MesBom extends BaseBean { @Column(name = "EFF_START_TIME") @ApiParam(value = "生效时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam(value = "失效时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String effEndTime; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 11aa97c..6991141 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -49,7 +49,7 @@ public class MesPcnSyncCfg extends BaseBean { private Integer syncFrequency; @Column(name="SYNC_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value ="同步时间") private String syncTime; @@ -62,7 +62,7 @@ public class MesPcnSyncCfg extends BaseBean { private Integer syncType; @Column(name="LAST_SYNC_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value ="上一同步时间") private String lastSyncTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 193c0fb..f3e3d85 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -94,24 +94,24 @@ public class MesPlanOrder extends BaseBean { /********************** 冗余字段 *********************************/ @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") public String startTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") public String endTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") public String endTimeEnd; From e4aadf35ed2cc03465f1670093ba5047d1bb38ec Mon Sep 17 00:00:00 2001 From: wangjie Date: Wed, 21 Aug 2019 13:10:18 -0700 Subject: [PATCH 12/16] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 6 +++ .../pojo/mes/model/MesWorkOrderButtonModel.java | 48 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 20ddb88..b3eaebc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; +import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -191,6 +192,11 @@ public class MesWorkOrder extends BaseBean { return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values()); } + @Transient + @ApiParam("mes生产工单页面按钮控制") + private MesWorkOrderButtonModel workOrderButtonModel; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java new file mode 100644 index 0000000..175de3e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes生产工单页面按钮控制model") +public class MesWorkOrderButtonModel implements Serializable { + + @ApiParam("修改按钮") + private boolean updateButton; + + @ApiParam("按配置修改按钮") + private boolean updateButton4Config; + + @ApiParam("下达按钮") + private boolean transmitButton; + + @ApiParam("测试动态下达按钮") + private boolean dynamicTransmitButton4Test; + + @ApiParam("启动按钮") + private boolean startUpButton; + + @ApiParam("暂停按钮") + private boolean suspendButton; + + @ApiParam("撤销按钮") + private boolean revokeButton; + + @ApiParam("关闭按钮") + private boolean closeButton; + + +} From e83efe76e0f644a82ab498495f3b7608efa03b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 21 Aug 2019 14:58:05 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java | 1 + .../main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index 76e17ee..909db97 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -60,6 +60,7 @@ public class XStreamFactory { } }); + xStream.setMode(XStream.NO_REFERENCES); xStream.autodetectAnnotations(true); return xStream; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index 71ec94e..b7c9f19 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -60,7 +60,6 @@ public class SuitCoreModel { /** * 适配器套件 */ - @XStreamOmitField private BsSuitCase bsSuitCase; /** @@ -100,7 +99,7 @@ public class SuitCoreModel { // 设置套件代码 this.suitCaseCode = bsSuitCase.getSuitCaseCode(); // 设置默认 - this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.FAIL.getCode(); + this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); // 设置默认 this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); // 设置默认 From 4d003974112edb23d4ecb9ed7548cefd9438b108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 21 Aug 2019 15:15:26 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E7=9A=84=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b5e6fe6..eecd5fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2078,8 +2078,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"item"}, result); - + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{ + DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result); getStringBuilderPack(wmsCSRange, result); return result; From ce70994a571e49eb1d3d86701d1482729e39b7da Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 21 Aug 2019 15:44:28 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E7=9B=98=E7=82=B9=20=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82=E7=B1=BB=E5=9E=8B=E6=B1=87?= =?UTF-8?q?=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++ 2 files changed, 60 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 2f70a65..203bbce 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3189,4 +3189,57 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 盘点差异类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INVENTORY_DIFFERENCE_TYPE { + INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), + INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), + INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"); + + private int value; + private String code; + private String description; + + INVENTORY_DIFFERENCE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + 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].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index ee10f50..55c1a73 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -116,6 +116,13 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("源单位") public String srcUnit; + /** + * 差异类型：10：盘平，20：盘亏，30盘赢 + */ + @Transient + @ApiParam("差异类型") + public String differenceType; + public Double getQty() { return this.qty == null ? 0 : this.qty; } From dd418f8b51eda3bf2c5828bb5bd0457029a44245 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 21 Aug 2019 17:03:09 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=BC=80=E7=BA=BF=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 393f698..d1a06e2 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; @@ -17,6 +18,19 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonHqlPack { /** + * genju 安灯队列参数查询安灯队列 + * @param andonManageQueue + * @return + */ + public static DdlPackBean getAndonQueuePack(AndonManageQueue andonManageQueue, String statusCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(statusCode, "statusCode", packBean); + return packBean; + } + /** * 封装公用查询参数 * * @param bean 实体对象