Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhongtong-avi-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
中通客车项目
zhongtong-avi-service
Commits
44e05286
Commit
44e05286
authored
Oct 08, 2019
by
喻训浩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: BUG修改
parent
03354b5d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
4 deletions
+33
-4
PaintshopStation.java
...star/zhongtong/avi/equipment/domain/PaintshopStation.java
+6
-0
AreaController.java
...r/zhongtong/avi/monitoring/controller/AreaController.java
+1
-1
Bus.java
.../java/net/vtstar/zhongtong/avi/monitoring/domain/Bus.java
+26
-3
No files found.
src/main/java/net/vtstar/zhongtong/avi/equipment/domain/PaintshopStation.java
View file @
44e05286
...
...
@@ -73,4 +73,10 @@ public class PaintshopStation {
@ApiModelProperty
(
notes
=
"是否为关键工位"
)
@Column
(
name
=
"key_station"
)
private
Boolean
keyStation
;
@ApiModelProperty
(
notes
=
"车身号"
)
private
String
busNo
;
@ApiModelProperty
(
value
=
"车体类型"
)
private
String
busType
;
}
src/main/java/net/vtstar/zhongtong/avi/monitoring/controller/AreaController.java
View file @
44e05286
...
...
@@ -34,7 +34,7 @@ public class AreaController {
return
Return
.
success
();
}
@ApiOperation
(
value
=
"根据工单号及
车身
号定位车体当前位置"
,
response
=
PaintshopStation
.
class
,
responseContainer
=
"List"
)
@ApiOperation
(
value
=
"根据工单号及
订单
号定位车体当前位置"
,
response
=
PaintshopStation
.
class
,
responseContainer
=
"List"
)
@GetMapping
(
"/currentPosition/orderNo/busNo"
)
private
Return
getPositionByOrderAndNo
(
@RequestParam
(
"orderNo"
)
String
orderNo
,
@RequestParam
(
"workOrderNo"
)
String
workOrderNo
)
{
return
Return
.
success
();
...
...
src/main/java/net/vtstar/zhongtong/avi/monitoring/domain/Bus.java
View file @
44e05286
...
...
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
java.math.BigDecimal
;
@Data
@Slf4j
@ApiModel
(
value
=
"车体信息"
)
...
...
@@ -12,9 +14,30 @@ public class Bus {
private
Long
id
;
@ApiModelProperty
(
value
=
"车身号"
)
@ApiModelProperty
(
value
=
"车
间计划工单号/车
身号"
)
private
String
code
;
@ApiModelProperty
(
value
=
"工单号"
)
private
String
orderNo
;
@ApiModelProperty
(
value
=
"销售订单号"
)
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
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment