修复动态拆分输入,输出数量更新出错

yun-zuoyi
钮海涛 4 years ago
parent 76af5bc47d
commit 65a2e93dae

@ -45,6 +45,10 @@ public class FurnacePlan extends BaseAPS {
@ApiParam(value ="最小加工批量") @ApiParam(value ="最小加工批量")
private Integer minProductBatch; private Integer minProductBatch;
@Column(name="FIX_PLAN")
@ApiParam(value ="固定组炉的计划")
private Boolean fixPlan;
@JsonBackReference @JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); }
} }

@ -48,6 +48,10 @@ public class InsertedOrder extends BaseOrder {
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
private Double qualifiedCount;
@Column(name="REMARK") @Column(name="REMARK")
@ApiParam(value ="备注") @ApiParam(value ="备注")
private String remark; private String remark;

@ -34,6 +34,10 @@ public class OrderFeedback extends BaseAPS {
@FieldAnnotation(relation = "Order", modify = false) @FieldAnnotation(relation = "Order", modify = false)
private Long orderId; private Long orderId;
@Column(name="ORDER_COUNT")
@ApiParam(value ="订单数量")
private Double orderCount;
@Column(name="DELIVER_RATE") @Column(name="DELIVER_RATE")
@ApiParam(value ="发货百分比") @ApiParam(value ="发货百分比")
private Double deliverRate; private Double deliverRate;
@ -42,10 +46,6 @@ public class OrderFeedback extends BaseAPS {
@ApiParam(value ="成品合格百分比") @ApiParam(value ="成品合格百分比")
private Double qualifiedRate; private Double qualifiedRate;
@Column(name="INVENTORY_COUNT")
@ApiParam(value ="库存扣减数量")
private Double inventoryCount;
@Column(name="UNQUALIFIED_COUNT") @Column(name="UNQUALIFIED_COUNT")
@ApiParam(value ="不良数量") @ApiParam(value ="不良数量")
private Double unqualifiedCount; private Double unqualifiedCount;

@ -83,10 +83,10 @@ public class ProductOrder extends BaseOrder {
@FieldAnnotation(modify = false) @FieldAnnotation(modify = false)
private String calcLeadTime; private String calcLeadTime;
@Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") // @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="多余量") // @ApiParam(value ="多余量")
@FieldAnnotation(modify = false) // @FieldAnnotation(modify = false)
private Double excessCount; // private Double excessCount;
@Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)") @Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="缺少量") @ApiParam(value ="缺少量")
@ -102,6 +102,10 @@ public class ProductOrder extends BaseOrder {
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
private Double qualifiedCount;
@Column(name="PRODUCT_ROUTING_ID") @Column(name="PRODUCT_ROUTING_ID")
@ApiParam(value ="工艺路线") @ApiParam(value ="工艺路线")
@FieldAnnotation(property = false) @FieldAnnotation(property = false)

@ -50,10 +50,10 @@ public class PurchaseOrder extends BaseOrder {
@FieldAnnotation(modify = false) @FieldAnnotation(modify = false)
private String calcLeadTime; private String calcLeadTime;
@Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") // @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="多余量") // @ApiParam(value ="多余量")
@FieldAnnotation(modify = false) // @FieldAnnotation(modify = false)
private Double excessCount; // private Double excessCount;
@Column(name="AUTO_SUPPLY") @Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充") @ApiParam(value ="物料计算时自动补充")

@ -45,6 +45,10 @@ public class SafeStockOrder extends BaseOrder {
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
private Double qualifiedCount;
@JsonIgnore @JsonIgnore
public Work getWork() { public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works); return BeanRelation.get(this, EBaseOrder.Works);

@ -69,6 +69,10 @@ public class SalesOrder extends BaseOrder {
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量")
private Double qualifiedCount;
@JsonIgnore @JsonIgnore
public Work getWork() { public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works); return BeanRelation.get(this, EBaseOrder.Works);

@ -120,7 +120,7 @@ public class WorkPlan extends BaseAPS {
@ApiParam(value ="打印时间") @ApiParam(value ="打印时间")
private Date printTime; private Date printTime;
@ApiParam(value ="生产结束时间") @ApiParam(value ="资源生产结束")
@FieldAnnotation(display = false) @FieldAnnotation(display = false)
@Transient @Transient
@RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")

Loading…
Cancel
Save