|
|
@@ -1,11 +1,11 @@
|
|
|
import { BottomOperateComp } from '../../common/component/BottomOperateComp'
|
|
|
import { TitleStateComp } from '../../common/component/TitleStateComp'
|
|
|
-import CommonConstants from '../../common/constants/CommonConstants';
|
|
|
import OrderInfo from '../../model/OrderInfo';
|
|
|
import ProcessData from '../../model/ProcessData';
|
|
|
import router from '@ohos.router';
|
|
|
import { OrderStatisticsComp } from '../../common/component/OrderStatisticsComp';
|
|
|
import JGRequest from '../../common/util/request/Request';
|
|
|
+import PageModel from '../../viewmodel/PageModel';
|
|
|
|
|
|
/*
|
|
|
* 工序操作首页
|
|
|
@@ -15,22 +15,49 @@ import JGRequest from '../../common/util/request/Request';
|
|
|
struct ProcessHome {
|
|
|
|
|
|
@State orderArray: OrderInfo[] = [];
|
|
|
- @State selectOrderId: number = 0
|
|
|
- @State processes: ProcessData[] = CommonConstants.PROCESS_ARRAY;
|
|
|
+ @State selectOrder: number = -1
|
|
|
+ @State processes: ProcessData[] = [];
|
|
|
@State selectProcess: number = 0
|
|
|
+ // 扫描到的物料
|
|
|
@State mainMaterial: string = ''
|
|
|
|
|
|
+ // 统计——当前订单
|
|
|
+ @State planNum: number = 0
|
|
|
+ @State completeNum: number = 0
|
|
|
+ @State bugNum: number = 0
|
|
|
+
|
|
|
+ private orderPageNo: number = 1
|
|
|
+ private orderPageSize: number = 10
|
|
|
+ @State orderTotalCount: number = 0
|
|
|
+ private orderTotalPages: number = 0
|
|
|
+
|
|
|
async aboutToAppear() {
|
|
|
// 查询订单数据
|
|
|
- this.orderArray = await JGRequest.get("/api/v1/plan/workOrder/taskPage", {
|
|
|
-
|
|
|
- }) as OrderInfo[]
|
|
|
+ let res = await this.queryOrderList()
|
|
|
+ this.orderTotalCount = res.totalCount
|
|
|
+ this.orderTotalPages = res.totalPages
|
|
|
+ this.orderArray = res.records
|
|
|
|
|
|
+ // 设置默认值
|
|
|
if (this.orderArray && this.orderArray.length > 0) {
|
|
|
- this.selectOrderId = this.orderArray[0].id
|
|
|
+ this.selectOrder = 0
|
|
|
+ this.planNum = this.orderArray[0].planNum ? (this.orderArray[0].planNum | 0) : 0
|
|
|
+ this.completeNum = this.orderArray[0].completeNum ? (this.orderArray[0].completeNum | 0) : 0
|
|
|
+ this.bugNum = this.orderArray[0].bugNum ? (this.orderArray[0].bugNum | 0) : 0
|
|
|
+ this.processes = this.orderArray[0].ops
|
|
|
+ if (this.processes && this.processes.length > 0) {
|
|
|
+ this.selectProcess = this.processes[0].operationSort
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private async queryOrderList() {
|
|
|
+ return await JGRequest.post("/api/v1/plan/workOrder/taskPage", {
|
|
|
+ "pageNo": this.orderPageNo,
|
|
|
+ "pageSize": this.orderPageSize
|
|
|
+ }) as PageModel<OrderInfo>;
|
|
|
+ }
|
|
|
+
|
|
|
build() {
|
|
|
Column() {
|
|
|
TitleStateComp()
|
|
|
@@ -45,15 +72,15 @@ struct ProcessHome {
|
|
|
.height('9%')
|
|
|
.justifyContent(FlexAlign.Start)
|
|
|
List({space: '2%'}) {
|
|
|
- ForEach(this.orderArray, (item: OrderInfo)=>{
|
|
|
+ ForEach(this.orderArray, (item: OrderInfo, index: number)=>{
|
|
|
ListItem() {
|
|
|
Column() {
|
|
|
Row() {
|
|
|
Text(item.orderName)
|
|
|
.fontSize($r('app.float.process_card_middle_font_size'))
|
|
|
.fontWeight(FontWeight.Medium)
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
- .opacity(this.selectOrderId === item.id ? $r('app.float.card_font_select_opacity') : 1)
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .opacity(this.selectOrder === index ? $r('app.float.card_font_select_opacity') : 1)
|
|
|
}
|
|
|
.width('90%')
|
|
|
.height('15%')
|
|
|
@@ -63,11 +90,11 @@ struct ProcessHome {
|
|
|
Row() {
|
|
|
Text('产品型号 ')
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
- Text(item.productModel)
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ Text(item.materialModel)
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
}
|
|
|
.width('90%')
|
|
|
.height('12.5%')
|
|
|
@@ -76,11 +103,11 @@ struct ProcessHome {
|
|
|
Row() {
|
|
|
Text('计划编号 ')
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
- Text(item.productModel)
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ Text(item.workOrderCode)
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
}
|
|
|
.width('90%')
|
|
|
.height('12.5%')
|
|
|
@@ -89,11 +116,11 @@ struct ProcessHome {
|
|
|
Row() {
|
|
|
Text('订单编号 ')
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
Text(item.orderCode)
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
}
|
|
|
.width('90%')
|
|
|
.height('12.5%')
|
|
|
@@ -103,46 +130,47 @@ struct ProcessHome {
|
|
|
Row() {}
|
|
|
.width('5%')
|
|
|
Column() {
|
|
|
- Text(item.orderNum.toString())
|
|
|
+ Text(item.planNum ? (item.planNum | 0).toString() : '')
|
|
|
.fontSize($r('app.float.process_card_large_font_size'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
.padding({ bottom: '2%' })
|
|
|
- Text('订单数量')
|
|
|
+ Text('产品数量')
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
}
|
|
|
Row(){}
|
|
|
.width('8%')
|
|
|
Divider()
|
|
|
.vertical(true)
|
|
|
- .color(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .color(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
.strokeWidth('1px')
|
|
|
- .opacity(this.selectOrderId === item.id ? 0.2 : 1)
|
|
|
+ .opacity(this.selectOrder === index ? 0.2 : 1)
|
|
|
.height('60%')
|
|
|
Row(){}
|
|
|
.width('8%')
|
|
|
|
|
|
Column() {
|
|
|
- Text(item.kittingNum.toString())
|
|
|
+ // todo 修改为主料
|
|
|
+ Text(item.planNum ? (item.planNum | 0).toString() : '0')
|
|
|
.fontSize($r('app.float.process_card_large_font_size'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
.padding({ bottom: '2%' })
|
|
|
Text('主料齐套')
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
- .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
}
|
|
|
Blank()
|
|
|
|
|
|
Row() {
|
|
|
- Text(item.orderState === 1 ? '未开始' : (item.orderState === 2 ? '生产中' : '已完成'))
|
|
|
+ Text((item.workOrderState <= 3 || item.workOrderState === 5) ? '未开始' : (item.workOrderState === 4 ? '生产中' : '已完成'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
.textAlign(TextAlign.Center)
|
|
|
.fontSize($r('app.float.process_card_small_font_size'))
|
|
|
.fontColor($r('app.color.general_font_white_color'))
|
|
|
.borderRadius({topLeft: $r('app.float.general_border_radius'), bottomRight: $r('app.float.general_border_radius')})
|
|
|
- .backgroundColor(item.orderState === 1 ? $r('app.color.order_wait_state_background') : (item.orderState === 2 ? $r('app.color.order_producing_state_background') : $r('app.color.order_finished_state_background')))
|
|
|
+ .backgroundColor((item.workOrderState <= 3 || item.workOrderState === 5) ? $r('app.color.order_wait_state_background') : (item.workOrderState === 4 ? $r('app.color.order_producing_state_background') : $r('app.color.order_finished_state_background')))
|
|
|
.width($r('app.float.order_state_width'))
|
|
|
.height($r('app.float.order_state_height'))
|
|
|
}
|
|
|
@@ -158,17 +186,29 @@ struct ProcessHome {
|
|
|
.justifyContent(FlexAlign.Center)
|
|
|
// .alignItems(HorizontalAlign.Center)
|
|
|
.onClick(() => {
|
|
|
- this.selectOrderId = item.id
|
|
|
+ this.selectOrder = index
|
|
|
+ this.planNum = this.orderArray[index].planNum ? (this.orderArray[index].planNum | 0) : 0
|
|
|
+ this.completeNum = this.orderArray[index].completeNum ? (this.orderArray[index].completeNum | 0) : 0
|
|
|
+ this.bugNum = this.orderArray[index].bugNum ? (this.orderArray[index].bugNum | 0) : 0
|
|
|
// todo 查询当前工序
|
|
|
})
|
|
|
.width('90%')
|
|
|
.height('26.5%')
|
|
|
.borderRadius($r('app.float.general_border_radius'))
|
|
|
- .backgroundColor(this.selectOrderId === item.id ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
|
|
|
+ .backgroundColor(this.selectOrder === index ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
.alignListItem(ListItemAlign.Center)
|
|
|
+ // 未完成订单大于10条，触底再去查询
|
|
|
+ .onReachEnd(() => {
|
|
|
+ if (this.orderPageNo >= this.orderTotalPages) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.orderPageNo++
|
|
|
+ let res = this.queryOrderList() as PageModel<OrderInfo>
|
|
|
+ this.orderArray = this.orderArray.concat(res.records)
|
|
|
+ })
|
|
|
}
|
|
|
.width('26%')
|
|
|
.height('100%')
|
|
|
@@ -188,12 +228,12 @@ struct ProcessHome {
|
|
|
Column() {
|
|
|
Row({ space: 4 }) {
|
|
|
Stack() {
|
|
|
- Image(this.selectProcess === item.sortNum ? $r('app.media.step_blue') : $r('app.media.step_white'))
|
|
|
+ Image(this.selectProcess === item.operationSort ? $r('app.media.step_blue') : $r('app.media.step_white'))
|
|
|
.objectFit(ImageFit.Contain)
|
|
|
Row() {
|
|
|
- Text(JSON.stringify(item.sortNum))
|
|
|
+ Text(JSON.stringify(item.operationSort))
|
|
|
.fontSize($r('app.float.process_card_middle_font_size'))
|
|
|
- .fontColor(this.selectProcess === item.sortNum ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectProcess === item.operationSort ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
}
|
|
|
.width('100%')
|
|
|
@@ -204,25 +244,26 @@ struct ProcessHome {
|
|
|
}
|
|
|
.width('25%')
|
|
|
.height('100%')
|
|
|
+ .alignContent(Alignment.Start)
|
|
|
|
|
|
- Text(item.processName)
|
|
|
+ Text(item.operationName)
|
|
|
.fontSize($r('app.float.process_card_middle_font_size'))
|
|
|
- .fontColor(this.selectProcess === item.sortNum ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectProcess === item.operationSort ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
Blank()
|
|
|
- Text(item.completedQuantity.toString())
|
|
|
+ Text(item.completeNum.toString())
|
|
|
.fontSize($r('app.float.process_card_middle_font_size'))
|
|
|
- .fontColor(this.selectProcess === item.sortNum ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
+ .fontColor(this.selectProcess === item.operationSort ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
|
|
|
.fontWeight(FontWeight.Bold)
|
|
|
}
|
|
|
.width('100%')
|
|
|
.height('91%')
|
|
|
.justifyContent(FlexAlign.Start)
|
|
|
- .backgroundColor(this.selectProcess === item.sortNum ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
|
|
|
+ .backgroundColor(this.selectProcess === item.operationSort ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
|
|
|
.borderRadius('187px')
|
|
|
.padding({ right: '5%' })
|
|
|
.onClick(() => {
|
|
|
- this.selectProcess = item.sortNum
|
|
|
+ this.selectProcess = item.operationSort
|
|
|
})
|
|
|
|
|
|
if (index < this.processes.length - 1) {
|
|
|
@@ -274,7 +315,11 @@ struct ProcessHome {
|
|
|
.width('85%')
|
|
|
.height('22%')
|
|
|
Row() {
|
|
|
- OrderStatisticsComp()
|
|
|
+ OrderStatisticsComp({
|
|
|
+ planNum: $planNum,
|
|
|
+ completeNum: $completeNum,
|
|
|
+ bugNum: $bugNum,
|
|
|
+ })
|
|
|
}
|
|
|
.width('90%')
|
|
|
.justifyContent(FlexAlign.End)
|
|
|
@@ -359,31 +404,26 @@ struct ProcessHome {
|
|
|
}
|
|
|
.width('8%')
|
|
|
.justifyContent(FlexAlign.End)
|
|
|
+ .onClick(()=>{
|
|
|
+ router.pushUrl({
|
|
|
+ url: 'pages/process/ProcessStepPage',
|
|
|
+ params: {
|
|
|
+ mainMaterial: this.mainMaterial,
|
|
|
+ processInfo: this.processes[this.selectProcess],
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
|
|
|
- TextInput({ placeholder: '请扫描物料编码' })
|
|
|
- .placeholderColor($r('app.color.text_input_placeholder_font_color'))
|
|
|
- .placeholderFont({size: $r('app.float.robot_set_font_size'), weight: FontWeight.Medium})
|
|
|
- .fontSize($r('app.float.robot_set_font_size'))
|
|
|
+ Text(this.mainMaterial)
|
|
|
+ .fontSize($r('app.float.process_card_middle_font_size'))
|
|
|
.fontWeight(FontWeight.Medium)
|
|
|
.fontColor($r('app.color.general_font_color'))
|
|
|
+ .opacity($r('app.float.general_font_opacity'))
|
|
|
.textAlign(TextAlign.Start)
|
|
|
.height('100%')
|
|
|
.layoutWeight(1)
|
|
|
- .maxLength(100)
|
|
|
.borderRadius($r('app.float.robot_set_radius'))
|
|
|
.backgroundColor($r('app.color.general_font_white_color'))
|
|
|
- .onChange((value: string) => {
|
|
|
- this.mainMaterial = value
|
|
|
- })
|
|
|
- .onSubmit(() => {
|
|
|
- router.pushUrl({
|
|
|
- url: 'pages/process/ProcessStepPage',
|
|
|
- params: {
|
|
|
- mainMaterial: this.mainMaterial,
|
|
|
- processInfo: this.processes[this.selectProcess],
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
}
|
|
|
.borderRadius($r('app.float.robot_set_radius'))
|
|
|
.backgroundColor($r('app.color.general_font_white_color'))
|
|
|
@@ -452,4 +492,4 @@ struct OperateCard {
|
|
|
.justifyContent(FlexAlign.Center)
|
|
|
.justifyContent(FlexAlign.Center)
|
|
|
}
|
|
|
-}
|
|
|
+}
|
