diff --git a/pages.json b/pages.json
index 4cb5b58..2ffbe9e 100644
--- a/pages.json
+++ b/pages.json
@@ -104,6 +104,13 @@
{
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "pages/manage/mater-update",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
}
],
"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index de87aa0..25fa48e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -42,7 +42,8 @@
{title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'},
{title: '呼叫物料', icon: 'RF09', path: '/pages/manage/call-mater'},
{title: '补空框', icon: 'RF10', path: '/pages/manage/fill-empty'},
- {title: '合托', icon: 'RF11', path: '/pages/manage/merge-pallet'}
+ {title: '合托', icon: 'RF11', path: '/pages/manage/merge-pallet'},
+ {title: '物料扣减', icon: 'RF12', path: '/pages/manage/mater-update'}
],
show: false,
secM: []
diff --git a/pages/manage/area-lock.vue b/pages/manage/area-lock.vue
index 845b969..97df096 100644
--- a/pages/manage/area-lock.vue
+++ b/pages/manage/area-lock.vue
@@ -3,7 +3,7 @@
-
+
区域
diff --git a/pages/manage/call-mater.vue b/pages/manage/call-mater.vue
index 4799835..7bf057d 100644
--- a/pages/manage/call-mater.vue
+++ b/pages/manage/call-mater.vue
@@ -13,7 +13,7 @@
/>
-
+
工序
diff --git a/pages/manage/empty-tray-back.vue b/pages/manage/empty-tray-back.vue
index 1ba14fb..d677bb2 100644
--- a/pages/manage/empty-tray-back.vue
+++ b/pages/manage/empty-tray-back.vue
@@ -21,7 +21,7 @@
-
+
目的地
diff --git a/pages/manage/fill-tray.vue b/pages/manage/fill-tray.vue
index 159d8dd..454073b 100644
--- a/pages/manage/fill-tray.vue
+++ b/pages/manage/fill-tray.vue
@@ -13,7 +13,7 @@
/>
-
+
载具类型
diff --git a/pages/manage/mater-update.vue b/pages/manage/mater-update.vue
new file mode 100644
index 0000000..e1b426f
--- /dev/null
+++ b/pages/manage/mater-update.vue
@@ -0,0 +1,234 @@
+
+
+
+
+
+
+
+ 托盘
+
+
+
+
+
+
+
+ 托盘编码:{{initData.vehicle_code}}
+
+
+
+ | 800号 |
+ 物料编码 |
+ 数量 |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/manage/route-lock.vue b/pages/manage/route-lock.vue
index d157405..067e7d4 100644
--- a/pages/manage/route-lock.vue
+++ b/pages/manage/route-lock.vue
@@ -3,7 +3,7 @@
-
+
类型
diff --git a/static/image/menu/RF12.png b/static/image/menu/RF12.png
new file mode 100644
index 0000000..9f03826
Binary files /dev/null and b/static/image/menu/RF12.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 663cc14..5e4c13e 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -123,3 +123,15 @@ export const selectMaterial = (code) => request({
url:'api/handheld/selectMaterial',
data: {pointCode: code}
})
+
+// 查询托盘物料信息
+export const getGroupByVehicleCode = (code) => request({
+ url:'api/handheld/getGroupByVehicleCode',
+ data: {vehicle_code: code}
+})
+
+// 托盘物料信息修改
+export const materialUpdate = (code, arr) => request({
+ url:'api/handheld/materialUpdate',
+ data: {vehicle_code: code, materials: arr}
+})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index a064f00..609f6a0 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -190,4 +190,44 @@ export const generateStoreInTask = () => {
"point_code": "SD01"
}
return res
-}
\ No newline at end of file
+}
+export const getGroupByVehicleCode = () => {
+ let res = {
+ "vehicle_type_name": "钢托盘",
+ "materials": [
+ {
+ "order_code": "800036430823",
+ "group_id": "57412",
+ "material_qty": 1,
+ "material_code": "A7E0019000590_01"
+ },
+ {
+ "order_code": "800036430823",
+ "group_id": "57415",
+ "material_qty": 1,
+ "material_code": "A7E0019000590_01"
+ },
+ {
+ "order_code": "OR786807",
+ "group_id": "57478",
+ "material_qty": 20,
+ "material_code": "A7E44207473003_0A"
+ },
+ {
+ "order_code": "800036431198",
+ "group_id": "57479",
+ "material_qty": 20,
+ "material_code": "A7E0019008850_00"
+ }
+ ],
+ "vehicle_type": "G01",
+ "vehicle_code": "P01A00000014"
+ }
+ return res
+}
+export const materialUpdate = () => {
+ let res = {
+ message: 'ok'
+ }
+ return res
+}