diff --git a/api/les/lesMaterialBind.js b/api/les/lesMaterialBind.js
new file mode 100644
index 0000000..8b4facc
--- /dev/null
+++ b/api/les/lesMaterialBind.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+/**
+ * 备料绑定
+ * @param {Object} data
+ * @return
+ */
+export function bind(data) {
+ return request({
+ url: '/les/location/bind',
+ method: 'put',
+ data: data,
+ })
+}
+
+/**
+ * 备料解绑
+ * @param {code}
+ * @return
+ */
+export function unBind(code) {
+ return request({
+ url: '/les/location/unbind/' + code,
+ method: 'put',
+ })
+}
\ No newline at end of file
diff --git a/api/les/lesMaterialCall.js b/api/les/lesMaterialCall.js
new file mode 100644
index 0000000..54786d4
--- /dev/null
+++ b/api/les/lesMaterialCall.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+/**
+ * 新增任务
+ * @param {Object} data
+ * @return
+ */
+export function addDeliveryTask(data) {
+ return request({
+ url: '/les/deliveryTask',
+ method: 'post',
+ data: data,
+ })
+}
+
+/**
+ *
+ * @param {code}
+ * @return
+ */
+export function findPreparation(code) {
+ return request({
+ url: '/les/location/findPreparation/' + code,
+ method: 'get',
+ })
+}
\ No newline at end of file
diff --git a/api/les/lesMaterialDelivery.js b/api/les/lesMaterialDelivery.js
new file mode 100644
index 0000000..25e338a
--- /dev/null
+++ b/api/les/lesMaterialDelivery.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function listData() {
+ return request({
+ url: '/les/deliveryTask/list',
+ method: 'get'
+ })
+}
+
+export function delivery(data) {
+ return request({
+ url: '/les/deliveryTask/handleDelivery',
+ method: 'post',
+ data: data
+ })
+}
+
+export function cancel(data) {
+ return request({
+ url: '/les/deliveryTask/handleCancel',
+ method: 'post',
+ data: data
+ })
+}
\ No newline at end of file
diff --git a/api/les/lesPalletReturn.js b/api/les/lesPalletReturn.js
new file mode 100644
index 0000000..384acc4
--- /dev/null
+++ b/api/les/lesPalletReturn.js
@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+/**
+ * 新增任务
+ * @param {Object} data
+ * @return
+ */
+export function addDeliveryTask(data) {
+ return request({
+ url: '/les/deliveryTask',
+ method: 'post',
+ data: data,
+ })
+}
+
+export function getLastPalletRecyclingDest() {
+ return request({
+ url: '/les/deliveryTask/lastPalletRecyclingDest',
+ method: 'get',
+ })
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index e994580..d85f6b8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,159 +1,159 @@
{
- "name" : "MES",
- "appid" : "__UNI__66F7FE2",
- "description" : "",
- "versionName" : "3.4.1",
- "versionCode" : 341,
- "transformPx" : false,
- "sassImplementationName" : "node-sass",
- "app-plus" : {
- "usingComponents" : true,
- "nvueCompiler" : "uni-app",
- "splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
- "autoclose" : true,
- "delay" : 0
- },
- // 禁用 HTML5+ RunTime 提示
- "compatible" : {
- "ignoreVersion" : true
- },
- "modules" : {
- "Camera" : {},
- "Barcode" : {}
- },
- "distribute" : {
- "android" : {
- "permissions" : [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ],
- "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
- },
- "ios" : {
- "dSYMs" : false
- },
- "sdkConfigs" : {
- "ad" : {}
- },
- "icons" : {
- "android" : {
- "hdpi" : "unpackage/res/icons/72x72.png",
- "xhdpi" : "unpackage/res/icons/96x96.png",
- "xxhdpi" : "unpackage/res/icons/144x144.png",
- "xxxhdpi" : "unpackage/res/icons/192x192.png"
- },
- "ios" : {
- "appstore" : "unpackage/res/icons/1024x1024.png",
- "ipad" : {
- "app" : "unpackage/res/icons/76x76.png",
- "app@2x" : "unpackage/res/icons/152x152.png",
- "notification" : "unpackage/res/icons/20x20.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "proapp@2x" : "unpackage/res/icons/167x167.png",
- "settings" : "unpackage/res/icons/29x29.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "spotlight" : "unpackage/res/icons/40x40.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png"
- },
- "iphone" : {
- "app@2x" : "unpackage/res/icons/120x120.png",
- "app@3x" : "unpackage/res/icons/180x180.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "notification@3x" : "unpackage/res/icons/60x60.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "settings@3x" : "unpackage/res/icons/87x87.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png",
- "spotlight@3x" : "unpackage/res/icons/120x120.png"
- }
- }
- },
- "splashscreen" : {
- "useOriginalMsgbox" : false
- }
- },
- "nativePlugins" : {
- "Fvv-UniSerialPort" : {
- "__plugin_info__" : {
- "name" : "安卓串口通信 Fvv-UniSerialPort",
- "description" : "Android平台串口通信插件,支持串口号、波特率、数据位、校验位、停止位、流控等参数设置",
- "platforms" : "Android",
- "url" : "https://ext.dcloud.net.cn/plugin?id=1787",
- "android_package_name" : "uni.UNI66F7FE2",
- "ios_bundle_id" : "uni.UNI66F7FE2",
- "isCloud" : true,
- "bought" : 1,
- "pid" : "1787",
- "parameters" : {}
- }
- }
- },
- "orientation" : [
- //竖屏正方向
- "portrait-primary",
- //竖屏反方向
- "portrait-secondary",
- //横屏正方向
- "landscape-primary",
- //横屏反方向
- "landscape-secondary",
- //自然方向
- "default"
- ]
- },
- "quickapp" : {},
- "mp-weixin" : {
- "appid" : "wx366e867b9fb64fdf",
- "setting" : {
- "urlCheck" : true,
- "es6" : false,
- "minified" : true,
- "postcss" : true
- },
- "optimization" : {
- "subPackages" : true
- },
- "usingComponents" : true
- },
- "vueVersion" : "2",
- "h5" : {
- "template" : "static/index.html",
- "devServer" : {
- "port" : 9090,
- "https" : false
- },
- "title" : "RuoYi-App",
- "router" : {
- "mode" : "hash",
- "base" : "./"
- }
- },
- "permissions" : {
- "network" : {
- "description" : "用于获取网络状态和IP地址"
- }
- }
-}
+ "name": "MES",
+ "appid": "__UNI__66F7FE2",
+ "description": "",
+ "versionName": "3.4.2",
+ "versionCode": 342,
+ "transformPx": false,
+ "sassImplementationName": "node-sass",
+ "app-plus": {
+ "usingComponents": true,
+ "nvueCompiler": "uni-app",
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
+ },
+ // 禁用 HTML5+ RunTime 提示
+ "compatible": {
+ "ignoreVersion": true
+ },
+ "modules": {
+ "Camera": {},
+ "Barcode": {}
+ },
+ "distribute": {
+ "android": {
+ "permissions": [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
+ },
+ "ios": {
+ "dSYMs": false
+ },
+ "sdkConfigs": {
+ "ad": {}
+ },
+ "icons": {
+ "android": {
+ "hdpi": "unpackage/res/icons/72x72.png",
+ "xhdpi": "unpackage/res/icons/96x96.png",
+ "xxhdpi": "unpackage/res/icons/144x144.png",
+ "xxxhdpi": "unpackage/res/icons/192x192.png"
+ },
+ "ios": {
+ "appstore": "unpackage/res/icons/1024x1024.png",
+ "ipad": {
+ "app": "unpackage/res/icons/76x76.png",
+ "app@2x": "unpackage/res/icons/152x152.png",
+ "notification": "unpackage/res/icons/20x20.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "proapp@2x": "unpackage/res/icons/167x167.png",
+ "settings": "unpackage/res/icons/29x29.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "spotlight": "unpackage/res/icons/40x40.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png"
+ },
+ "iphone": {
+ "app@2x": "unpackage/res/icons/120x120.png",
+ "app@3x": "unpackage/res/icons/180x180.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "notification@3x": "unpackage/res/icons/60x60.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "settings@3x": "unpackage/res/icons/87x87.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png",
+ "spotlight@3x": "unpackage/res/icons/120x120.png"
+ }
+ }
+ },
+ "splashscreen": {
+ "useOriginalMsgbox": false
+ }
+ },
+ "nativePlugins": {
+ "Fvv-UniSerialPort": {
+ "__plugin_info__": {
+ "name": "安卓串口通信 Fvv-UniSerialPort",
+ "description": "Android平台串口通信插件,支持串口号、波特率、数据位、校验位、停止位、流控等参数设置",
+ "platforms": "Android",
+ "url": "https://ext.dcloud.net.cn/plugin?id=1787",
+ "android_package_name": "uni.UNI66F7FE2",
+ "ios_bundle_id": "uni.UNI66F7FE2",
+ "isCloud": true,
+ "bought": 1,
+ "pid": "1787",
+ "parameters": {}
+ }
+ }
+ },
+ "orientation": [
+ //竖屏正方向
+ "portrait-primary",
+ //竖屏反方向
+ "portrait-secondary",
+ //横屏正方向
+ "landscape-primary",
+ //横屏反方向
+ "landscape-secondary",
+ //自然方向
+ "default"
+ ]
+ },
+ "quickapp": {},
+ "mp-weixin": {
+ "appid": "wx366e867b9fb64fdf",
+ "setting": {
+ "urlCheck": true,
+ "es6": false,
+ "minified": true,
+ "postcss": true
+ },
+ "optimization": {
+ "subPackages": true
+ },
+ "usingComponents": true
+ },
+ "vueVersion": "2",
+ "h5": {
+ "template": "static/index.html",
+ "devServer": {
+ "port": 9090,
+ "https": false
+ },
+ "title": "RuoYi-App",
+ "router": {
+ "mode": "hash",
+ "base": "./"
+ }
+ },
+ "permissions": {
+ "network": {
+ "description": "用于获取网络状态和IP地址"
+ }
+ }
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 02bb26e..e6ae10a 100644
--- a/pages.json
+++ b/pages.json
@@ -109,10 +109,9 @@
"navigationBarTitleText": "浏览文本"
}
}, {
- "path" : "pages/mes/jobReport/start",
- "style" :
- {
- "navigationBarTitleText" : "工序开工"
+ "path": "pages/mes/jobReport/start",
+ "style": {
+ "navigationBarTitleText": "工序开工"
}
}, {
"path": "pages/mes/jobReport/pass",
@@ -834,6 +833,36 @@
"style": {
"navigationBarTitleText": "采购直接入库"
}
+ },
+ {
+ "path": "pages/les/returnPallet",
+ "style": {
+ "navigationBarTitleText": "托盘返空"
+ }
+ },
+ {
+ "path": "pages/les/bindMaterial",
+ "style": {
+ "navigationBarTitleText": "备料绑定"
+ }
+ },
+ {
+ "path": "pages/les/callMaterial",
+ "style": {
+ "navigationBarTitleText": "生产呼料"
+ }
+ },
+ {
+ "path": "pages/les/chooseTask",
+ "style": {
+ "navigationBarTitleText": "选择任务"
+ }
+ },
+ {
+ "path": "pages/les/deliveryMaterial",
+ "style": {
+ "navigationBarTitleText": "生产配送"
+ }
}
],
"tabBar": {
diff --git a/pages/les/bindMaterial.vue b/pages/les/bindMaterial.vue
new file mode 100644
index 0000000..975aba4
--- /dev/null
+++ b/pages/les/bindMaterial.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 绑定
+
+
+ 解绑
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/les/callMaterial.vue b/pages/les/callMaterial.vue
new file mode 100644
index 0000000..5887a92
--- /dev/null
+++ b/pages/les/callMaterial.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 呼叫
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/les/chooseTask.vue b/pages/les/chooseTask.vue
new file mode 100644
index 0000000..8c9583f
--- /dev/null
+++ b/pages/les/chooseTask.vue
@@ -0,0 +1,49 @@
+
+
+
+
+ 任务类型 : {{item.taskType}}
+
+
+
+
+
+
+
+ 发货点位 : {{item.srcLocationCode}}
+ 目的点位 : {{item.destLocationCode}}
+ 物料编码 : {{item.material.materialCode}}
+ 物料名称 : {{item.material.materialName}}
+ 呼叫时间 : {{item.callDatetime}}
+ 状态 : {{item.taskStatus}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/les/deliveryMaterial.vue b/pages/les/deliveryMaterial.vue
new file mode 100644
index 0000000..a1fe6e0
--- /dev/null
+++ b/pages/les/deliveryMaterial.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 配送
+
+
+ 取消
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/les/returnPallet.vue b/pages/les/returnPallet.vue
new file mode 100644
index 0000000..0423c0b
--- /dev/null
+++ b/pages/les/returnPallet.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 呼叫
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/indexList.json b/pages/work/indexList.json
index afcb59d..7add1c0 100644
--- a/pages/work/indexList.json
+++ b/pages/work/indexList.json
@@ -937,7 +937,7 @@
"navigationBarTitleText": "炉长记录"
}
}, {
- "path": "/pages/bom/inspectionRecords",
+ "path": "/pages/les/inspectionRecords",
"permission": "mes:pwo:query",
"icon": "icon-jianyanjilu",
"color": "linear-gradient(#FEBD5F, #FEAD37)",
@@ -945,7 +945,7 @@
"navigationBarTitleText": "检验记录"
}
}, {
- "path": "/pages/bom/cleaningRecords",
+ "path": "/pages/les/cleaningRecords",
"permission": "mes:pwo:query",
"icon": "icon-a-ziyuan13500",
"color": "linear-gradient(#FEBD5F, #FEAD37)",
@@ -953,7 +953,7 @@
"navigationBarTitleText": "清炉记录"
}
}, {
- "path": "/pages/bom/recordQuerys",
+ "path": "/pages/les/recordQuerys",
"permission": "mes:pwo:query",
"icon": "icon-yonghujiluchaxun",
"color": "linear-gradient(#FEBD5F, #FEAD37)",
@@ -961,5 +961,41 @@
"navigationBarTitleText": "记录查询"
}
}]
+ },
+ {
+ "name": "Les",
+ "data": [{
+ "path": "/pages/les/returnPallet",
+ "permission": "les:deliveryTask:list",
+ "icon": "icon-luchangfenxibaogao",
+ "color": "linear-gradient(#FEBD5F, #FEAD37)",
+ "style": {
+ "navigationBarTitleText": "托盘返空"
+ }
+ }, {
+ "path": "/pages/les/bindMaterial",
+ "permission": "les:basic:location:list",
+ "icon": "icon-jianyanjilu",
+ "color": "linear-gradient(#FEBD5F, #FEAD37)",
+ "style": {
+ "navigationBarTitleText": "备料绑定"
+ }
+ }, {
+ "path": "/pages/les/callMaterial",
+ "permission": "les:deliveryTask:list",
+ "icon": "icon-a-ziyuan13500",
+ "color": "linear-gradient(#FEBD5F, #FEAD37)",
+ "style": {
+ "navigationBarTitleText": "生产呼料"
+ }
+ }, {
+ "path": "/pages/les/chooseTask",
+ "permission": "les:deliveryRecord:list",
+ "icon": "icon-yonghujiluchaxun",
+ "color": "linear-gradient(#FEBD5F, #FEAD37)",
+ "style": {
+ "navigationBarTitleText": "生产配送"
+ }
+ }]
}
]
\ No newline at end of file
diff --git a/utils/enums/LesDeliveryTaskType.js b/utils/enums/LesDeliveryTaskType.js
new file mode 100644
index 0000000..74cc71d
--- /dev/null
+++ b/utils/enums/LesDeliveryTaskType.js
@@ -0,0 +1,6 @@
+const LesDeliveryTaskType = {
+ PRODUCTION: 1,
+ PALLET_RECYCLING: 2,
+}
+
+export default LesDeliveryTaskType
\ No newline at end of file
diff --git a/utils/enums/RobotType.js b/utils/enums/RobotType.js
new file mode 100644
index 0000000..b8087f9
--- /dev/null
+++ b/utils/enums/RobotType.js
@@ -0,0 +1,7 @@
+const RobotType = {
+
+ LATENT_MOBILE_ROBOT: 1,
+ LATENT_FORKLIFT_AGV: 2,
+}
+
+export default RobotType
\ No newline at end of file