Browse Source

修改库内扫描库位

test
qb 1 year ago
parent
commit
c032209fb9
  1. 2
      api/user.js
  2. 4
      config/host.js
  3. 317
      pages/index/index.vue
  4. 2
      pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
  5. 32
      pagesHome/pages/ScanUp/ScanUp.vue
  6. 227
      unpackage/dist/dev/app-plus/app-service.js
  7. 14
      utils/utils.js

2
api/user.js

@ -52,7 +52,7 @@ export function distributionStockupscanningCode(data, loadingObj = {}) {
export function postFindAllAllocationId(loadingObj = {}) {
return request({
url: `logpm-warehouse-zhy/api/warehouseUpdownType/findAllAllocationId`,
url: `logpm-warehouse/api/warehouseUpdownType/findAllAllocationId`,
method: "post",
data: {}
},

4
config/host.js

@ -4,13 +4,13 @@
* 测试域名
* */
//测试域名
// const devhost = 'http://test.api.huitongys.com/'
const devhost = 'http://test.api.huitongys.com/'
// lmy
// const devhost = 'http://192.168.10.123:8889/'
// zhy
// const devhost = 'http://192.168.10.48:13000/'
// tjj
const devhost = 'http://192.168.10.25:13000/'
// const devhost = 'http://192.168.10.25:13000/'
// cyz
// const devhost = 'http://192.168.6.122:8777/'
// const devhost = 'http://192.168.6.141:8777/'

317
pages/index/index.vue

@ -39,166 +39,163 @@
const { HANDLE_GETSTORAGEINFO } = storageStore
const { storageArr } = storeToRefs(storageStore)
//
HANDLE_GETSTORAGEINFO()
const tip = ref(null)
// let details = reactive<listtype>({ tablist: [] });
let details = reactive<listtype>({
tablist: [
{
type: 1,
name: '工作台',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '订单查询',
router: '/pagesHome/pages/orderInquiry/orderInquiry',
},
]
},
{
type: 1,
name: '入库',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '码板打托',
router: '/pagesHome/pages/codePlateBracket/codePlateBracket',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '入库扫描',
router: '/pagesHome/pages/orderInquiry/orderInquiry',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '到车入库',
router: '/pagesHome/pages/ArrivalList/ArrivalList',
},
]
},
{
type: 1,
name: '库内',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '分拣打托',
router: '/pagesHome/pages/scansorting/scansorting',
},
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/ordersorting/ordersorting',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// },
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '扫码上架',
router: '/pagesHome/pages/ScanUpType/ScanUpType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '手动上架',
router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '移库',
router: '/pagesHome/pages/RelocationType/RelocationType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '滞留',
router: '/pagesHome/pages/Retention/Retention',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '合托',
router: '/pagesHome/pages/MergeTray/MergeTray',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '下架',
router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '空置托盘',
router: '/pagesHome/pages/RemoveTray/RemoveTray',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '复核',
router: '/pagesHome/pages/Check/Check',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '托盘数据同步',
router: '/pagesHome/pages/SearchTray/SearchTray',
},
]
},
{
type: 1,
name: '出库',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '拣货扫描',
router: '/pagesHome/pages/pickingScan/pickingScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '自提扫描',
router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '配载装车',
router: '/pagesHome/pages/StowageList/StowageList',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '中转装车',
router: '/pagesHome/pages/RelayScanList/RelayScanList',
},
]
},
{
type: 1,
name: '配送',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '装车扫描',
router: '/pagesHome/pages/LoadingScan/LoadingScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '签收扫描',
router: '/pagesHome/pages/signinScan/signinScan',
},
]
},
{
type: 1,
name: '离线上传',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '离线上传',
router: '/pagesHome/pages/OfflineUpload/OfflineUpload',
},
]
},
]
})
let details = reactive<listtype>({ tablist: [] });
// let details = reactive<listtype>({
// tablist: [
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/orderInquiry/orderInquiry',
// },
// ]
// },
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/codePlateBracket/codePlateBracket',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/orderInquiry/orderInquiry',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/ArrivalList/ArrivalList',
// },
// ]
// },
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/scansorting/scansorting',
// },
// // {
// // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// // name: '',
// // router: '/pagesHome/pages/ordersorting/ordersorting',
// // },
// // {
// // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// // name: '',
// // router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// // },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/ScanUpType/ScanUpType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/RelocationType/RelocationType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/Retention/Retention',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/MergeTray/MergeTray',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/RemoveTray/RemoveTray',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/Check/Check',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/SearchTray/SearchTray',
// },
// ]
// },
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/pickingScan/pickingScan',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/StowageList/StowageList',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/RelayScanList/RelayScanList',
// },
// ]
// },
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/LoadingScan/LoadingScan',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/signinScan/signinScan',
// },
// ]
// },
// {
// type: 1,
// name: '线',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '线',
// router: '/pagesHome/pages/OfflineUpload/OfflineUpload',
// },
// ]
// },
// ]
// })
function gopathpage(path : string) {
uni.navigateTo({
@ -367,6 +364,8 @@
init()
initbuts()
//
HANDLE_GETSTORAGEINFO()
//
uni.stopPullDownRefresh()
clearTimeout(timer)

2
pagesHome/pages/PeopleScanUp/PeopleScanUp.vue

@ -592,7 +592,7 @@
details.allocationId = res.data.allocationId
details.datalist = (res.data?.list) || []
//
details.uplistarr = []
// details.uplistarr = []
console.log('details.pageName.slice(0, details.pageName.length - 3) :>> ', details.pageName);
utils.ttsspke('请输入' + details.pageName.slice(0, details.pageName.length - 2))

32
pagesHome/pages/ScanUp/ScanUp.vue

@ -293,6 +293,10 @@
details.allocationId = res.data.allocationId
details.datalist = (res.data?.list) || []
if (details.checkstate === 2) return details.renderList = details.datalist
if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0) {
return utils.handleToast('该库位已有数据, 无法上架')
}
// if (details.upshelfScanType === '4') return utils.ttsspke('')
// utils.ttsspke('')
}
@ -307,24 +311,25 @@
/** 扫描 - 包条 - 托盘 */
const scanOther = async (_code : string) => {
try {
if (Number(details.upshelfScanType) == 4 && details.reqobj.trayCode) {
// #ifdef APP
utils.ttsspke('该库位已绑托盘')
// #endif
return
let content = ''
if (Number(details.upshelfScanType) == 4 && details.datalist.length !== 0) {
content = '该库位已有数据, 无法上架'
}
if (details.upshelfScanType === '3') {
const flag = details.uplistarr.findIndex(val => val.orderPackageCode === _code)
if (flag !== -1) {
// #ifdef APP
utils.ttsspke('包件重复扫描')
// #endif
return
content = '包件重复扫描'
}
}
if (content) {
utils.handleToast(content)
return
}
let data = {
upshelfScanType: details.upshelfScanType,
code: _code,
@ -338,11 +343,12 @@
const _orderCodeArr = [...details.orderCodeArr]
const _flag = res.data.every(val => {
if (details.orderCodeArr.includes(val.orderCode)) {
uni.showToast({
title: '订单已存在, 勿重复扫码',
icon: 'none'
})
// uni.showToast({
// title: ', ',
// icon: 'none'
// })
utils.handleToast('订单已存在, 勿重复扫码')
return false
}

227
unpackage/dist/dev/app-plus/app-service.js vendored

@ -1530,6 +1530,17 @@ if (uni.restoreGlobal) {
}
});
});
},
/**
* 提示
* @param {String} content 提示的文字
*/
handleToast(content, icon = "none") {
uni.showToast({
title: content,
icon
});
this.ttsspke(content);
}
};
let idCityCode = {
@ -1736,7 +1747,7 @@ if (uni.restoreGlobal) {
};
};
const Base64$1 = new Base64();
const devhost = "http://192.168.10.25:13000/";
const devhost = "http://test.api.huitongys.com/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";
@ -2286,7 +2297,7 @@ if (uni.restoreGlobal) {
function postFindAllAllocationId(loadingObj = {}) {
return service(
{
url: `logpm-warehouse-zhy/api/warehouseUpdownType/findAllAllocationId`,
url: `logpm-warehouse/api/warehouseUpdownType/findAllAllocationId`,
method: "post",
data: {}
},
@ -8369,163 +8380,8 @@ This will fail in production if not fixed.`);
const storageStore = useStorageStore();
const { HANDLE_GETSTORAGEINFO } = storageStore;
const { storageArr } = storeToRefs(storageStore);
HANDLE_GETSTORAGEINFO();
const tip = vue.ref(null);
let details = vue.reactive({
tablist: [
{
type: 1,
name: "工作台",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "订单查询",
router: "/pagesHome/pages/orderInquiry/orderInquiry"
}
]
},
{
type: 1,
name: "入库",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "码板打托",
router: "/pagesHome/pages/codePlateBracket/codePlateBracket"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "入库扫描",
router: "/pagesHome/pages/orderInquiry/orderInquiry"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "到车入库",
router: "/pagesHome/pages/ArrivalList/ArrivalList"
}
]
},
{
type: 1,
name: "库内",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "分拣打托",
router: "/pagesHome/pages/scansorting/scansorting"
},
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '订单分拣',
// router: '/pagesHome/pages/ordersorting/ordersorting',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '库存品分拣',
// router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// },
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "扫码上架",
router: "/pagesHome/pages/ScanUpType/ScanUpType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "手动上架",
router: "/pagesHome/pages/PeopleScanUpType/PeopleScanUpType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "移库",
router: "/pagesHome/pages/RelocationType/RelocationType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "滞留",
router: "/pagesHome/pages/Retention/Retention"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "合托",
router: "/pagesHome/pages/MergeTray/MergeTray"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "下架",
router: "/pagesHome/pages/DownGoodsType/DownGoodsType"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "空置托盘",
router: "/pagesHome/pages/RemoveTray/RemoveTray"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "复核",
router: "/pagesHome/pages/Check/Check"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "托盘数据同步",
router: "/pagesHome/pages/SearchTray/SearchTray"
}
]
},
{
type: 1,
name: "出库",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "拣货扫描",
router: "/pagesHome/pages/pickingScan/pickingScan"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "自提扫描",
router: "/pagesHome/pages/SelfPickupScan/SelfPickupScan"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "配载装车",
router: "/pagesHome/pages/StowageList/StowageList"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "中转装车",
router: "/pagesHome/pages/RelayScanList/RelayScanList"
}
]
},
{
type: 1,
name: "配送",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "装车扫描",
router: "/pagesHome/pages/LoadingScan/LoadingScan"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "签收扫描",
router: "/pagesHome/pages/signinScan/signinScan"
}
]
},
{
type: 1,
name: "离线上传",
minilist: [
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "离线上传",
router: "/pagesHome/pages/OfflineUpload/OfflineUpload"
}
]
}
]
});
let details = vue.reactive({ tablist: [] });
function gopathpage(path) {
uni.navigateTo({
url: path
@ -8538,8 +8394,8 @@ This will fail in production if not fixed.`);
return;
}
let res = await appMenuroutes({});
formatAppLog("log", "at pages/index/index.vue:216", res, "-------------");
formatAppLog("log", "at pages/index/index.vue:217", "刷新后");
formatAppLog("log", "at pages/index/index.vue:213", res, "-------------");
formatAppLog("log", "at pages/index/index.vue:214", "刷新后");
if (res.code == 200) {
getimgcache(res.data[0]);
} else {
@ -8551,12 +8407,12 @@ This will fail in production if not fixed.`);
}
async function initbuts() {
let authbut = uni.getStorageSync("authbuts");
formatAppLog("log", "at pages/index/index.vue:332", "authbut :>> ", authbut);
formatAppLog("log", "at pages/index/index.vue:329", "authbut :>> ", authbut);
if (authbut) {
return;
}
let butres = await appbuttons({});
formatAppLog("log", "at pages/index/index.vue:337", butres.data);
formatAppLog("log", "at pages/index/index.vue:334", butres.data);
let qxan = [];
butres.data.map((item) => {
item.children.map((ite) => {
@ -8578,6 +8434,7 @@ This will fail in production if not fixed.`);
const timer = setTimeout(() => {
init();
initbuts();
HANDLE_GETSTORAGEINFO();
uni.stopPullDownRefresh();
clearTimeout(timer);
}, 500);
@ -8612,7 +8469,7 @@ This will fail in production if not fixed.`);
maxarr.push(arr);
}
details.tablist = maxarr;
formatAppLog("log", "at pages/index/index.vue:448", details.tablist);
formatAppLog("log", "at pages/index/index.vue:447", details.tablist);
}
async function updateApp() {
let version2 = await utils.getversion();
@ -8621,11 +8478,11 @@ This will fail in production if not fixed.`);
versionCode: version2.version.split(".").join(""),
versionType: version2.pkName.indexOf("test") != -1 ? "1" : version2.pkName.indexOf("bate") != -1 ? "2" : "3"
};
formatAppLog("log", "at pages/index/index.vue:478", "data", data);
formatAppLog("log", "at pages/index/index.vue:477", "data", data);
let response = await AppPdaversiondetail(data, { isShowLoading: false });
if (response.code == 200 && response.data) {
formatAppLog("log", "at pages/index/index.vue:481", response.data);
formatAppLog("log", "at pages/index/index.vue:482", "有可更新包");
formatAppLog("log", "at pages/index/index.vue:480", response.data);
formatAppLog("log", "at pages/index/index.vue:481", "有可更新包");
if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) {
utils.updatefile1(response.data.link);
} else {
@ -33414,24 +33271,30 @@ This will fail in production if not fixed.`);
details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
if (details.checkstate === 2)
return details.renderList = details.datalist;
if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0) {
return utils2.handleToast("该库位已有数据, 无法上架");
}
}
} catch (err) {
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:301", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:305", "err :>> ", err);
}
};
const scanOther = async (_code) => {
try {
if (Number(details.upshelfScanType) == 4 && details.reqobj.trayCode) {
utils2.ttsspke("该库位已绑托盘");
return;
let content = "";
if (Number(details.upshelfScanType) == 4 && details.datalist.length !== 0) {
content = "该库位已有数据, 无法上架";
}
if (details.upshelfScanType === "3") {
const flag2 = details.uplistarr.findIndex((val) => val.orderPackageCode === _code);
if (flag2 !== -1) {
utils2.ttsspke("包件重复扫描");
return;
content = "包件重复扫描";
}
}
if (content) {
utils2.handleToast(content);
return;
}
let data = {
upshelfScanType: details.upshelfScanType,
code: _code
@ -33443,10 +33306,7 @@ This will fail in production if not fixed.`);
const _orderCodeArr = [...details.orderCodeArr];
const _flag = res.data.every((val) => {
if (details.orderCodeArr.includes(val.orderCode)) {
uni.showToast({
title: "订单已存在, 勿重复扫码",
icon: "none"
});
utils2.handleToast("订单已存在, 勿重复扫码");
return false;
}
_uplistarr.push(val);
@ -33472,7 +33332,7 @@ This will fail in production if not fixed.`);
utils2.ttsspke(res.audio);
}
} catch (err) {
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:375", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:381", "err :>> ", err);
}
};
async function scandata() {
@ -35136,7 +34996,6 @@ This will fail in production if not fixed.`);
details.reqobj.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列";
details.allocationId = res.data.allocationId;
details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
details.uplistarr = [];
formatAppLog("log", "at pagesHome/pages/PeopleScanUp/PeopleScanUp.vue:597", "details.pageName.slice(0, details.pageName.length - 3) :>> ", details.pageName);
utils.ttsspke("请输入" + details.pageName.slice(0, details.pageName.length - 2));
} else {
@ -37558,7 +37417,7 @@ This will fail in production if not fixed.`);
let res = await warehouseTrayTypefindAllMarket(data);
if (res.code !== 200)
return;
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:383", res.data);
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:384", res.data);
details.Marketlist = res.data;
}
vue.watchEffect(() => {
@ -37574,7 +37433,7 @@ This will fail in production if not fixed.`);
}
async function scandata() {
var _a;
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:401", "111 :>> ", 111);
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:402", "111 :>> ", 111);
const _scancode = details.scancode;
let _flag = true;
if (details.scandataList.includes(_scancode))
@ -37588,7 +37447,7 @@ This will fail in production if not fixed.`);
icon: "none"
});
}
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:424", "111 :>> ", 111);
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:425", "111 :>> ", 111);
details.scandataList.push(_scancode);
try {
uni.showLoading({
@ -37631,7 +37490,7 @@ This will fail in production if not fixed.`);
orderPackageCode: details.scancode
};
res = await warehouseUpdownTypedownScanPackage(data);
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:469", "res", res);
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:470", "res", res);
if (res.code == 200) {
details.datalist = details.datalist.concat([res.data]);
details.checkdatalist = details.checkdatalist.concat([res.data]);
@ -37662,7 +37521,7 @@ This will fail in production if not fixed.`);
break;
}
} catch (err) {
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:502", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:503", "err :>> ", err);
} finally {
uni.hideLoading();
details.scandataList.splice(details.scandataList.indexOf(_scancode), 1);
@ -37733,7 +37592,7 @@ This will fail in production if not fixed.`);
res = await warehouseUpdownTypedownZeroOrder(data);
break;
}
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:576", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:577", "res :>> ", res);
uni.hideLoading();
if (res.code == 200) {
uni.showToast({

14
utils/utils.js

@ -453,6 +453,20 @@ const utils = {
}
});
})
},
/**
* 提示
* @param {String} content 提示的文字
*/
handleToast(content, icon = 'none') {
uni.showToast({
title: content,
icon: icon
})
// #ifdef APP
this.ttsspke(content)
// #endif
}
}
export default utils
Loading…
Cancel
Save