diff --git a/src/api/board.js b/src/api/board.js index e44a3ec..5a24d26 100644 --- a/src/api/board.js +++ b/src/api/board.js @@ -8,3 +8,4 @@ export const productionBlankingBoard = data => createAPI(`board/productionBlanki export const soLiuhuaBoard= data => createAPI(`board/soLiuhuaBoard`,'post',data) export const transFerBoard= data => createAPI(`board/transFerBoard`,'post',data) +export const SORoutingBoard= data => createAPI(`board/SORoutingBoard`,'post',data) diff --git a/src/router/index.js b/src/router/index.js index 5da74c6..236fbd7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -26,6 +26,7 @@ const globalRoutes = [ { path: '/transFerBoard', component: _import('modules/board/transFerBoard'), name: 'transFerBoard', meta: { title: '待入库看板' } }, { path: '/productionBlankingBoard', component: _import('modules/board/productionBlankingBoard'), name: 'productionBlankingBoard', meta: { title: '生产打料看板' } }, { path: '/soLiuhuaBoard', component: _import('modules/board/soLiuhuaBoard'), name: 'soLiuhuaBoard', meta: { title: '硫化看板' } }, + { path: '/SORoutingBoard', component: _import('modules/board/SORoutingBoard'), name: 'SORoutingBoard', meta: { title: '待生产工序看板' } }, { path: '/padPart', component: _import('modules/pad/padPart1'), name: 'padPart1', meta: { title: '产品搜索' } }, { path: '/padPartAttribute', component: _import('modules/pad/padPartAttribute'), name: 'padPartAttribute', meta: { title: '产品属性' } }, { path: '/padPartPhoto', component: _import('modules/pad/padPartPhoto'), name: 'padPartPhoto', meta: { title: '产品图片' } } diff --git a/src/views/modules/board/SORoutingBoard.vue b/src/views/modules/board/SORoutingBoard.vue new file mode 100644 index 0000000..c31d136 --- /dev/null +++ b/src/views/modules/board/SORoutingBoard.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index 58e59e3..6d3eaa5 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -2,16 +2,65 @@
- + 加工中心编码 - + 产品编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + label="产品编码"> + label="产品名称"> QtyReported', + startDate:'', + endDate:'', + operatorName:'', + sResourceID:'', + sShiftNo:'', }, photoUrl:'', sopData:{ diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue index 14e5c4d..457ba8e 100644 --- a/src/views/modules/production/scheduleForSOTask.vue +++ b/src/views/modules/production/scheduleForSOTask.vue @@ -48,8 +48,8 @@ - - + + @@ -177,7 +177,7 @@ header-align="center" align="right" width="80" - label="已入库数量"> + label="合格数量"> ROUND(ISNULL(SL.scheduledQty,0),3)', + planStatus: 'a.OrderQty>isnull(SL.scheduledQty,0)', itemNo:'', }, schedulingModalData: { diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue index 4d10b24..e69a406 100644 --- a/src/views/modules/production/scheduleForShopOrder.vue +++ b/src/views/modules/production/scheduleForShopOrder.vue @@ -214,7 +214,7 @@ header-align="center" align="right" width="80" - label="已入库数量"> + label="合格数量"> +
+ + + + + + 加工中心编码 + + + + 产品编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + {{'导出'}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +