From 2ad41030e69bbb2d155cebf53a6f8920781174f4 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 11 Dec 2018 10:49:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E5=B9=B6=E6=89=93=E5=BC=80=20MQ=20=E4=BB=A5=E5=8F=8A=E9=82=AE?= =?UTF-8?q?=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 10 ++++++++ .../i3plus/pojo/model/wms/CheckPointModel.java | 1 - .../i3plus/pojo/platform/bean/SysFactoryStore.java | 4 ++-- .../i3plus/pojo/platform/bean/SysOrderNoRule.java | 27 ++++++++++++++++++---- .../i3plus/pojo/platform/bean/SysUserInfo.java | 4 ++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 12 ++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 1 + .../wms/repository/WmsIbCheckPlanRepository.java | 5 ++-- 9 files changed, 56 insertions(+), 10 deletions(-) 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 ae21e54..38b454c 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 @@ -120,6 +120,16 @@ public class CommonEnumUtil { } 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; + } } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java index eabefdf..494586d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java @@ -41,5 +41,4 @@ public class CheckPointModel { *实际抽点数量【从前端输入获取】 */ private Integer actQty; - } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index dcfe3bd..814ba4f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -29,9 +29,9 @@ public class SysFactoryStore extends BaseBean { @Column(name="store_code") @ApiParam("仓库代码") - public String storeCode; + private String storeCode; @Column(name="store_name") @ApiParam("仓库名称") - public String storeName; + private String storeName; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index e086d41..a76db1f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 单号规则 @@ -58,20 +61,36 @@ public class SysOrderNoRule extends BaseBean { private Long serialNoLength; @Column(name = "IS_CYCLE") - @ApiParam(value = "达到最大值后是否循环",example = "1") + @ApiParam(value = "达到最大值后是否循环",example = "1",hidden = true) private Integer isCycle; + @Transient + @ApiParam(value = "达到最大值后是否循环",example = "否") + private String isCycleName; + + public String getIsCycleName() { + if(isCycle != null){ + CommonEnumUtil.TRUE_OR_FALSE.valueOf(isCycle); + } + return isCycleName; + } + + public void setIsCycleName(String isCycleName) { + this.isCycleName = isCycleName; + this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); + } + @Column(name = "SERIAL_NO") - @ApiParam(value = "当前流水号",example = "-1") + @ApiParam(value = "当前流水号",example = "-1",hidden = true) @JsonSerialize(using = ToStringSerializer.class) private Long serialNo; @Column(name = "ORDER_NO") - @ApiParam(value = "当前单号") + @ApiParam(value = "当前单号",hidden = true) private String orderNo; @Column(name = "ORDER_NO_RULE_STATUS") - @ApiParam(value = "单号规则状态") + @ApiParam(value = "单号规则状态",hidden = true) private Integer orderNoRuleStatus; @Column(name="ORDER_NO_RULE_DESCRIPTION") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 84781e3..84d5d02 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -113,6 +113,10 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Column(name="USER_NUM") + @ApiParam(value ="用户账号数",example = "0") + private Integer userNum; + @Transient @ApiParam(value ="用户所有部门信息") private List departmentList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 1b0d73a..f77920e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; +import java.util.List; + /** * @Description : 平台对象封装 * @Reference : @@ -113,6 +115,16 @@ public class CoreHqlPack { return result.toString(); } + public static String packHqlSysOrganize(Long[] ids, Integer typeId){ + StringBuffer result = new StringBuffer(); + + // 查询参数封装 + HqlPack.getInPack(StringUtils.join(ids,","),"id",result); + HqlPack.getNumEqualPack(typeId,"organizeType",result); + + return result.toString(); + } + /** * 部门复杂查询 * @param department diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 71c9869..6e95f51 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -35,7 +35,7 @@ public class WmsMoveMaster extends BaseBean { /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 + * MI=移库入库,MO=移库出库,SO=发运1 */ @Column(name="ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 62774b3..c466a30 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -18,6 +18,7 @@ import javax.persistence.Table; * @Author : hansen.ke * @CreateDate : 2018-11-28 15:20 * @Modify: + * 2018-12-10 10:39:46 **/ @Data @Entity diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java index fd86ecd..430e521 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java @@ -6,10 +6,11 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.Date; +import java.util.List; /** * @Description : 抽点比例表 - * @Reference : + * @Reference :1 * @Author : jimmy.zeng * @CreateDate : 2018-11-07 11:17 * @Modify: @@ -17,6 +18,6 @@ import java.util.Date; public interface WmsIbCheckPlanRepository extends BaseRepository { @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and icp.organizeCode=:organizeCode and icp.startDate<=:date and icp.endDate>=:date") - WmsIbCheckPlan findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); + List findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); } From 35ecf85881f1458226ed854b743559855477f23b Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 11 Dec 2018 18:45:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3=20=20?= =?UTF-8?q?=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- .../pojo/model/dynamic/table/DynTableCell.java | 29 ++++++++ .../pojo/model/dynamic/table/DynTablePackTool.java | 82 ++++++++++++++++++++++ .../pojo/model/dynamic/table/DynTableRow.java | 48 +++++++++++++ .../pojo/model/dynamic/table/ImppDynTable.java | 33 +++++++++ .../i3plus/pojo/platform/bean/SysOrderNoRule.java | 2 +- .../pojo/wms/bean/WmsActionResponseBean.java | 14 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 ++++++ 8 files changed, 229 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java 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 38b454c..88ff33c 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 @@ -273,7 +273,7 @@ public class CommonEnumUtil { // EXPIRE(5, "服务到期", "服务到期_EXPIRE"), LOCKING(3, "fa cell-fa fa-lock", "锁定"), ENABLE(1, "fa fa-success cell-fa fa-check", "启用"), - DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁止"); + DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁用"); private int value; private String code; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java new file mode 100644 index 0000000..105afef --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.dynamic.table; + +import lombok.Data; + +import java.util.Date; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-12-11 15:37 + * @Modify: + * 动态 Table 单元格 + **/ +@Data +public class DynTableCell { + + // 排序 + private Integer cellSeq; + // 单元格名称 + private String cellName; + // 单元格名称英文 + private String cellNameEn; + // 单元格数据 + private Object cellValue; + // 单元格数据 + private Integer cellValueType; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java new file mode 100644 index 0000000..93e5814 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.model.dynamic.table; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-12-11 16:43 + * @Modify: + * 动态表单 工具类 + **/ +public class DynTablePackTool { + + + /** + * 获取 Table 空行对象 + * @return + */ + public static DynTableRow getTableRow(){ + return new DynTableRow(); + } + + /** + * 获取 Table 空行对象 + * @return + */ + public static DynTableRow getTableRow(String rowKey){ + DynTableRow row = getTableRow(); + row.setKey(rowKey); + return row; + } + + public static DynTableRow getDynTableRow(ImppDynTable table, String key){ + if(table != null && key != null){ + return table.getTable().get(key); + } + return null; + } + + /** + * 表单 中添加行数据 + * @param table + * @param row + * @return + */ + public static DynTableRow putDynTableRow(ImppDynTable table,DynTableRow row){ + return table.getTable().put(row.getKey(),row); + } + + /** + * 创建单元格 + * @param seq + * @param name + * @param value + * @return + */ + public static DynTableCell getTableCell(Integer seq,String name,Object value) { + return getTableCell(seq, name, null, value,null); + } + + public static DynTableCell getTableCell(Integer seq,String name,Object value,Integer valueType) { + return getTableCell(seq, name, null, value,valueType); + } + + /** + * 创建一个单元格 + * @param seq 单元格排序 + * @param name 单元格名称 + * @param nameEn 单元格名称En + * @param value 单元格数据 + * @return + */ + public static DynTableCell getTableCell(Integer seq,String name,String nameEn,Object value,Integer valueType){ + DynTableCell cell = new DynTableCell(); + cell.setCellSeq(seq); + cell.setCellName(name); + cell.setCellNameEn(nameEn); + cell.setCellValue(value); + cell.setCellValueType(valueType); + return cell; + } + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java new file mode 100644 index 0000000..3ab4697 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.model.dynamic.table; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-12-11 15:37 + * @Modify: + * 动态Table Row + **/ +@Data +public class DynTableRow { + + private String key; + + // 行号 + private Integer index = 0; + + // 行Size + private Integer cellSize = 0; + + // 行数据 + private List cellList = new ArrayList<>(); + + + public DynTableRow addList(DynTableCell cell){ + this.cellList.add(cell); + return this; + } + + public Integer getCellSize() { + return cellList != null ? cellList.size() : 0; + } + + /** + * 禁止外部给 Size 赋值 + * @param cellSize + */ + private void setCellSize(Integer cellSize) { } + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java new file mode 100644 index 0000000..3ea67da --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.model.dynamic.table; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-12-11 15:37 + * @Modify: + * 动态Table Row + **/ +@Data +public class ImppDynTable { + + // 行数据 + private Map table = new HashMap<>(); + + // 表单标题 + private String tableTitle; + + public ImppDynTable() { + } + + public ImppDynTable(String tableTitle) { + this.tableTitle = tableTitle; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index a76db1f..1db15c3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -77,7 +77,7 @@ public class SysOrderNoRule extends BaseBean { public void setIsCycleName(String isCycleName) { this.isCycleName = isCycleName; - this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); +// this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); } @Column(name = "SERIAL_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index ecb479a..a9ee675 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -53,6 +53,20 @@ public class WmsActionResponseBean { @JsonSerialize(using = ToStringSerializer.class) public Long alId; + /** + * 默认为False，如果这个值为True， + * 就把detailsData的内容以List的格式显示到 列表提示区域 + */ + @ApiParam(value = "是否需要选择单号") + public Boolean toSelected; + + /** + * 与 toSelected 属性配合使用， + * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 + */ + @ApiParam(value = "关键字段列名") + public String keyColumn; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; 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 02b81b0..bfada04 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 @@ -1110,6 +1110,8 @@ public class WmsHqlPack { getStringBuilderPack(wmsActionGroupDetails, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + return result.toString(); } @@ -1190,4 +1192,23 @@ public class WmsHqlPack { return result.toString(); } + + /** + * PO订单条码表 分页查询 + * + * @param wmsPoSn + * @return + */ + public static String packHqlWmsPoSn(WmsPoSn wmsPoSn) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsPoSn.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsPoSn.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsPoSn, result); + + return result.toString(); + } } From 95a58d97a27a5a47808d667ede2e71c4c5f9e1c1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 11 Dec 2018 18:49:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3=20=20?= =?UTF-8?q?=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 888e1bd..85a76cc 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 485fdd6..e0f7b38 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..fa05f2a 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ead6373..5773499 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base From 786c6529003d415d2a6d7466f84c12d649d9e493 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 09:41:22 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3=20=20?= =?UTF-8?q?=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 85a76cc..888e1bd 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index e0f7b38..485fdd6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 1db15c3..80703e6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -23,6 +23,7 @@ import javax.persistence.Transient; * @Author : yunhao * @CreateDate : 2018-11-21 15:12 * @Modify: + * Dev 2018-12-12 09:41:07 **/ @Data @Entity @@ -77,7 +78,7 @@ public class SysOrderNoRule extends BaseBean { public void setIsCycleName(String isCycleName) { this.isCycleName = isCycleName; -// this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); + this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); } @Column(name = "SERIAL_NO") @@ -96,5 +97,4 @@ public class SysOrderNoRule extends BaseBean { @Column(name="ORDER_NO_RULE_DESCRIPTION") @ApiParam(value ="描述") private String orderNoRuleDescription; - } diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index fa05f2a..7409467 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5773499..ead6373 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base From 85061bbc4ff95fb1ff84fce67e10e8a6663eb8b2 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 12 Dec 2018 16:50:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index a9ee675..1f8240d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; import cn.estsh.i3plus.pojo.model.wms.OptionModel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -23,7 +24,7 @@ import java.util.Map; @NoArgsConstructor @AllArgsConstructor @Api("返回前端数据实体") -public class WmsActionResponseBean { +public class WmsActionResponseBean { @ApiParam("进度") public Double percent; @@ -44,7 +45,7 @@ public class WmsActionResponseBean { public List options; @ApiParam("选中的明细数据") - public List> details; + public Obj details; @ApiParam(value = "结果代码") public Boolean codeStatus; @@ -72,11 +73,12 @@ public class WmsActionResponseBean { this.message = message; } - public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { + public WmsActionResponseBean(Double percent, String message, List informations, Obj details, Boolean codeStatus) { this.percent = percent; this.message = message; this.informations = informations; this.details = details; this.codeStatus = codeStatus; } + } From adbcbb16a0980f9c7fd6ac2bcff2b6bee19d51be Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 17:39:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java | 2 ++ .../estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java | 8 +++++--- .../cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java index 105afef..282c308 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java @@ -15,6 +15,8 @@ import java.util.Date; @Data public class DynTableCell { + // 单元格名称 + private String cellKey; // 排序 private Integer cellSeq; // 单元格名称 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java index 93e5814..391cbf2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java @@ -54,23 +54,25 @@ public class DynTablePackTool { * @return */ public static DynTableCell getTableCell(Integer seq,String name,Object value) { - return getTableCell(seq, name, null, value,null); + return getTableCell(seq,seq.toString(), name, null, value,null); } public static DynTableCell getTableCell(Integer seq,String name,Object value,Integer valueType) { - return getTableCell(seq, name, null, value,valueType); + return getTableCell(seq,seq.toString(), name, null, value,valueType); } /** * 创建一个单元格 * @param seq 单元格排序 + * @param key 单元格Key * @param name 单元格名称 * @param nameEn 单元格名称En * @param value 单元格数据 * @return */ - public static DynTableCell getTableCell(Integer seq,String name,String nameEn,Object value,Integer valueType){ + public static DynTableCell getTableCell(Integer seq,String key,String name,String nameEn,Object value,Integer valueType){ DynTableCell cell = new DynTableCell(); + cell.setCellKey(key); cell.setCellSeq(seq); cell.setCellName(name); cell.setCellNameEn(nameEn); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 3ab4697..0475165 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -27,16 +27,16 @@ public class DynTableRow { private Integer cellSize = 0; // 行数据 - private List cellList = new ArrayList<>(); + private Map cellMap = new HashMap<>(); - public DynTableRow addList(DynTableCell cell){ - this.cellList.add(cell); + public DynTableRow putCell(DynTableCell cell){ + this.cellMap.put(cell.getCellKey(),cell); return this; } public Integer getCellSize() { - return cellList != null ? cellList.size() : 0; + return cellMap != null ? cellMap.size() : 0; } /** From 3d89bae88fc2fdf2168ee2368edd4ea6a5ec5d62 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 17:49:41 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8A=A8=E6=80=81=20Table=20=E5=8A=9F?= =?UTF-8?q?=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/model/dynamic/table/DynTablePackTool.java | 19 +++++++++++++++++++ .../i3plus/pojo/model/dynamic/table/ImppDynTable.java | 10 ++++++++++ 2 files changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java index 391cbf2..de0ec17 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; +import java.util.Map; + /** * @Description : * @Reference : @@ -81,4 +83,21 @@ public class DynTablePackTool { return cell; } + /** + * 获取Table 中的单元格数据 + * @param table 要获取的Table + * @param rowKey 要获取的行 Key + * @param cellKey 要获取的列 Key + * @return + */ + public static DynTableCell getCell(ImppDynTable table,String rowKey,String cellKey){ + if(table != null && rowKey != null && cellKey != null){ + DynTableRow row = table.getTable().get(rowKey); + if(row != null){ + return row.getCellMap().get(cellKey); + } + } + return null; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java index 3ea67da..047823a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java @@ -23,6 +23,8 @@ public class ImppDynTable { // 表单标题 private String tableTitle; + // 表单总记录数 + private Long tableSize; public ImppDynTable() { } @@ -30,4 +32,12 @@ public class ImppDynTable { public ImppDynTable(String tableTitle) { this.tableTitle = tableTitle; } + + public Long getTableSize() { + return new Long(table.size()); + } + + private void setTableSize(Long tableSize) { + this.tableSize = tableSize; + } }