修改排程计划逻辑
parent
257647de0a
commit
caafb9c317
@ -0,0 +1,65 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EOrderFeedback;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
|
||||
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 : 2020-03-19
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_ORDER_FEEDBACK")
|
||||
@Api("订单反馈")
|
||||
public class OrderFeedback extends BaseAPS {
|
||||
private static final long serialVersionUID = 7822380202121225936L;
|
||||
|
||||
@Column(name="ORDER_ID")
|
||||
@ApiParam(value ="订单")
|
||||
@FieldAnnotation(property = false)
|
||||
private Long orderId;
|
||||
|
||||
@Column(name="DELIVER_RATE")
|
||||
@ApiParam(value ="发货百分比")
|
||||
private transient Double deliverRate;
|
||||
|
||||
@Column(name="QUALIFIED_RATE")
|
||||
@ApiParam(value ="成品合格百分比")
|
||||
private Double qualifiedRate;
|
||||
|
||||
@Column(name="INVENTORY_COUNT")
|
||||
@ApiParam(value ="库存扣减数量")
|
||||
private Double inventoryCount;
|
||||
|
||||
@Column(name="UNQUALIFIED_COUNT")
|
||||
@ApiParam(value ="不良数量")
|
||||
private Double unqualifiedCount;
|
||||
|
||||
@Column(name="QUALIFIED_COUNT")
|
||||
@ApiParam(value ="合格数量")
|
||||
private Double qualifiedCount;
|
||||
|
||||
public BaseOrder getOrder() {
|
||||
return BeanRelation.get(this, EOrderFeedback.Order);
|
||||
}
|
||||
|
||||
public void setOrder(BaseOrder order) {
|
||||
this.orderId = order != null ? order.getId() : 0l;
|
||||
BeanRelation.set(this, EOrderFeedback.Order, order);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
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-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_WORK_SHOP")
|
||||
@Api("车间")
|
||||
public class WorkShop extends BaseAPS {
|
||||
private static final long serialVersionUID = 5627016086816721284L;
|
||||
|
||||
@Column(name="CODE")
|
||||
@ApiParam(value ="编码")
|
||||
@FieldAnnotation(popSearch = true, mainkey = true)
|
||||
private String code;
|
||||
|
||||
@Column(name="NAME")
|
||||
@ApiParam(value ="名称")
|
||||
@FieldAnnotation(popSearch = true)
|
||||
private String name;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EOrderFeedback {
|
||||
Order
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EResource {
|
||||
WorkShop,
|
||||
WorkPlans
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EStandOperation {
|
||||
WorkShop
|
||||
}
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.OrderFeedback;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface IOrderFeedbackRepository extends CrudRepository<OrderFeedback, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.WorkShop;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface WorkShopRepository extends CrudRepository<WorkShop, Long> {
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="OrderFeedback">
|
||||
<Relation field="Order" name="BaseOrder" type="ONE_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -1,3 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="PlanFeedback">
|
||||
</Class>
|
||||
@ -1,5 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="Resource">
|
||||
<Relation field="WorkShop" name="WorkShop" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="WorkPlans" name="WorkPlan" reverse="Resource" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -1,3 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="StandOperation">
|
||||
<Relation field="WorkShop" name="WorkShop" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
Loading…
Reference in New Issue