From 1c02cd6562068eff2c7ccf2fc0d0c12e63631594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Aug 2020 16:42:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2612=EF=BC=8C2613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 77 +++++++++++++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 21 ++++++ .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 17 ++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 21 ++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 5 files changed, 126 insertions(+), 12 deletions(-) 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 6b820ef..e41c77c 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 @@ -6188,19 +6188,21 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WEEK_TYPE { - MONDAY(20, "星期一"), - TUESDAY(30, "星期二"), - WEDNESDAY(40, "星期三"), - THURSDAY(50, "星期四"), - FRIDAY(60, "星期五"), - SATURDAY(70, "星期六"), - SUNDAY(10, "星期日"); + MONDAY(20, 1, "星期一"), + TUESDAY(30, 2, "星期二"), + WEDNESDAY(40, 3, "星期三"), + THURSDAY(50, 4, "星期四"), + FRIDAY(60, 5, "星期五"), + SATURDAY(70, 6, "星期六"), + SUNDAY(10, 0, "星期日"); private final int value; + private final int code; private final String description; - WEEK_TYPE(int value, String description) { + WEEK_TYPE(int value, int code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -6208,6 +6210,10 @@ public class WmsEnumUtil { return value; } + public int getCode() { + return code; + } + public String getDescription() { return description; } @@ -6230,6 +6236,15 @@ public class WmsEnumUtil { } return tmp; } + + public static int getValByCode(int code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code == code) { + return values()[i].value; + } + } + return 0; + } } /** @@ -8794,4 +8809,50 @@ public class WmsEnumUtil { return null; } } + + /** + * 收货看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_BOARD_STATUS { + FINISH(10, "已完成(绿色)"), + OVER_TIME(20, "已超时（红色）"), + UNRECEIVED(30, "未收货（蓝色）"), + VARIANT(40, "有差异（黄色）"); + + private int value; + private String description; + + RC_BOARD_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static RC_BOARD_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 902425b..485ce2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -161,6 +161,18 @@ public class WmsPOMaster extends BaseBean { private String planDateEnd; @Transient + @ApiParam("计划日期") + private String planDate; + + @Transient + @ApiParam("计划时间") + private String planTime; + + @Transient + @ApiParam("看板状态") + private Integer boardStatus; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -193,6 +205,15 @@ public class WmsPOMaster extends BaseBean { this.createDatetime = createDateTime; this.createDateTimeStart = receiveDateTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, + String dockCode, String planDate, String planTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + } public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 2f5c2fb..9cc690d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -128,6 +128,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; @@ -185,9 +189,6 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("结束时间") private String planEndDate; - @Column(name = "REMARK") - @ApiParam("备注") - private String remark; public Double getSnpVal() { return snp; @@ -245,4 +246,14 @@ public class WmsPOMasterDetails extends BaseBean { this.modifyDatetime = modifyDatetime; this.remark = remark; } + + public WmsPOMasterDetails(String partNo,String partNameRdd,String planDate, + Double snp,Long totalBoxes,Double qty){ + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.planDate = planDate;//批次号（yyyyMMdd） + this.snp=snp; + this.totalBoxes = totalBoxes.intValue(); + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java index 78913f6..3b1566e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库区物料 @@ -87,4 +88,24 @@ public class WmsZonePart extends BaseBean{ @ApiParam(value = "安全量", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double safetyQty; + + @Transient + @ApiParam(value = "总件数") + private Double totalSnQty ; + + @Transient + @ApiParam(value = "库存是否正常") + private Integer isNormal ; + + public WmsZonePart() { + } + + public WmsZonePart(String zoneNo, String partNo, String partNameRdd, Double min, Double max, Double totalSnQty) { + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.min = min; + this.max = max; + this.totalSnQty = totalSnQty; + } } \ No newline at end of file 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 cbddf7b..0cbc776 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 @@ -563,7 +563,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); if (wmsLocate.getZoneNo() != null) { - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); + DdlPreparedPack.getInPackArray(wmsLocate.getZoneNo().split(","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { DdlPreparedPack.getInPackArray(wmsLocate.getLocateNoArr(), "locateNo", result); From a45d1ed104e14b58a0c657ec91f05439d20d7c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 13 Aug 2020 22:28:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E5=88=86=E9=A1=B5=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E8=A1=8C=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 38 ++++++++++++++++------ 1 file changed, 28 insertions(+), 10 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 d537b55..a609d5f 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 @@ -15,6 +15,7 @@ import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; +import java.util.LinkedHashMap; /** * @Description : @@ -142,24 +143,41 @@ public abstract class BaseBean implements Serializable { public transient Integer ascOrDesc = 1; public int getIsValidVal() { - return this.isValid == null ? 0 : this.isValid.intValue(); + return this.isValid == null ? 0 : this.isValid; } public int getIsDeletedVal() { - return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + return this.isDeleted == null ? 0 : this.isDeleted; } + @Transient + @ApiParam(value = "多列排序") + @AnnoOutputColumn(hidden = true) + public LinkedHashMap sortParamMap; + //排序方式 public String orderBy(){ - String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { - result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { - result += " asc"; - }else{ - result += " desc"; + StringBuffer result = new StringBuffer(" order by "); + + if (sortParamMap != null && sortParamMap.size() != 0) { + for (String key : sortParamMap.keySet()) { + packOrderByHql(result,orderByParam,ascOrDesc); } + } else if (orderByParam != null && orderByParam.trim().length() > 0) { + packOrderByHql(result,orderByParam,ascOrDesc); + }else{ + return ""; } - return result; + return result.subSequence(0, result.length() - 1).toString(); } + + private void packOrderByHql(StringBuffer stringBuffer, String orderByParam, Integer ascOrDesc) { + stringBuffer.append(" ").append(orderByParam); + if (ascOrDesc == null || ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + stringBuffer.append(" asc"); + } else { + stringBuffer.append(" desc,"); + } + } + } From 15aa885cf86ac6df6c0269aea3ded84fec91f62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 13 Aug 2020 22:29:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 9d1de96..1294aa0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -90,6 +90,10 @@ public class SysLogTaskTime extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; + public int getTaskStatusVal() { + return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; + } + @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; From f42ece4f6c22b42868d824614f9f71869b3aca34 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 14 Aug 2020 22:25:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E6=89=A7=E8=A1=8C=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 9 +++++---- .../cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 7 ++++++- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 3b2f5a2..4505d1a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -48,6 +48,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep private SnowflakeIdMaker snowflakeIdMaker; /* 默认查询数据条数 */ private static final Pager DEFAULT_PAGER = new Pager(10,10); + private static final Pager GETBYPROPERTY_PAGER = new Pager(1,1); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -512,7 +513,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { try { - List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + List list = findByHqlWherePage(packBean,GETBYPROPERTY_PAGER); return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); @@ -525,17 +526,17 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, GETBYPROPERTY_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { - return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + return getByPropertyPager(propertyNames, values, GETBYPROPERTY_PAGER); } @Override public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { - pager = pager == null ? DEFAULT_PAGER: pager; + pager = pager == null ? GETBYPROPERTY_PAGER: pager; if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 6069c18..dff1e11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SWEB_PROCUREMENT_PLAN_ORDER") +@Table(name="SWEB_PROCUREMENT_PLAN_ORDER", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "VENDOR_CODE"), + @Index(columnList = "PART_NO") +}) @Api("开口合同主表") public class SwebProcurementPlanOrder extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 8734084..2779b7f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; @@ -26,7 +27,10 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name = "WMS_LOCATE") +@Table(name = "WMS_LOCATE", indexes = { + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) 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 4e5da1c..14534dd 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 @@ -36,6 +36,7 @@ import javax.persistence.Version; @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), + @Index(columnList = "REF_SRC"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单明细信息") 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 40da59c..1645a74 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 @@ -35,6 +35,8 @@ import javax.persistence.Version; @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), @Index(columnList = "SN"), + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "PACKAGE_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单条码信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index ca27941..f3e05c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -32,6 +32,7 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_PART", indexes = { + @Index(columnList = "PART_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("物料表") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 6d0cf25..b2cd128 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -43,7 +43,8 @@ import java.util.List; @Index(columnList = "LOT_NO"), @Index(columnList = "FIX_LOT_NO"), @Index(columnList = "DATE_CODE"), - @Index(columnList = "VENDOR_NO") + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "ORGANIZE_CODE") }) @DynamicInsert @DynamicUpdate diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 5fbc76e..3c3cf1e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_UNIT_CONVERT") +@Table(name="WMS_UNIT_CONVERT", indexes = { + @Index(columnList = "UNIT_CODE"), + @Index(columnList = "DEST_UNIT_CODE"), + @Index(columnList = "ORGANIZE_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true)