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/25] =?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 ef1450e9122c02c3b9b48a457aeb0eefdd6d2e33 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 20 Aug 2019 09:27:59 +0800 Subject: [PATCH 02/25] Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java | 24 +++++++++++ .../pojo/mes/pcn/model/FastDfsDownloadModel.java | 31 ++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 39 +++++++++++++---- .../pojo/mes/model/FastDfsDownloadModel.java | 31 ++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 49 ++++++++++++---------- 6 files changed, 179 insertions(+), 31 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 493b4b1..15a7e6d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -752,6 +752,42 @@ public class MesEnumUtil { } /** + * 系统配置表枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_TYPE { + + FASTDFS_SAVE_PATH(10, "savePath"); + + + private int value; + private String description; + + CONFIG_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 事件类型枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java index baed2c2..69cf64b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java @@ -62,4 +62,28 @@ public class MesESOP extends BaseBean { @Column(name="SOP_URL") @ApiParam("SOP_URL") private String sopUrl; + + @Column(name="GROUP_NAME") + @ApiParam("GROUP_NAME") + private String groupName; + + @Column(name="FILE_ORIGIN_NAME") + @ApiParam("FILE_ORIGIN_NAME") + private String fileOriginName; + + @Column(name="FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name="FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name="FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; + + @Column(name="SYNC_TAG") + @ApiParam("SYNC_TAG") + private Integer syncTag=0; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..418ab92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java index 1dbdf9f..e93d75b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java @@ -23,27 +23,27 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_ESOP") +@Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesESOP extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="ROUTE_CODE") + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; - @Column(name="PROCESS_CODE") + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; @@ -55,11 +55,32 @@ public class MesESOP extends BaseBean { @ApiParam("工步序号") private Integer stepSeq; - @Column(name="SOP_NAME") + @Column(name = "SOP_NAME") @ApiParam("SOP名称") private String sopName; - @Column(name="SOP_URL") + @Column(name = "SOP_URL") @ApiParam("SOP_URL") - private String sopUrl; + private String sopUrl; + + @Column(name="GROUP_NAME") + @ApiParam("GROUP_NAME") + private String groupName; + + @Column(name="FILE_ORIGIN_NAME") + @ApiParam("FILE_ORIGIN_NAME") + private String fileOriginName; + + @Column(name="FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name="FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name="FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..bef0a34 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index eb0f365..02349f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -49,6 +49,7 @@ public class MesHqlPack { } return packBean; } + /** * 生产计划查询条件封装 * @@ -376,15 +377,16 @@ public class MesHqlPack { /******************created by wynne*************/ /** * MES 报废信息查询 + * * @param mesScrap * @return */ public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){ + if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); } - if (StringUtils.isNotEmpty(mesScrap.getScrapName())){ + if (StringUtils.isNotEmpty(mesScrap.getScrapName())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); } if (mesScrap.getIsValid() != null) { @@ -395,15 +397,16 @@ public class MesHqlPack { /** * MES PCN系统配置信息条件查询 + * * @param mesConfig * @return */ public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){ + if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); } - if (StringUtils.isNotEmpty(mesConfig.getCfgName())){ + if (StringUtils.isNotEmpty(mesConfig.getCfgName())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); } if (mesConfig.getIsValid() != null) { @@ -414,18 +417,19 @@ public class MesHqlPack { /** * MES 维修信息条件查询 + * * @param mesRepair * @return */ public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){ + if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); } - if (StringUtils.isNotEmpty(mesRepair.getRepairName())){ + if (StringUtils.isNotEmpty(mesRepair.getRepairName())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); } - if (mesRepair.getRepairType() != null){ + if (mesRepair.getRepairType() != null) { DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); } if (mesRepair.getIsValid() != null) { @@ -474,26 +478,27 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesEventByButtonCode(String buttonCode,String org){ - DdlPackBean packBean=getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(buttonCode,"buttonCode",packBean); - DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean); + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } - public static DdlPackBean getMesEventByEventCode(String eventCode,String org){ - DdlPackBean packBean=getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(eventCode,"eventCode",packBean); - DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean); + + public static DdlPackBean getMesEventByEventCode(String eventCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } - public static DdlPackBean getMesActionByActionCode(MesAction mesAction,String organizeCode){ - DdlPackBean packBean=getAllBaseDataByNormalPro(mesAction,organizeCode); - DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(),"actionCode",packBean); + + public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); + DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean); return packBean; } - /** * 动作分页获取封装 * @@ -511,9 +516,8 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); } - if (mesAction.getActionType() != null && StringUtils.isNotEmpty(mesAction.getActionType() + "")) { - DdlPreparedPack.getStringEqualPack(mesAction.getActionType() + "", "actionType", packBean); - } + DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean); + return packBean; } @@ -548,6 +552,7 @@ public class MesHqlPack { } return packBean; } + /** * 事件动作分页获取封装 * From 61ce4d1b3fdb03a2a0d7dd44a424131bd6de9aba Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 20 Aug 2019 10:02:20 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index ed3f142..71ba453 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="BAS_VENDOR") -@Api("供应商") +@Api("供应商信息") public class BasVendor extends BaseBean{ private static final long serialVersionUID = 9214639813072592779L; 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 04/25] =?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 05/25] =?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 06/25] =?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 07/25] =?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 08/25] =?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 09/25] =?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 10/25] =?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 11/25] =?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 12/25] =?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 13/25] 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 14/25] =?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 15/25] =?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 16/25] =?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 17/25] =?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 18/25] =?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 实体对象 From 1328dc7ddd32fec725ea64220fa1b3760abe5d70 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 21 Aug 2019 18:30:09 +0800 Subject: [PATCH 19/25] #Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 22 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 3 +++ .../pojo/mes/model/FastDfsDownloadModel.java | 5 ++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 15a7e6d..08f41a9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -757,8 +757,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONFIG_TYPE { - FASTDFS_SAVE_PATH(10, "savePath"); - + FASTDFS_SAVE_PATH(10, "savePath"), + NGINX_IP(20,"nginxIp"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index e5253fc..655ffd0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; 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 cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; +import org.apache.commons.lang3.StringUtils; /** * @Description: @@ -26,4 +28,24 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); return packBean; } + + /** + * MES PCN系统配置信息条件查询 + * + * @param mesConfig + * @return + */ + public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + } + if (StringUtils.isNotEmpty(mesConfig.getCfgName())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + } + if (mesConfig.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); + } + return packBean; + } } 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..bcc0fc2 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 @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; @@ -65,10 +66,12 @@ public class MesPlanOrder extends BaseBean { private Integer status; @Column(name="START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划开始时间") private String startTime; @Column(name="END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划结束时间") private String endTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java index bef0a34..0e0da69 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java @@ -26,6 +26,9 @@ public class FastDfsDownloadModel { private String fileName; @ApiParam("文件字节") - private byte[] fileByte; + private String fileByte; + + @ApiParam("文件url") + private String url; } From ffb6f8a17cede3a7dbfd2918869a7ccb70ddd448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 22 Aug 2019 10:00:45 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=8D=E5=88=86=E9=A1=B5=EF=BC=8C=E4=B8=BB=E8=A6=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 7d034c6..e1ede6a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -18,7 +18,6 @@ public class WmsTaskInfoModel implements Serializable { private static final long serialVersionUID = 8755413052807531167L; @ApiParam("任务单号") public String orderNo; - @Column(name = "TRANS_TYPE_CODE") /** * 状态:1=创建,10=待处理,20=已处理 */ @@ -28,6 +27,7 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("作业类型名称") public String opTypeName; + @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; 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 e33b3b1..a01642f 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 @@ -8,10 +8,7 @@ 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; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TASK") +@Table(name = "WMS_TASK",indexes = { + @Index(columnList = "TASK_STATUS"), + @Index(columnList = "TRANS_TYPE_CODE") +}) @Api("作业任务表") public class WmsTaskInfo extends BaseBean { From 2bc04b407e7da5f3e75f84939c0be9468f9bac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 22 Aug 2019 16:02:33 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=81=E6=97=B6=E9=97=B4=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 index 2b345d4..3cc6419 100644 --- 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 @@ -47,4 +47,14 @@ public class WmsPickingMovement extends BaseBean { @ApiParam(value = "工厂") @AnnoOutputColumn private String factory; + + @ApiParam(value = "计划日期") + @AnnoOutputColumn + private String planDate; + + @ApiParam(value = "计划时间") + @AnnoOutputColumn + private String planTime; + + } From 60eadfac7a62c07c11295ff10e95eaa11a645ae1 Mon Sep 17 00:00:00 2001 From: wangjie Date: Thu, 22 Aug 2019 14:39:37 -0700 Subject: [PATCH 22/25] =?UTF-8?q?mes=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8A=A0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 +-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 74 +++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) 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 b3eaebc..973555a 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 @@ -147,23 +147,23 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 02349f5..648be8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -75,7 +75,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean); + DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } // 时间段查询 @@ -161,7 +161,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } if (mesWorkOrder.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); @@ -345,7 +345,7 @@ public class MesHqlPack { public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); if (StringUtils.isNotEmpty(shift.getShiftCode())) { - DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); + DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean); } if (StringUtils.isNotEmpty(shift.getShiftName())) { DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); @@ -451,7 +451,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); } if (StringUtils.isNotEmpty(mesESOP.getPartNo())) { - DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean); } return packBean; @@ -603,7 +603,7 @@ public class MesHqlPack { public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode); if (StringUtils.isNotEmpty(process.getProcessCode())) { - DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean); } if (StringUtils.isNotEmpty(process.getProcessName())) { DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean); @@ -621,7 +621,7 @@ public class MesHqlPack { public static DdlPackBean getMesStep(MesStep step, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode); if (StringUtils.isNotEmpty(step.getStepCode())) { - DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean); + DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean); } if (StringUtils.isNotEmpty(step.getStepName())) { DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); @@ -645,7 +645,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean); } if (StringUtils.isNotEmpty(stepParam.getParamCode())) { - DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean); + DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean); } if (StringUtils.isNotEmpty(stepParam.getParamName())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean); @@ -687,13 +687,13 @@ public class MesHqlPack { public static DdlPackBean getMesBom(MesBom bom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode); if (StringUtils.isNotEmpty(bom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(bom.getItemPartNo())) { - DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean); } if (StringUtils.isNotEmpty(bom.getBomVersion())) { - DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean); + DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean); } return packBean; @@ -708,13 +708,13 @@ public class MesHqlPack { public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode); if (StringUtils.isNotEmpty(processBom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(processBom.getItemPartNo())) { - DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean); } if (StringUtils.isNotEmpty(processBom.getProcessCode())) { - DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean); } return packBean; @@ -729,7 +729,7 @@ public class MesHqlPack { public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); if (StringUtils.isNotEmpty(customer.getCustomerCode())) { - DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); } if (StringUtils.isNotEmpty(customer.getCustomerName())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); @@ -747,7 +747,7 @@ public class MesHqlPack { public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode); if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) { - DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); + DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); } if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean); @@ -768,10 +768,10 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean); } if (StringUtils.isNotEmpty(customerPart.getPartNo())) { - DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) { - DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); + DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } return packBean; @@ -786,10 +786,10 @@ public class MesHqlPack { public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) { - DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean); + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean); } if (StringUtils.isNotEmpty(keyData.getKeyDataName())) { - DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean); + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean); } return packBean; @@ -804,10 +804,10 @@ public class MesHqlPack { public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode); if (StringUtils.isNotEmpty(kpData.getPartNo())) { - DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean); } if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) { - DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean); + DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean); } return packBean; @@ -822,10 +822,10 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode); if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) { - DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) { - DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); } return packBean; @@ -840,7 +840,7 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) { - DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); + DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean); @@ -864,7 +864,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) { - DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean); } return packBean; @@ -879,7 +879,7 @@ public class MesHqlPack { public static DdlPackBean getMesPart(MesPart part, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); if (StringUtils.isNotEmpty(part.getPartNo())) { - DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(part.getPartName())) { DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); @@ -906,7 +906,7 @@ public class MesHqlPack { public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) { - DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean); + DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean); } if (StringUtils.isNotEmpty(partCategory.getCategoryName())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); @@ -924,7 +924,7 @@ public class MesHqlPack { public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); if (StringUtils.isNotEmpty(packSpec.getSpecCode())) { - DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean); + DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean); } if (StringUtils.isNotEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); @@ -945,7 +945,7 @@ public class MesHqlPack { public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) { - DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); + DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); } if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); @@ -963,7 +963,7 @@ public class MesHqlPack { public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) { - DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean); } return packBean; @@ -978,7 +978,7 @@ public class MesHqlPack { public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); @@ -996,10 +996,10 @@ public class MesHqlPack { public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); if (StringUtils.isNotEmpty(objectDao.getObjectCode())) { - DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean); } if (StringUtils.isNotEmpty(objectDao.getDaoClass())) { - DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean); + DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean); } return packBean; @@ -1014,10 +1014,10 @@ public class MesHqlPack { public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) { - DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); } if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) { - DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); } if (null != pcnSyncCfg.getSyncType()) { DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); @@ -1035,10 +1035,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) { - DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean); } return packBean; From 617bb73dada6e0e359a0e2847a84d8313138b469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 22 Aug 2019 16:09:44 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=8F=98=E9=87=8F=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20=E4=BF=AE=E6=94=B9hql=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 8 +++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 8 +++---- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 26 +++++----------------- 4 files changed, 17 insertions(+), 27 deletions(-) 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 55c1a73..9c929a5 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 @@ -121,7 +121,7 @@ public class WmsCSOrderDetails extends BaseBean { */ @Transient @ApiParam("差异类型") - public String differenceType; + public Integer differenceType; public Double getQty() { return this.qty == null ? 0 : this.qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 3c493d7..d3a23e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -145,6 +145,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; + @Transient + @ApiParam("业务类型编码") + private Integer busiTypeCode; + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -173,7 +177,7 @@ public class WmsMoveDetails extends BaseBean { public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, - Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){ + Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){ this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; @@ -194,6 +198,6 @@ public class WmsMoveDetails extends BaseBean { this.refSrc = refSrc; this.vendorNo = vendorNo; this.custNo = custNo; - + this.busiTypeCode = busiTypeCode; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index f8d9e0e..7453a8c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -155,7 +155,7 @@ public class WmsMoveSn extends BaseBean { @Transient @ApiParam("业务类型编码") - private String busiTypeCode; + private Integer busiTypeCode; @Transient @@ -194,7 +194,7 @@ public class WmsMoveSn extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode, String transTypeCode, String refSrc) { + public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean { } public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, - Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo){ + Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode){ this.organizeCode=organizeCode; this.orderNo=orderNo; this.item=item; @@ -235,6 +235,6 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; this.destZoneNo = destZoneNo; this.destWhNo =destWhNo; - + this.busiTypeCode = busiTypeCode; } } 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 eecd5fc..4dffc39 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 @@ -40,10 +40,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - // 封装有效状态和删除状态 + // 封装有效状态、删除状态、创建人和创建时间 DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + return hqlStr; } @@ -124,9 +127,6 @@ 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); return result; @@ -165,7 +165,6 @@ 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); @@ -206,8 +205,6 @@ 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; @@ -592,8 +589,6 @@ 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); @@ -623,9 +618,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); //单据来源 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); @@ -713,8 +705,6 @@ 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); @@ -912,7 +902,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); - getStringBuilderPack(wmsStockQuan, result); return result; @@ -1059,11 +1048,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result); - DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); - - DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), - wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true); getStringBuilderPack(wmsMoveMaster, result); @@ -1300,7 +1285,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); - + DdlPreparedPack.timeBuilder(wmsCSOrderMaster.getCreateDateTimeStart(), + wmsCSOrderMaster.getCreateDateTimeEnd(), "createDatetime", result, true); getStringBuilderPack(wmsCSOrderMaster, result); return result; From d7b0f30d91f7b0378f4dd2dc6c0bd76339753991 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 22 Aug 2019 18:11:22 +0800 Subject: [PATCH 24/25] =?UTF-8?q?IMPP=20=E5=B9=B3=E5=8F=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=20.=20=E8=BD=AF?= =?UTF-8?q?=E9=80=82=E9=80=82=E9=85=8D=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java | 1 + .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java | 3 ++- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java index d15f322..7879a8e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java @@ -10,6 +10,7 @@ import java.sql.SQLException; * @CreateDate : 2019-06-11 16:12 * @Modify: **/ +@FunctionalInterface public interface IResultSetCall { /** 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 b7c9f19..ee14fce 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 @@ -62,6 +62,8 @@ public class SuitCoreModel { */ private BsSuitCase bsSuitCase; + private Object bsSuitCaseDetail; + /** * 认证结果 */ diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java index 417a872..e480cbd 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java @@ -10,6 +10,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : socket套件 @@ -34,6 +36,5 @@ public class BsSocketSuitCase extends BaseBean { @Column(name = "SOCKET_MODE_ID") @ApiParam(value = "socket模式(枚举,服务端，客户端)") private Integer socketModeId; - } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 3c08750..148494f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -51,9 +51,9 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数值类型") private Integer paramValTypeId; - @Column(name = "PARAM_DEFAULT_VAL") + @Column(name = "PARAM_DEFAULT_VALUE") @ApiParam(value = "参数默认值") - private String paramDefaultVal; + private String paramDefaultValue; @Column(name = "PARAM_DESCRIPTION") @ApiParam(value = "参数描述") From aebe7422801a906ce637c718ce13bc7431aac0b2 Mon Sep 17 00:00:00 2001 From: wangjie Date: Thu, 22 Aug 2019 17:04:23 -0700 Subject: [PATCH 25/25] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BB=B6=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97=E7=9A=84=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 08f41a9..0c9da50 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,42 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 关键件条码规则信息绑定规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BIND_RULE { + + COOPERATION_PART(0, "外协件"), + SELF_CONTROL_PART(1, "自制件"); + + private int value; + private String description; + + BIND_RULE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT)