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 1/6] =?UTF-8?q?MES-PCN=E8=8E=B7=E5=8F=96=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=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 2/6] 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 3/6] =?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 4/6] =?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 5/6] =?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 6/6] =?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; + } + }