修复四车间问题

yun-zuoyi
钮海涛 4 years ago
parent 29acf31f74
commit e97f49d8ee

@ -46,10 +46,12 @@ public class InsertedOrder extends BaseOrder {
@Column(name="FINISH_COUNT") @Column(name="FINISH_COUNT")
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT") @Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量") @ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount; private Double qualifiedCount;
@Column(name="REMARK") @Column(name="REMARK")

@ -56,11 +56,6 @@ public class ProductOrder extends BaseOrder {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting")
private String specifyRouting; private String specifyRouting;
@Column(name="RECALC_COUNT")
@ApiParam(value ="是否重新计算数量")
@FieldAnnotation(defaultValue = "true")
private Boolean recalcCount;
@Column(name="SPECIFY_TOP_ORDER") @Column(name="SPECIFY_TOP_ORDER")
@ApiParam(value ="指定顶层订单") @ApiParam(value ="指定顶层订单")
private String specifyTopOrder; private String specifyTopOrder;
@ -95,10 +90,12 @@ public class ProductOrder extends BaseOrder {
@Column(name="FINISH_COUNT") @Column(name="FINISH_COUNT")
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT") @Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量") @ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount; private Double qualifiedCount;
@Column(name="PRODUCT_ROUTING_ID") @Column(name="PRODUCT_ROUTING_ID")

@ -43,10 +43,12 @@ public class SafeStockOrder extends BaseOrder {
@Column(name="FINISH_COUNT") @Column(name="FINISH_COUNT")
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT") @Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量") @ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount; private Double qualifiedCount;
@JsonIgnore @JsonIgnore

@ -77,12 +77,12 @@ public class SalesOrder extends BaseOrder {
@Column(name="FINISH_COUNT") @Column(name="FINISH_COUNT")
@ApiParam(value ="完工数") @ApiParam(value ="完工数")
@FieldAnnotation(modify = false) @FieldAnnotation(modify = false, defaultValue = "0")
private Double finishCount; private Double finishCount;
@Column(name="QUALIFIED_COUNT") @Column(name="QUALIFIED_COUNT")
@ApiParam(value ="检验合格数量") @ApiParam(value ="检验合格数量")
@FieldAnnotation(modify = false) @FieldAnnotation(modify = false, defaultValue = "0")
private Double qualifiedCount; private Double qualifiedCount;
@Column(name="SERIAL_NUMBER") @Column(name="SERIAL_NUMBER")

Loading…
Cancel
Save