Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
andly.pan
4 years ago
commit
4261e9d34e
@ -0,0 +1,60 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EInsertedOrder;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :插单管理
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-03-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_INSERTED_ORDER")
|
||||
@Api("插单管理")
|
||||
public class InsertedOrder extends BaseOrder {
|
||||
private static final long serialVersionUID = -5036380772996107234L;
|
||||
|
||||
@Column(name="ORDER_STATUS")
|
||||
@ApiParam(value ="订单状态")
|
||||
@FieldAnnotation(defaultValue = "UNCOMMIT")
|
||||
private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus;
|
||||
|
||||
@Column(name="STAND_OPERATIONS")
|
||||
@ApiParam("工序")
|
||||
private String standOperations;
|
||||
|
||||
@Column(name="PRODUCT_ROUTING_ID")
|
||||
@ApiParam(value ="工艺路线")
|
||||
@FieldAnnotation(property = false)
|
||||
private Long productRoutingId;
|
||||
|
||||
public ProductRouting getProductRouting() {
|
||||
return BeanRelation.get(this, EInsertedOrder.ProductRouting);
|
||||
}
|
||||
|
||||
public void setProductRouting(ProductRouting routing) {
|
||||
this.productRoutingId = routing != null ? routing.getId() : 0l;
|
||||
BeanRelation.set(this, EInsertedOrder.ProductRouting, routing);
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EBaseOrder.Works);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EInsertedOrder {
|
||||
ProductRouting
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EInventory {
|
||||
SafeStockOrders
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum ESafeStockOrder {
|
||||
Inventory
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.InsertedOrder;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface InsertedOrderRepository extends CrudRepository<InsertedOrder, Long> {
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="InsertedOrder" extends="BaseOrder">
|
||||
<Relation field="ProductRouting" name="ProductRouting" type="ONE_TO_ONE" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="Inventory" extends="BaseOrder">
|
||||
<Relation field="SafeStockOrders" name="SafeStockOrder" reverse="Inventory" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,76 @@
|
||||
package cn.estsh.i3plus.pojo.mes.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:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/3/4 7:16 PM
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_QUARANTINE_RECORD", indexes = {
|
||||
@Index(columnList = "SERIAL_NUMBER"),
|
||||
@Index(columnList = "PART_NO")
|
||||
})
|
||||
@Api("隔离记录表")
|
||||
public class MesQuarantineRecord extends BaseBean {
|
||||
private static final long serialVersionUID = -4667731056014803186L;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("零件名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("用量")
|
||||
private Integer qty;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "DEFECT_CODE")
|
||||
@ApiParam("缺陷代码")
|
||||
private String defectCode;
|
||||
|
||||
@Column(name = "DC_CODE")
|
||||
@ApiParam("缺陷原因代码")
|
||||
private String dcCode;
|
||||
|
||||
@Column(name = "REPAIR_CODE")
|
||||
@ApiParam("维修代码")
|
||||
private String repairCode;
|
||||
|
||||
@Column(name = "QUARANTINE_NO")
|
||||
@ApiParam("隔离单号")
|
||||
private String quarantineNo;
|
||||
|
||||
@Column(name = "SCRAP_No")
|
||||
@ApiParam("报废单号")
|
||||
private String scrapNo;
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/3/4 7:38 PM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesQuarantineRecordRepository extends BaseRepository<MesQuarantineRecord, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue