Commit 44e05286 authored by 喻训浩's avatar 喻训浩

fix: BUG修改

parent 03354b5d
...@@ -73,4 +73,10 @@ public class PaintshopStation { ...@@ -73,4 +73,10 @@ public class PaintshopStation {
@ApiModelProperty(notes = "是否为关键工位") @ApiModelProperty(notes = "是否为关键工位")
@Column(name = "key_station") @Column(name = "key_station")
private Boolean keyStation; private Boolean keyStation;
@ApiModelProperty(notes = "车身号")
private String busNo;
@ApiModelProperty(value = "车体类型")
private String busType;
} }
...@@ -34,7 +34,7 @@ public class AreaController { ...@@ -34,7 +34,7 @@ public class AreaController {
return Return.success(); return Return.success();
} }
@ApiOperation(value = "根据工单号及车身号定位车体当前位置", response = PaintshopStation.class, responseContainer = "List") @ApiOperation(value = "根据工单号及订单号定位车体当前位置", response = PaintshopStation.class, responseContainer = "List")
@GetMapping("/currentPosition/orderNo/busNo") @GetMapping("/currentPosition/orderNo/busNo")
private Return getPositionByOrderAndNo(@RequestParam("orderNo") String orderNo, @RequestParam("workOrderNo") String workOrderNo) { private Return getPositionByOrderAndNo(@RequestParam("orderNo") String orderNo, @RequestParam("workOrderNo") String workOrderNo) {
return Return.success(); return Return.success();
......
...@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
@Data @Data
@Slf4j @Slf4j
@ApiModel(value = "车体信息") @ApiModel(value = "车体信息")
...@@ -12,9 +14,30 @@ public class Bus { ...@@ -12,9 +14,30 @@ public class Bus {
private Long id; private Long id;
@ApiModelProperty(value = "车身号") @ApiModelProperty(value = "车间计划工单号/车身号")
private String code; private String code;
@ApiModelProperty(value = "工单号") @ApiModelProperty(value = "销售订单号")
private String orderNo; private String saleOrderNo;
@ApiModelProperty(value = "主计划工单号")
private String planOrderNo;
@ApiModelProperty(value = "车型")
private String busType;
@ApiModelProperty(value = "订单数量")
private BigDecimal orderSize;
@ApiModelProperty(value = "单位")
private String unit;
@ApiModelProperty(value = "车间")
private String shop;
@ApiModelProperty(value = "产线")
private String line;
@ApiModelProperty(value = "读取标识")
private String flag;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment