I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
yun-zuoyi
songss 5 years ago
parent 36928196c1 330cede03e
commit 2ed5108699
9 changed files with 92 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
Unescape Escape View File

@ -25,7 +25,9 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER", indexes = {
@Index(columnList = "CUST_FLAG_NO")
@Index(columnList = "CUST_FLAG_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "ORDER_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
})

11
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
Unescape Escape View File

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
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.io.Serializable;
/**
@ -27,7 +24,11 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_BOM")
@Table(name = "MES_QUEUE_ORDER_BOM", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO")
})
@Api("MES_生产队列散件清单")
public class MesQueueOrderBom extends BaseBean implements Serializable {

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
Unescape Escape View File

@ -25,7 +25,10 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
@Index(columnList = "ORDER_NO")
@Index(columnList = "ORDER_NO"),
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "QUEUE_GROUP_NO"),
@Index(columnList = "PRODUCE_CATEGORY_CODE")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"})
})

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
Unescape Escape View File

@ -11,10 +11,7 @@ import org.hibernate.annotations.ColumnDefault;
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.io.Serializable;
import java.util.List;
@ -30,7 +27,13 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_POINT")
@Table(name = "MES_WORK_CELL_POINT", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE"),
@Index(columnList = "QUEUE_SEQ"),
@Index(columnList = "QUEUE_DETAIL_SEQ")
})
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean implements Serializable {

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
Unescape Escape View File

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
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.io.Serializable;
/**
@ -27,7 +24,13 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_POINT_GROUP")
@Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE"),
@Index(columnList = "QUEUE_GROUP_NO"),
@Index(columnList = "ORDER_NO")
})
@Api("工站分组队列")
public class MesWorkCellPointGroup extends BaseBean implements Serializable {

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
Unescape Escape View File

@ -278,6 +278,18 @@ public class WmsPOMasterDetails extends BaseBean {
this.qty = qty;
}
public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime,
Double snp, Long totalBoxes, Double qty) {
this.orderNo = orderNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.planDate = planDate;//批次号（yyyyMMdd）
this.planTime = planTime;//批次号（yyyyMMdd）
this.snp = snp;
this.totalBoxes = totalBoxes.intValue();
this.qty = qty;
}
public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
Double rcQty, Integer itemStatus) {
this.orderNo = orderNo;

33
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java
Unescape Escape View File

@ -0,0 +1,33 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
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;
/**
* @Description : ERP 库存比对包含的库存地点
* @Reference :
* @Author : rock.yu
* @CreateDate : 2020-10-27 14:06
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ERP_QUAN_AREAS")
public class WmsErpQuanAreas extends BaseBean {
private static final long serialVersionUID = 5560607687871639209L;
@Column(name="AREA_NO")
@ApiParam("库存地点")
public String area_no;
}

9
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCheckPoint;
import org.springframework.stereotype.Repository;
@Repository
public interface WmsErpCheckPointRepository extends BaseRepository<WmsErpCheckPoint, Long> {
}

9
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpQuanAreas;
import org.springframework.stereotype.Repository;
@Repository
public interface WmsErpQuanAreasRepository extends BaseRepository<WmsErpQuanAreas, Long> {
}
Write Preview
Loading…
Cancel
Save