From b37cdce8b039767be9d00c91d171bd6abcd03fb0 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 5 Apr 2024 19:59:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/host.js | 8 +- manifest.json | 4 +- pages/index/index.vue | 414 +++++------ .../dynamicCheckDetails.vue | 510 +++++++++----- unpackage/dist/dev/app-plus/app-service.js | 660 ++++++++---------- unpackage/dist/dev/app-plus/manifest.json | 4 +- 6 files changed, 844 insertions(+), 756 deletions(-) diff --git a/config/host.js b/config/host.js index 2c432e2..6874e65 100644 --- a/config/host.js +++ b/config/host.js @@ -4,11 +4,11 @@ * 测试域名 * */ //测试域名s -const devhost = 'http://test.api.huo5you.com/' +// const devhost = 'http://test.api.huo5you.com/' // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy -// const devhost = 'http://192.168.3.12:13000/' +const devhost = 'http://192.168.3.12:13000/' // xiaohei // const devhost = 'http://192.168.3.18:13000/' // tjj @@ -25,9 +25,9 @@ const devhost = 'http://test.api.huo5you.com/' /** * 正式域名 * */ -// const prohost = 'http://h5uapi.huitongys.com/' +const prohost = 'http://h5uapi.huitongys.com/' // const prohost = 'https://h5uapi.huitongys.com/' // 小程序 -const prohost = 'http://test.api.huo5you.com/' +// const prohost = 'http://test.api.huo5you.com/' /** * 图片域名 * */ diff --git a/manifest.json b/manifest.json index 268a045..736add0 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "货无忧", "appid" : "__UNI__EB22F37", "description" : "", - "versionName" : "1.1.25", - "versionCode" : 1125, + "versionName" : "1.1.26", + "versionCode" : 1126, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/index/index.vue b/pages/index/index.vue index 1c013b9..3d735f2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -40,213 +40,213 @@ const { storageArr } = storeToRefs(storageStore) const tip = ref(null) - // let details = reactive({ tablist: [] }); - let details = reactive({ - tablist: [ - { - type: 1, - name: '工作台', - minilist: [ - { - 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/waybillInquiry/waybillInquiry', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '库位查询', - router: '/pagesHome/pages/storageInquiry/storageInquiry', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '托盘查询', - router: '/pagesHome/pages/trayInquiry/trayInquiry', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '库存品查询', - router: '/pagesHome/pages/inventoryInquiry/inventoryInquiry', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '物料维护', - router: '/pagesHome/pages/MaterialMaintenance/MaterialMaintenance', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '库位列表', - router: '/pagesHome/pages/StorageLocationList/StorageLocationList', - }, - ] - }, - { - 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/TranNumber/TranNumber', - }, - { - 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', - }, - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '直发商家签收', - router: '/pagesHome/pages/directGoMarket/directGoMarket', - }, - ] - }, - { - type: 1, - name: '离线上传', - minilist: [ - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '离线上传', - router: '/pagesHome/pages/OfflineUpload/OfflineUpload', - }, - ] - }, - { - type: 1, - name: '考核', - minilist: [ - { - icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', - name: '考核指标', - router: '/pagesHome/pages/integral/integral', - }, - { - icon: 'http://8.137.14.82:9000/bladex/upload/20240117/fac9c4fd6c4f0bee599417fc8fbbee62.png', - name: '我的考核', - router: '/pagesHome/pages/integralMy/integralMy', - }, - ] - }, - ] - }) + let details = reactive({ tablist: [] }); + // let details = reactive({ + // tablist: [ + // { + // type: 1, + // name: '工作台', + // minilist: [ + // { + // 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/waybillInquiry/waybillInquiry', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '库位查询', + // router: '/pagesHome/pages/storageInquiry/storageInquiry', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '托盘查询', + // router: '/pagesHome/pages/trayInquiry/trayInquiry', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '库存品查询', + // router: '/pagesHome/pages/inventoryInquiry/inventoryInquiry', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '物料维护', + // router: '/pagesHome/pages/MaterialMaintenance/MaterialMaintenance', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '库位列表', + // router: '/pagesHome/pages/StorageLocationList/StorageLocationList', + // }, + // ] + // }, + // { + // 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/TranNumber/TranNumber', + // }, + // { + // 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', + // }, + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '直发商家签收', + // router: '/pagesHome/pages/directGoMarket/directGoMarket', + // }, + // ] + // }, + // { + // type: 1, + // name: '离线上传', + // minilist: [ + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '离线上传', + // router: '/pagesHome/pages/OfflineUpload/OfflineUpload', + // }, + // ] + // }, + // { + // type: 1, + // name: '考核', + // minilist: [ + // { + // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', + // name: '考核指标', + // router: '/pagesHome/pages/integral/integral', + // }, + // { + // icon: 'http://8.137.14.82:9000/bladex/upload/20240117/fac9c4fd6c4f0bee599417fc8fbbee62.png', + // name: '我的考核', + // router: '/pagesHome/pages/integralMy/integralMy', + // }, + // ] + // }, + // ] + // }) function gopathpage(path : string) { uni.navigateTo({ diff --git a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue index 445a20d..802935f 100644 --- a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue +++ b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue @@ -112,8 +112,8 @@ 包条码: {{item.orderPackageCode || '暂无数据'}} - + 合同号: {{item.orderCode || '暂无数据'}} @@ -126,7 +126,7 @@ 运单号: {{item.waybillNumber || '暂无数据'}} - + 合同号: {{item.orderCode || '暂无数据'}} @@ -139,7 +139,7 @@ 物料编码: {{item.materialCode || '暂无数据'}} - + 合同号: {{item.orderCode || '暂无数据'}} @@ -147,21 +147,21 @@ - 库位: {{item.allocation || '暂无数据'}} + 库位: {{item.positionCode || '暂无数据'}} @@ -170,7 +170,8 @@ @@ -192,7 +193,8 @@ 处理 - + 上架 @@ -224,7 +226,7 @@ - + @@ -236,14 +238,14 @@ @@ -267,6 +269,19 @@ + + + + 包条码: {{details.removeTray.orderPackageCode}} + + + 该包条绑定库位: {{details.removeTray.positionCode}} + + + 本托盘: {{details.pageInfos.trayCode}} + + + @@ -442,7 +457,7 @@ - 库位: {{details.detailsInfo.allocation}} + 库位: {{details.detailsInfo.positionCode}} @@ -578,47 +593,57 @@ value: 1, code: 10, disabled: true, - name: 'stockNum' + name: 'stockNum', + maxNum: 0, }, { title: '破损', isCheck: false, value: 0, code: 20, - disabled: true, - name: 'wornNum' + disabled: false, + name: 'wornNum', + maxNum: 0, + }, { title: '丢失', isCheck: false, value: 0, code: 30, - disabled: true, - name: 'lossNum' + disabled: false, + name: 'lossNum', + maxNum: 0, + }, { title: '不可修复', isCheck: false, value: 0, code: 40, - disabled: true, - name: 'noRepairNum' + disabled: false, + name: 'noRepairNum', + maxNum: 0, + }, { title: '配送', isCheck: false, value: 0, code: 50, - disabled: true, - name: 'deliveNum' + disabled: false, + name: 'deliveNum', + maxNum: 0, }, { title: '未入库', isCheck: false, value: 0, code: 60, - disabled: true, - name: 'noReceivedNum' + disabled: false, + name: 'noReceivedNum', + maxNum: 0, + } ], /** 盘点状态字典表 */ @@ -670,7 +695,7 @@ /** 被移动的包条数据 */ removeTray: {}, /** 展示详情信息 */ - detailsInfo: {} + detailsInfo: {}, }) // 获取组件实例 @@ -690,6 +715,8 @@ const popUp_AddStock = ref(null) /** 弹出层 -- 是否移托 */ const popUp_RemoveTary = ref(null) + /** 弹出层 -- 是否移库 */ + const popUp_RemoveAllocation = ref(null) /** 弹出层 -- 详情 */ const popUp_Details = ref(null) @@ -766,7 +793,7 @@ else { // 盘点过的数据, 排查在库状态 val.questChildVOList.forEach(item => { - if (item.questNum !== 0) val.cargoName = item.cargoName + if (item.questNum !== 0) val.cargoName = Number(item.cargoName) }) } // 记录所有已盘点的数量 @@ -775,8 +802,33 @@ // 该条在系统中记录已盘点 val.isTask = true } + + // 按托盘盘点 + if (details.pageType === 4) { + // 是否属于本托盘 + if (val.trayId !== details.pageInfos.trayId) { + val.oldTrayId = val.trayId + val.oldTrayCode = val.trayCode + + val.trayCode = details.pageInfos.trayCode + val.trayId = details.pageInfos.trayId + } + } + + // 按库位盘点 + if (details.pageType === 2) { + // 是否属于本托盘 + if (val.allocationId !== details.pageInfos.allocationId) { + val.oldAllocationId = val.allocationId + val.oldAllocation = val.positionCode + + val.allocationId = details.pageInfos.allocationId + val.positionCode = details.pageInfos.positionCode + } + } }) - } catch (e) { + } catch (err) { + console.log('err :>> ', err); //TODO handle the exception } finally { return null @@ -803,13 +855,41 @@ details.stockList = data.list || [] // 记录所有已盘点的数量 details.stockList.forEach(val => { + val.maxNum = val.stockNum if (!val.cargoName) val.cargoName = 10 if (Number(val.questStatus) === 1) { details.scanNum++ val.isTask = true } + + // 按托盘盘点 + if (details.pageType === 4) { + // 是否属于本托盘 + if (val.trayId !== details.pageInfos.trayId) { + val.oldTrayId = val.trayId + val.oldTrayCode = val.trayCode + + val.trayCode = details.pageInfos.trayCode + val.trayId = details.pageInfos.trayId + } + } + + // 按库位盘点 + if (details.pageType === 2) { + // 是否属于本库位 + console.log('details.pageInfos :>> ', details.pageInfos); + if (val.allocationId !== details.pageInfos.allocationId) { + console.log('222 :>> ', 222); + val.oldAllocationId = val.allocationId + val.oldAllocation = val.positionCode + + val.allocationId = details.pageInfos.allocationId + val.positionCode = details.pageInfos.positionCode + } + } }) - } catch (e) { + } catch (err) { + console.log('err :>> ', err); //TODO handle the exception } finally { return null @@ -848,7 +928,8 @@ } } // 扫到已有包条退出函数 || 合同号盘点时不支持新增 - if (_flag || details.pageType === 3) return + if (_flag) return utils.handleToast('重复扫码') + else if (details.pageType === 3) return utils.handleToast('该数据不在本合同号内') try { // uni.showLoading({ @@ -883,6 +964,9 @@ val.isNew = true if (!val.cargoName) val.cargoName = 10 + val.oldTrayCode = val.trayCode + val.oldTrayId = val.trayId + val.trayCode = details.pageInfos.trayCode val.trayId = details.pageInfos.trayId val.isChange = true @@ -899,6 +983,37 @@ return } + // 库位盘点 (判断该数据是否已上架) + else if (details.pageType === 2 && val.allcationId) { + details.removeAllocation = val + popUp_RemoveAllocation.value.setDetails({ + title: '是否移库', + showPopUp: true, + success() { + val.questStatus = 1 + details.scanNum++ + val.isNew = true + if (!val.cargoName) val.cargoName = 10 + + val.oldAllocationId = val.allocationId + val.oldAllocation = val.positionCode + + val.trayCode = details.pageInfos.trayCode + val.trayId = details.pageInfos.trayId + val.isChange = true + + details.orderList.push(val) + console.log('val :>> ', val); + popUp_RemoveAllocation.value.details.showPopUp = false + // #ifdef APP + utils.ttsspke(details.scanNum + '件') + // #endif + } + }) + + return + } + val.questStatus = 1 details.scanNum++ val.isNew = true @@ -906,15 +1021,18 @@ if (!val.cargoName) val.cargoName = 10 if (details.pageType === 2) { val.allocationId = details.pageInfos.allocationId - val.allocation = details.pageInfos.positionCode - } - else if (details.pageType === 3) { - val.orderCode = details.pageInfos.orderCode - val.orderId = details.pageInfos.orderId + val.positionCode = details.pageInfos.positionCode + + val.oldAllocationId = '暂无数据' + val.oldAllocation = '暂无数据' } + else if (details.pageType === 4) { val.trayCode = details.pageInfos.trayCode val.trayId = details.pageInfos.trayId + + val.oldTrayCode = '暂无数据' + val.oldTrayId = '暂无数据' } details.orderList.push(val) }) @@ -944,11 +1062,11 @@ title: '新增', showPopUp: true, success() { - const _order = { + const _order : any = { orderPackageCode: details.scancode, questStatus: 1, orderCode: details.addInfo.orderCode, - allocation: '', + positionCode: '', cargoName: 10, isChoose: false, /** 为手动添加 */ @@ -958,15 +1076,18 @@ } if (details.pageType === 2) { _order.allocationId = details.pageInfos.allocationId - _order.allocation = details.pageInfos.positionCode - } - else if (details.pageType === 3) { - _order.orderCode = details.pageInfos.orderCode - _order.orderId = details.pageInfos.orderId + _order.positionCode = details.pageInfos.positionCode + + _order.oldAllocationId = '暂无数据' + _order.oldAllocation = '暂无数据' } + else if (details.pageType === 4) { _order.trayCode = details.pageInfos.trayCode _order.trayId = details.pageInfos.trayId + + _order.oldTrayCode = '暂无数据' + _order.oldTrayId = '暂无数据' } const _flag = details.addType.find(val => val.isCheck).title if (_flag === '定制品') _order.questTarget = 1 @@ -1030,6 +1151,8 @@ /** 搜索 */ const handleSearch = () => { + if (!details.searchCode) return utils.handleToast('请输入包条码') + details.scancode = details.searchCode scandata() } @@ -1138,7 +1261,7 @@ if (_item.questStatus === 1) { // 改变库位信息 _item.allocationId = allocationId - _item.allocation = positionCode + _item.positionCode = positionCode _item.isChange = true _number++ } @@ -1203,6 +1326,11 @@ if (val.code === cargoName) { val.isCheck = true val.value = 1 + + if (cargoName === 20 || cargoName === 40) { + details.stateArr[0].value = 1 + details.stateArr[0].isCheck = true + } } else { val.isCheck = false val.value = 0 @@ -1221,26 +1349,29 @@ }) } } else { - if ( - cargoName.stockNum - || cargoName.wornNum + if (!cargoName.questChildVOList || cargoName.lossNum - || cargoName.noRepairNum || cargoName.deliveNum + || cargoName.wornNum + || cargoName.noRepairNum || cargoName.noReceivedNum) { details.stateArr.forEach((val) => { const _value = cargoName[val.name] console.log('val.name :>> ', val.name); console.log('_value :>> ', _value); + val.maxNum = cargoName.maxNum if (_value > 0 && _value) val.value = _value else val.value = 0 }) } else { cargoName.questChildVOList.forEach((val, index) => { + details.stateArr[index].maxNum = cargoName.maxNum details.stateArr[index].isCheck = val.questNum === 0 ? false : true details.stateArr[index].value = val.questNum }) + + console.log('details.stateArr :>> ', details.stateArr); } } @@ -1375,8 +1506,6 @@ /** 关闭或显示下拉框 */ const handleShowSelect = (index) => { - console.log('222 :>> ', 222); - details.materialChooseIndex = index === details.materialChooseIndex ? 0 : index } @@ -1452,40 +1581,30 @@ confirmText: '确认上架', success() { const { positionCode, allocationId } = details.positionInfo - let content = '' let _number = 0 - if (positionCode) { - for (let i = 0; i <= details.renderList.length - 1; i++) { - const _item = details.renderList[i] - if (_item.isChoose) { - // 改变库位信息 - _item.allocationId = allocationId - _item.allocation = positionCode - _item.isChange = true - - _number++ - - if (_item.questStatus !== 1) { - // 改变盘点状态 - details.renderList[i].questStatus = 1 - - // 改变已盘点数 - details.scanNum++ - } + if (!positionCode) return utils.handleToast('上架失败, 库位数据有误') + for (let i = 0; i <= details.renderList.length - 1; i++) { + const _item = details.renderList[i] + if (_item.isChoose) { + // 改变库位信息 + _item.allocationId = allocationId + _item.positionCode = positionCode + _item.isChange = true + + _number++ + + if (_item.questStatus !== 1) { + // 改变盘点状态 + details.renderList[i].questStatus = 1 + + // 改变已盘点数 + details.scanNum++ } - // 重置选中状态 - _item.isChoose = false } - content = '上架成功' + _number + '件' - } else content = '上架失败, 库位数据有误' - - uni.showToast({ - title: content, - icon: 'none' - }) - // #ifdef APP - utils.ttsspke(content) - // #endif + // 重置选中状态 + _item.isChoose = false + } + utils.handleToast('上架成功' + _number + '件') // 重置库位信息 details.positionInfo.allocationId = '' @@ -1565,7 +1684,10 @@ } _item.isCheck = true _item.value = 1 - if (_item.title === '破损' || _item.title === '不可修复') details.stateArr[0].value = 1 + if (_item.title === '破损' || _item.title === '不可修复') { + details.stateArr[0].value = 1 + details.stateArr[0].isCheck = true + } } else { console.log('details.stateArr[0].value :>> ', details.stateArr[0].value); // 无数据 @@ -1575,8 +1697,7 @@ if (details.stateArr[0].value === 0 && _item.title === '破损' || details.stateArr[0].value === 0 && _item.title === '不可修复') return _item.isCheck = !_item.isCheck - _item.disabled = !_item.isCheck - if (_item.disabled && _item.code !== details.stateArr[0].code) _item.value = 0 + if (!_item.isCheck && _item.code !== details.stateArr[0].code) _item.value = 0 } } @@ -1591,8 +1712,9 @@ showPopUp: true, success() { if (tabBarCode.value === 1) { - const _value = details.stateArr.find(val => val.isCheck) - _item.cargoName = _value.code + for (let i = 0; i < details.stateArr.length; i++) { + if (details.stateArr[i].isCheck) _item.cargoName = details.stateArr[i].code + } // 改变盘点状态 } else { details.stateArr.forEach(val => { @@ -1621,27 +1743,22 @@ confirmText: '确认上架', showPopUp: true, success() { - let content = '' const { allocationId, positionCode } = details.positionInfo - if (positionCode) { - _item.allocationId = allocationId - _item.allocation = positionCode - // 改变已盘点数 - if (_item.questStatue !== 1) details.scanNum++ - // 更改上架状态 - _item.questStatus = 1 - _item.isChange = true - content = '上架成功' - } else content = '上架失败, 库位数据有误' + if (!positionCode) return utils.handleToast('上架失败, 库位数据有误') - uni.showToast({ - title: content, - icon: 'none' - }) - // #ifdef APP - utils.ttsspke(content) - // #endif + _item.oldAllocationId = _item.allocationId + _item.oldAllocation = _item.positionCode + + _item.allocationId = allocationId + _item.positionCode = positionCode + // 改变已盘点数 + if (_item.questStatue !== 1) details.scanNum++ + // 更改上架状态 + _item.questStatus = 1 + _item.isChange = true + + utils.handleToast('上架成功') // 重置库位数据 details.positionInfo.positionCode = '' @@ -1685,6 +1802,7 @@ materialName: details.addInfo.materialName, cargoName: 10, stockNum: _number, + maxNum: _number, isChoose: false, /** 为手动添加 */ isManuallyAdd: true, @@ -1693,15 +1811,18 @@ } if (details.pageType === 2) { _order.allocationId = details.pageInfos.allocationId - _order.allocation = details.pageInfos.positionCode - } - else if (details.pageType === 3) { - _order.orderCode = details.pageInfos.orderCode - _order.orderId = details.pageInfos.orderId + _order.positionCode = details.pageInfos.positionCode + + _order.oldAllocationId = '暂无数据' + _order.oldAllocation = '暂无数据' } + else if (details.pageType === 4) { _order.trayCode = details.pageInfos.trayCode _order.trayId = details.pageInfos.trayId + + _order.oldTrayCode = '暂无数据' + _order.oldTrayId = '暂无数据' } details.stockList.push(_order) details.scanNum++ @@ -1755,6 +1876,7 @@ clientName: details.addInfo.clientName, cargoName: 10, stockNum: _number, + maxNum: _number, isChoose: false, /** 为手动添加 */ isManuallyAdd: true, @@ -1763,15 +1885,18 @@ } if (details.pageType === 2) { _order.allocationId = details.pageInfos.allocationId - _order.allocation = details.pageInfos.positionCode - } - else if (details.pageType === 3) { - _order.orderCode = details.pageInfos.orderCode - _order.orderId = details.pageInfos.orderId + _order.positionCode = details.pageInfos.positionCode + + _order.oldAllocationId = '暂无数据' + _order.oldallocation = '暂无数据' } + else if (details.pageType === 4) { _order.trayCode = details.pageInfos.trayCode _order.trayId = details.pageInfos.trayId + + _order.oldTrayCode = '暂无数据' + _order.oldTrayId = '暂无数据' } details.stockList.push(_order) details.scanNum++ @@ -1824,13 +1949,22 @@ } /** 输入 */ - const inputNum = (_item) => { - let _maxNum = details.stateArr[0].value - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value + const inputNum = (_item, index) => { + console.log('index :>> ', index); + console.log('_item :>> ', _item); + const whiteArr = [2, 4, 5] + + let _maxNum = _item.maxNum - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value + + if (whiteArr.includes(index)) _maxNum += Number(details.stateArr[index].value) + + console.log('_maxNum :>> ', _maxNum); let _number = Number(_item.value) if (_number !== _number) return _item.value = 0 else if (_number <= 0) return _item.value = 0 else if (_maxNum < 0) _item.value = 0 + else if (_item.value > _maxNum) _item.value = _maxNum else _item.value = _number } @@ -1853,18 +1987,18 @@ questDetailList: [] } details.orderList.forEach(val => { - if (Number(val.questStatus) !== 1) return + // if (Number(val.questStatus) !== 1) return - // 不是新增的且状态为在库 - if (!val.isManuallyAdd - // && !val.isNew - // && !val.isChange - && Number(val.cargoName) === 10 - ) { - console.log('1 :>> ', 1); - submitData.questDetailIds.push(val.questDetailId) - if (!val.isChange) return - } + // // 不是新增的且状态为在库 + // if (!val.isManuallyAdd + // // && !val.isNew + // // && !val.isChange + // && Number(val.cargoName) === 10 + // ) { + // console.log('1 :>> ', 1); + // if (!val.isChange) return + // } + submitData.questDetailIds.push(val.questDetailId) const _item = { @@ -1881,9 +2015,6 @@ /** 未入库数量 */ noReceivedNum: 0, id: val.questDetailId, - /** 上架修改后的库位id */ - groundingAllocationId: val.allocationId, - groundingPositionCode: val.allocation, questId: details.pageInfos.questId, questNum: details.pageInfos.questNum, orderCode: val.orderCode, @@ -1894,24 +2025,43 @@ } _item.isNew = val.isManuallyAdd ? 1 : 0 - if (val.isNew || val.isManuallyAdd) { - if (details.pageType === 2) { - _item.allocationId = details.pageInfos.allocationId - _item.positionCode = details.pageInfos.allocation - // 当修改前和修改后的Id一样时, 删除修改后的 - // if (_item.groundingAllocationId === _item.allocationId) { - // delete _item.groundingAllocationId - // delete _item.groundingPositionCode - // } + // if (val.isNew || val.isManuallyAdd) { + if (details.pageType === 2) { + if (val.oldAllocationId) { + // 上架后的新库位 + _item.groundingPositionCode = val.positionCode + _item.groundingAllocationId = val.allocationId } - else if (details.pageType === 4) { - _item.trayCode = val.trayCode - _item.trayId = val.trayId + + // 库位盘点时, 不传托盘 + delete _item.trayCode + delete _item.trayId + } + + else if (details.pageType === 3) { + if (val.oldAllocationId) { + _item.groundingPositionCode = val.positionCode + _item.groundingAllocationId = val.allocationId } - _item.orderPackageCode = val.orderPackageCode - _item.orderPackageId = val.orderPackageId } + else if (details.pageType === 4) { + if (val.oldTrayCode) { + _item.newTrayCode = val.trayCode + _item.newTrayId = val.trayId + } + + + // 托盘盘点时, 不传库位 + delete _item.groundingPositionCode + delete _item.groundingAllocationId + } + + console.log('val :>> ', val); + // } + _item.orderPackageCode = val.orderPackageCode + _item.orderPackageId = val.orderPackageId + // 不改变在库数的 const _whiteCodeArr = [10, 20, 40] @@ -1925,19 +2075,19 @@ details.stockList.forEach(val => { if (Number(val.questStatus) !== 1) return - if (!val.isManuallyAdd - && !val.isNew - && val.lossNum === 0 - && val.deliveNum === 0 - && val.wornNum === 0 - && val.noRepairNum === 0 - && val.noReceivedNum === 0 - && Number(val.cargoName) === 1 - // && !val.isChange - ) { - submitData.questDetailIds.push(val.questDetailId) - if (!val.isChange) return - } + // if (!val.isManuallyAdd + // && !val.isNew + // && val.lossNum === 0 + // && val.deliveNum === 0 + // && val.wornNum === 0 + // && val.noRepairNum === 0 + // && val.noReceivedNum === 0 + // && Number(val.cargoName) === 1 + // // && !val.isChange + // ) { + // if (!val.isChange) return + // } + submitData.questDetailIds.push(val.questDetailId) const _item = { /** 在库数量 */ stockNum: val.stockNum || 0, @@ -1951,9 +2101,6 @@ noRepairNum: val.noRepairNum || 0, /** 未入库数量 */ noReceivedNum: val.noReceivedNum || 0, - /** 上架后的库位id */ - groundingAllocationId: val.allocationId, - groundingPositionCode: val.allocation, id: val.questDetailId, questId: details.pageInfos.questId, waybillNumber: val.waybillNumber, @@ -1967,24 +2114,41 @@ isNew: 0 } // 计算在库数 - _item.stockNum = _item.stockNum - _item.lossNum - _item.deliveNum - _item.noReceivedNum + _item.stockNum = val.maxNum - _item.lossNum - _item.deliveNum - _item.noReceivedNum + _item.quantity = _item.stockNum _item.isNew = val.isManuallyAdd ? 1 : 0 - if (_item.isNew === 1) { - if (details.pageType === 2) { - _item.allocationId = details.pageInfos.allocationId - _item.positionCode = details.pageInfos.allocation - // 当修改前和修改后的Id一样时, 删除修改后的 - // if (_item.groundingAllocationId === _item.allocationId) { - // delete _item.groundingAllocationId - // delete _item.groundingPositionCode - // } + // if (_item.isNew === 1) { + if (details.pageType === 2) { + if (val.oldAllocationId) { + _item.groundingPositionCode = val.positionCode + _item.groundingAllocationId = val.allocationId } - else if (details.pageType === 4) { - _item.trayCode = val.trayCode - _item.trayId = val.trayId + + // 库位盘点时, 不传托盘 + delete _item.trayCode + delete _item.trayId + } + + else if (details.pageType === 3) { + if (val.oldAllocationId) { + _item.groundingPositionCode = val.positionCode + _item.groundingAllocationId = val.allocationId + } + } + + else if (details.pageType === 4) { + if (val.oldTrayId) { + _item.newTrayCode = val.trayCode + _item.newTrayId = val.trayId } + + + // 托盘盘点时, 不传库位 + delete _item.groundingPositionCode + delete _item.groundingAllocationId } + // } submitData.questDetailList.push(_item) @@ -1998,7 +2162,7 @@ utils.ttsspke('盘点成功') const timer = setTimeout(() => { // 提交成功返回上一级页面 - uni.navigateBack() + // uni.navigateBack() clearTimeout(timer) }, 1000) } diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 81f96a5..7ea6b33 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -8743,212 +8743,7 @@ This will fail in production if not fixed.`); const { HANDLE_GETSTORAGEINFO } = storageStore; const { storageArr } = storeToRefs(storageStore); 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" - }, - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "运单查询", - router: "/pagesHome/pages/waybillInquiry/waybillInquiry" - }, - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "库位查询", - router: "/pagesHome/pages/storageInquiry/storageInquiry" - }, - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "托盘查询", - router: "/pagesHome/pages/trayInquiry/trayInquiry" - }, - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "库存品查询", - router: "/pagesHome/pages/inventoryInquiry/inventoryInquiry" - }, - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "物料维护", - router: "/pagesHome/pages/MaterialMaintenance/MaterialMaintenance" - }, - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "库位列表", - router: "/pagesHome/pages/StorageLocationList/StorageLocationList" - } - ] - }, - { - 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/TranNumber/TranNumber" - }, - { - 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" - }, - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "直发商家签收", - router: "/pagesHome/pages/directGoMarket/directGoMarket" - } - ] - }, - { - type: 1, - name: "离线上传", - minilist: [ - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "离线上传", - router: "/pagesHome/pages/OfflineUpload/OfflineUpload" - } - ] - }, - { - type: 1, - name: "考核", - minilist: [ - { - icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png", - name: "考核指标", - router: "/pagesHome/pages/integral/integral" - }, - { - icon: "http://8.137.14.82:9000/bladex/upload/20240117/fac9c4fd6c4f0bee599417fc8fbbee62.png", - name: "我的考核", - router: "/pagesHome/pages/integralMy/integralMy" - } - ] - } - ] - }); + let details = vue.reactive({ tablist: [] }); function gopathpage(path) { uni.navigateTo({ url: path @@ -26783,10 +26578,11 @@ This will fail in production if not fixed.`); try { formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:343", "item :>> ", item); let subdata = { - billLadingId: details.billLadingId + billLadingId: details.billLadingId, + stockArtieleld: item.id }; const response2 = await billLadingzeroBillData(subdata); - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:349", "response :>> ", response2); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:350", "response :>> ", response2); const { code: code2, data } = response2; if (code2 !== 200) return uni.showToast({ @@ -26835,7 +26631,7 @@ This will fail in production if not fixed.`); } if (list.length === 0) return tiplists.value.setdetails({ isshow: false }); - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:401", "list :>> ", list); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:402", "list :>> ", list); tiplists.value.setdetails({ isshow: true, tipstate: 2, @@ -26846,7 +26642,7 @@ This will fail in production if not fixed.`); success: async () => { try { const res = await billLadingzeroBillBatch({ billLadingId: details.billLadingId, list }); - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:414", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:415", "res :>> ", res); if (res.code === 200) { uni.showToast({ title: res.msg @@ -26855,7 +26651,7 @@ This will fail in production if not fixed.`); } tiplists.value.setdetails({ isshow: false }); } catch (err) { - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:423", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:424", "err :>> ", err); } }, cancel: () => { @@ -26866,7 +26662,7 @@ This will fail in production if not fixed.`); } }); } catch (err) { - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:435", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:436", "err :>> ", err); } finally { } }, @@ -26878,7 +26674,7 @@ This will fail in production if not fixed.`); } }); } catch (err) { - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:448", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:449", "err :>> ", err); } } function checktype(e2) { @@ -26891,7 +26687,7 @@ This will fail in production if not fixed.`); if (item.value == e2) { details.schanvalue = item.label; details.orderStatus = item.value; - formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:463", details.schanvalue); + formatAppLog("log", "at pagesHome/pages/SelfPScanList/SelfPScanList.vue:464", details.schanvalue); } }); } @@ -67049,47 +66845,53 @@ ${i3} value: 1, code: 10, disabled: true, - name: "stockNum" + name: "stockNum", + maxNum: 0 }, { title: "破损", isCheck: false, value: 0, code: 20, - disabled: true, - name: "wornNum" + disabled: false, + name: "wornNum", + maxNum: 0 }, { title: "丢失", isCheck: false, value: 0, code: 30, - disabled: true, - name: "lossNum" + disabled: false, + name: "lossNum", + maxNum: 0 }, { title: "不可修复", isCheck: false, value: 0, code: 40, - disabled: true, - name: "noRepairNum" + disabled: false, + name: "noRepairNum", + maxNum: 0 }, { title: "配送", isCheck: false, value: 0, code: 50, - disabled: true, - name: "deliveNum" + disabled: false, + name: "deliveNum", + maxNum: 0 }, { title: "未入库", isCheck: false, value: 0, code: 60, - disabled: true, - name: "noReceivedNum" + disabled: false, + name: "noReceivedNum", + maxNum: 0 } ], /** 盘点状态字典表 */ @@ -67151,11 +66953,12 @@ ${i3} const popUp_AddZero = vue.ref(null); const popUp_AddStock = vue.ref(null); const popUp_RemoveTary = vue.ref(null); + const popUp_RemoveAllocation = vue.ref(null); const popUp_Details = vue.ref(null); onLoad((info) => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:698", "info :>> ", info); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:725", "info :>> ", info); const infos = JSON.parse(info.info); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:700", "object :>> ", JSON.parse(info.info)); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:727", "object :>> ", JSON.parse(info.info)); option.title = infos.title; details.pageType = infos.pageType; details.pageInfos = infos; @@ -67181,7 +66984,7 @@ ${i3} const orderRes = initOrder(); const stockRes = initStock(); const _promiseAll = Promise.all([orderRes, stockRes]); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:739", "_promiseAll :>> ", _promiseAll); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:766", "_promiseAll :>> ", _promiseAll); return _promiseAll; } catch (e2) { } @@ -67213,15 +67016,32 @@ ${i3} else { val.questChildVOList.forEach((item) => { if (item.questNum !== 0) - val.cargoName = item.cargoName; + val.cargoName = Number(item.cargoName); }); } if (Number(val.questStatus) === 1) { details.scanNum++; val.isTask = true; } + if (details.pageType === 4) { + if (val.trayId !== details.pageInfos.trayId) { + val.oldTrayId = val.trayId; + val.oldTrayCode = val.trayCode; + val.trayCode = details.pageInfos.trayCode; + val.trayId = details.pageInfos.trayId; + } + } + if (details.pageType === 2) { + if (val.allocationId !== details.pageInfos.allocationId) { + val.oldAllocationId = val.allocationId; + val.oldAllocation = val.positionCode; + val.allocationId = details.pageInfos.allocationId; + val.positionCode = details.pageInfos.positionCode; + } + } }); - } catch (e2) { + } catch (err) { + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:831", "err :>> ", err); } finally { return null; } @@ -67248,14 +67068,34 @@ ${i3} return; details.stockList = data.list || []; details.stockList.forEach((val) => { + val.maxNum = val.stockNum; if (!val.cargoName) val.cargoName = 10; if (Number(val.questStatus) === 1) { details.scanNum++; val.isTask = true; } + if (details.pageType === 4) { + if (val.trayId !== details.pageInfos.trayId) { + val.oldTrayId = val.trayId; + val.oldTrayCode = val.trayCode; + val.trayCode = details.pageInfos.trayCode; + val.trayId = details.pageInfos.trayId; + } + } + if (details.pageType === 2) { + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:880", "details.pageInfos :>> ", details.pageInfos); + if (val.allocationId !== details.pageInfos.allocationId) { + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:882", "222 :>> ", 222); + val.oldAllocationId = val.allocationId; + val.oldAllocation = val.positionCode; + val.allocationId = details.pageInfos.allocationId; + val.positionCode = details.pageInfos.positionCode; + } + } }); - } catch (e2) { + } catch (err) { + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:892", "err :>> ", err); } finally { return null; } @@ -67283,8 +67123,10 @@ ${i3} break; } } - if (_flag || details.pageType === 3) - return; + if (_flag) + return utils.handleToast("重复扫码"); + else if (details.pageType === 3) + return utils.handleToast("该数据不在本合同号内"); try { const queryData = { code: details.scancode, @@ -67292,9 +67134,9 @@ ${i3} questNum: details.pageInfos.questNum }; const res = await postWarehouseTaskSelectPackageInfo(queryData); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:867", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:948", "res :>> ", res); const { code: code2, data } = res; - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:869", "code :>> ", code2); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:950", "code :>> ", code2); if (code2 === 200 && data && data.length !== 0) { data.forEach((val) => { if (details.pageType === 4 && val.trayCode) { @@ -67308,16 +67150,41 @@ ${i3} val.isNew = true; if (!val.cargoName) val.cargoName = 10; + val.oldTrayCode = val.trayCode; + val.oldTrayId = val.trayId; val.trayCode = details.pageInfos.trayCode; val.trayId = details.pageInfos.trayId; val.isChange = true; details.orderList.push(val); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:891", "val :>> ", val); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:975", "val :>> ", val); popUp_RemoveTary.value.details.showPopUp = false; utils.ttsspke(details.scanNum + "件"); } }); return; + } else if (details.pageType === 2 && val.allcationId) { + details.removeAllocation = val; + popUp_RemoveAllocation.value.setDetails({ + title: "是否移库", + showPopUp: true, + success() { + val.questStatus = 1; + details.scanNum++; + val.isNew = true; + if (!val.cargoName) + val.cargoName = 10; + val.oldAllocationId = val.allocationId; + val.oldAllocation = val.positionCode; + val.trayCode = details.pageInfos.trayCode; + val.trayId = details.pageInfos.trayId; + val.isChange = true; + details.orderList.push(val); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1006", "val :>> ", val); + popUp_RemoveAllocation.value.details.showPopUp = false; + utils.ttsspke(details.scanNum + "件"); + } + }); + return; } val.questStatus = 1; details.scanNum++; @@ -67327,13 +67194,14 @@ ${i3} val.cargoName = 10; if (details.pageType === 2) { val.allocationId = details.pageInfos.allocationId; - val.allocation = details.pageInfos.positionCode; - } else if (details.pageType === 3) { - val.orderCode = details.pageInfos.orderCode; - val.orderId = details.pageInfos.orderId; + val.positionCode = details.pageInfos.positionCode; + val.oldAllocationId = "暂无数据"; + val.oldAllocation = "暂无数据"; } else if (details.pageType === 4) { val.trayCode = details.pageInfos.trayCode; val.trayId = details.pageInfos.trayId; + val.oldTrayCode = "暂无数据"; + val.oldTrayId = "暂无数据"; } details.orderList.push(val); }); @@ -67358,7 +67226,7 @@ ${i3} orderPackageCode: details.scancode, questStatus: 1, orderCode: details.addInfo.orderCode, - allocation: "", + positionCode: "", cargoName: 10, isChoose: false, /** 为手动添加 */ @@ -67368,13 +67236,14 @@ ${i3} }; if (details.pageType === 2) { _order.allocationId = details.pageInfos.allocationId; - _order.allocation = details.pageInfos.positionCode; - } else if (details.pageType === 3) { - _order.orderCode = details.pageInfos.orderCode; - _order.orderId = details.pageInfos.orderId; + _order.positionCode = details.pageInfos.positionCode; + _order.oldAllocationId = "暂无数据"; + _order.oldAllocation = "暂无数据"; } else if (details.pageType === 4) { _order.trayCode = details.pageInfos.trayCode; _order.trayId = details.pageInfos.trayId; + _order.oldTrayCode = "暂无数据"; + _order.oldTrayId = "暂无数据"; } const _flag2 = details.addType.find((val) => val.isCheck).title; if (_flag2 === "定制品") @@ -67395,7 +67264,7 @@ ${i3} }); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:990", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1111", "err :>> ", err); } finally { } } @@ -67433,6 +67302,8 @@ ${i3} details.renderList = details.stockList; } const handleSearch = () => { + if (!details.searchCode) + return utils.handleToast("请输入包条码"); details.scancode = details.searchCode; scandata(); }; @@ -67498,7 +67369,7 @@ ${i3} }); }; const handleShowDetails = (item) => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1103", "item :>> ", item); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1226", "item :>> ", item); details.detailsInfo = item; popUp_Details.value.setDetails({ title: "详情", @@ -67524,7 +67395,7 @@ ${i3} const _item = _arr[i2]; if (_item.questStatus === 1) { _item.allocationId = allocationId; - _item.allocation = positionCode; + _item.positionCode = positionCode; _item.isChange = true; _number++; } @@ -67570,13 +67441,17 @@ ${i3} } }; const initState = (cargoName) => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1198", "cargoName :>> ", cargoName); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1321", "cargoName :>> ", cargoName); if (details.tabBarCode === 1) { if (cargoName) { details.stateArr.forEach((val) => { if (val.code === cargoName) { val.isCheck = true; val.value = 1; + if (cargoName === 20 || cargoName === 40) { + details.stateArr[0].value = 1; + details.stateArr[0].isCheck = true; + } } else { val.isCheck = false; val.value = 0; @@ -67594,11 +67469,12 @@ ${i3} }); } } else { - if (cargoName.stockNum || cargoName.wornNum || cargoName.lossNum || cargoName.noRepairNum || cargoName.deliveNum || cargoName.noReceivedNum) { + if (!cargoName.questChildVOList || cargoName.lossNum || cargoName.deliveNum || cargoName.wornNum || cargoName.noRepairNum || cargoName.noReceivedNum) { details.stateArr.forEach((val) => { const _value = cargoName[val.name]; - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1233", "val.name :>> ", val.name); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1234", "_value :>> ", _value); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1360", "val.name :>> ", val.name); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1361", "_value :>> ", _value); + val.maxNum = cargoName.maxNum; if (_value > 0 && _value) val.value = _value; else @@ -67606,9 +67482,11 @@ ${i3} }); } else { cargoName.questChildVOList.forEach((val, index2) => { + details.stateArr[index2].maxNum = cargoName.maxNum; details.stateArr[index2].isCheck = val.questNum === 0 ? false : true; details.stateArr[index2].value = val.questNum; }); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1374", "details.stateArr :>> ", details.stateArr); } } }; @@ -67617,7 +67495,7 @@ ${i3} utils.ttsspke("取消当前操作"); }; const batchEditState = () => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1259", "修改"); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1390", "修改"); initState(); popUp_EditState.value.setDetails({ title: "状态修改", @@ -67641,7 +67519,7 @@ ${i3} utils.ttsspke("成功修改" + _number + "件"); popUp_EditState.value.details.showPopUp = false; details.showControl = false; - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1294", "111 :>> ", 111); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1425", "111 :>> ", 111); } }); }; @@ -67713,7 +67591,6 @@ ${i3} } }; const handleShowSelect = (index2) => { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1378", "222 :>> ", 222); details.materialChooseIndex = index2 === details.materialChooseIndex ? 0 : index2; }; const handleChooseMaterial = (item) => { @@ -67769,31 +67646,24 @@ ${i3} confirmText: "确认上架", success() { const { positionCode, allocationId } = details.positionInfo; - let content = ""; let _number = 0; - if (positionCode) { - for (let i2 = 0; i2 <= details.renderList.length - 1; i2++) { - const _item = details.renderList[i2]; - if (_item.isChoose) { - _item.allocationId = allocationId; - _item.allocation = positionCode; - _item.isChange = true; - _number++; - if (_item.questStatus !== 1) { - details.renderList[i2].questStatus = 1; - details.scanNum++; - } + if (!positionCode) + return utils.handleToast("上架失败, 库位数据有误"); + for (let i2 = 0; i2 <= details.renderList.length - 1; i2++) { + const _item = details.renderList[i2]; + if (_item.isChoose) { + _item.allocationId = allocationId; + _item.positionCode = positionCode; + _item.isChange = true; + _number++; + if (_item.questStatus !== 1) { + details.renderList[i2].questStatus = 1; + details.scanNum++; } - _item.isChoose = false; } - content = "上架成功" + _number + "件"; - } else - content = "上架失败, 库位数据有误"; - uni.showToast({ - title: content, - icon: "none" - }); - utils.ttsspke(content); + _item.isChoose = false; + } + utils.handleToast("上架成功" + _number + "件"); details.positionInfo.allocationId = ""; details.positionInfo.positionCode = ""; popUp_Up.value.details.showPopUp = false; @@ -67852,17 +67722,18 @@ ${i3} } _item.isCheck = true; _item.value = 1; - if (_item.title === "破损" || _item.title === "不可修复") + if (_item.title === "破损" || _item.title === "不可修复") { details.stateArr[0].value = 1; + details.stateArr[0].isCheck = true; + } } else { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1570", "details.stateArr[0].value :>> ", details.stateArr[0].value); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1692", "details.stateArr[0].value :>> ", details.stateArr[0].value); if (_item.title === "在库") return; if (details.stateArr[0].value === 0 && _item.title === "破损" || details.stateArr[0].value === 0 && _item.title === "不可修复") return; _item.isCheck = !_item.isCheck; - _item.disabled = !_item.isCheck; - if (_item.disabled && _item.code !== details.stateArr[0].code) + if (!_item.isCheck && _item.code !== details.stateArr[0].code) _item.value = 0; } }; @@ -67877,15 +67748,17 @@ ${i3} showPopUp: true, success() { if (tabBarCode.value === 1) { - const _value = details.stateArr.find((val) => val.isCheck); - _item.cargoName = _value.code; + for (let i2 = 0; i2 < details.stateArr.length; i2++) { + if (details.stateArr[i2].isCheck) + _item.cargoName = details.stateArr[i2].code; + } } else { details.stateArr.forEach((val) => { if (val.isCheck && Number(val.value) !== 0) _item[val.name] = Number(val.value); }); } - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1602", "_item :>> ", _item); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1724", "_item :>> ", _item); if (_item.questStatus !== 1) details.scanNum++; _item.questStatus = 1; @@ -67902,23 +67775,18 @@ ${i3} confirmText: "确认上架", showPopUp: true, success() { - let content = ""; const { allocationId, positionCode } = details.positionInfo; - if (positionCode) { - _item.allocationId = allocationId; - _item.allocation = positionCode; - if (_item.questStatue !== 1) - details.scanNum++; - _item.questStatus = 1; - _item.isChange = true; - content = "上架成功"; - } else - content = "上架失败, 库位数据有误"; - uni.showToast({ - title: content, - icon: "none" - }); - utils.ttsspke(content); + if (!positionCode) + return utils.handleToast("上架失败, 库位数据有误"); + _item.oldAllocationId = _item.allocationId; + _item.oldAllocation = _item.positionCode; + _item.allocationId = allocationId; + _item.positionCode = positionCode; + if (_item.questStatue !== 1) + details.scanNum++; + _item.questStatus = 1; + _item.isChange = true; + utils.handleToast("上架成功"); details.positionInfo.positionCode = ""; details.positionInfo.allocationId = ""; popUp_Up.value.details.showPopUp = false; @@ -67960,6 +67828,7 @@ ${i3} materialName: details.addInfo.materialName, cargoName: 10, stockNum: _number, + maxNum: _number, isChoose: false, /** 为手动添加 */ isManuallyAdd: true, @@ -67968,13 +67837,14 @@ ${i3} }; if (details.pageType === 2) { _order.allocationId = details.pageInfos.allocationId; - _order.allocation = details.pageInfos.positionCode; - } else if (details.pageType === 3) { - _order.orderCode = details.pageInfos.orderCode; - _order.orderId = details.pageInfos.orderId; + _order.positionCode = details.pageInfos.positionCode; + _order.oldAllocationId = "暂无数据"; + _order.oldAllocation = "暂无数据"; } else if (details.pageType === 4) { _order.trayCode = details.pageInfos.trayCode; _order.trayId = details.pageInfos.trayId; + _order.oldTrayCode = "暂无数据"; + _order.oldTrayId = "暂无数据"; } details.stockList.push(_order); details.scanNum++; @@ -68024,6 +67894,7 @@ ${i3} clientName: details.addInfo.clientName, cargoName: 10, stockNum: _number, + maxNum: _number, isChoose: false, /** 为手动添加 */ isManuallyAdd: true, @@ -68032,13 +67903,14 @@ ${i3} }; if (details.pageType === 2) { _order.allocationId = details.pageInfos.allocationId; - _order.allocation = details.pageInfos.positionCode; - } else if (details.pageType === 3) { - _order.orderCode = details.pageInfos.orderCode; - _order.orderId = details.pageInfos.orderId; + _order.positionCode = details.pageInfos.positionCode; + _order.oldAllocationId = "暂无数据"; + _order.oldallocation = "暂无数据"; } else if (details.pageType === 4) { _order.trayCode = details.pageInfos.trayCode; _order.trayId = details.pageInfos.trayId; + _order.oldTrayCode = "暂无数据"; + _order.oldTrayId = "暂无数据"; } details.stockList.push(_order); details.scanNum++; @@ -68072,8 +67944,14 @@ ${i3} break; } }; - const inputNum = (_item) => { - let _maxNum = details.stateArr[0].value - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value; + const inputNum = (_item, index2) => { + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1953", "index :>> ", index2); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1954", "_item :>> ", _item); + const whiteArr = [2, 4, 5]; + let _maxNum = _item.maxNum - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value; + if (whiteArr.includes(index2)) + _maxNum += Number(details.stateArr[index2].value); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1961", "_maxNum :>> ", _maxNum); let _number = Number(_item.value); if (_number !== _number) return _item.value = 0; @@ -68081,6 +67959,8 @@ ${i3} return _item.value = 0; else if (_maxNum < 0) _item.value = 0; + else if (_item.value > _maxNum) + _item.value = _maxNum; else _item.value = _number; }; @@ -68101,14 +67981,7 @@ ${i3} questDetailList: [] }; details.orderList.forEach((val) => { - if (Number(val.questStatus) !== 1) - return; - if (!val.isManuallyAdd && Number(val.cargoName) === 10) { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1864", "1 :>> ", 1); - submitData.questDetailIds.push(val.questDetailId); - if (!val.isChange) - return; - } + submitData.questDetailIds.push(val.questDetailId); const _item = { /** 在库数量 */ stockNum: 1, @@ -68123,9 +67996,6 @@ ${i3} /** 未入库数量 */ noReceivedNum: 0, id: val.questDetailId, - /** 上架修改后的库位id */ - groundingAllocationId: val.allocationId, - groundingPositionCode: val.allocation, questId: details.pageInfos.questId, questNum: details.pageInfos.questNum, orderCode: val.orderCode, @@ -68135,17 +68005,29 @@ ${i3} isNew: 0 }; _item.isNew = val.isManuallyAdd ? 1 : 0; - if (val.isNew || val.isManuallyAdd) { - if (details.pageType === 2) { - _item.allocationId = details.pageInfos.allocationId; - _item.positionCode = details.pageInfos.allocation; - } else if (details.pageType === 4) { - _item.trayCode = val.trayCode; - _item.trayId = val.trayId; + if (details.pageType === 2) { + if (val.oldAllocationId) { + _item.groundingPositionCode = val.positionCode; + _item.groundingAllocationId = val.allocationId; + } + delete _item.trayCode; + delete _item.trayId; + } else if (details.pageType === 3) { + if (val.oldAllocationId) { + _item.groundingPositionCode = val.positionCode; + _item.groundingAllocationId = val.allocationId; } - _item.orderPackageCode = val.orderPackageCode; - _item.orderPackageId = val.orderPackageId; + } else if (details.pageType === 4) { + if (val.oldTrayCode) { + _item.newTrayCode = val.trayCode; + _item.newTrayId = val.trayId; + } + delete _item.groundingPositionCode; + delete _item.groundingAllocationId; } + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2060", "val :>> ", val); + _item.orderPackageCode = val.orderPackageCode; + _item.orderPackageId = val.orderPackageId; const _whiteCodeArr = [10, 20, 40]; if (!_whiteCodeArr.includes(Number(val.cargoName))) _item.stockNum = 0; @@ -68156,11 +68038,7 @@ ${i3} details.stockList.forEach((val) => { if (Number(val.questStatus) !== 1) return; - if (!val.isManuallyAdd && !val.isNew && val.lossNum === 0 && val.deliveNum === 0 && val.wornNum === 0 && val.noRepairNum === 0 && val.noReceivedNum === 0 && Number(val.cargoName) === 1) { - submitData.questDetailIds.push(val.questDetailId); - if (!val.isChange) - return; - } + submitData.questDetailIds.push(val.questDetailId); const _item = { /** 在库数量 */ stockNum: val.stockNum || 0, @@ -68174,9 +68052,6 @@ ${i3} noRepairNum: val.noRepairNum || 0, /** 未入库数量 */ noReceivedNum: val.noReceivedNum || 0, - /** 上架后的库位id */ - groundingAllocationId: val.allocationId, - groundingPositionCode: val.allocation, id: val.questDetailId, questId: details.pageInfos.questId, waybillNumber: val.waybillNumber, @@ -68189,32 +68064,43 @@ ${i3} questTarget: val.questTarget, isNew: 0 }; - _item.stockNum = _item.stockNum - _item.lossNum - _item.deliveNum - _item.noReceivedNum; + _item.stockNum = val.maxNum - _item.lossNum - _item.deliveNum - _item.noReceivedNum; + _item.quantity = _item.stockNum; _item.isNew = val.isManuallyAdd ? 1 : 0; - if (_item.isNew === 1) { - if (details.pageType === 2) { - _item.allocationId = details.pageInfos.allocationId; - _item.positionCode = details.pageInfos.allocation; - } else if (details.pageType === 4) { - _item.trayCode = val.trayCode; - _item.trayId = val.trayId; + if (details.pageType === 2) { + if (val.oldAllocationId) { + _item.groundingPositionCode = val.positionCode; + _item.groundingAllocationId = val.allocationId; + } + delete _item.trayCode; + delete _item.trayId; + } else if (details.pageType === 3) { + if (val.oldAllocationId) { + _item.groundingPositionCode = val.positionCode; + _item.groundingAllocationId = val.allocationId; } + } else if (details.pageType === 4) { + if (val.oldTrayId) { + _item.newTrayCode = val.trayCode; + _item.newTrayId = val.trayId; + } + delete _item.groundingPositionCode; + delete _item.groundingAllocationId; } submitData.questDetailList.push(_item); }); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1993", "submitData :>> ", submitData); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2157", "submitData :>> ", submitData); const res = await postWarehouseTaskAddDataInfo(submitData); - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1995", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2159", "res :>> ", res); const { code: code2 } = res; if (code2 === 200) { utils.ttsspke("盘点成功"); const timer = setTimeout(() => { - uni.navigateBack(); clearTimeout(timer); }, 1e3); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2006", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2170", "err :>> ", err); } finally { uni.hideLoading(); } @@ -68548,10 +68434,11 @@ ${i3} 1 /* TEXT */ ), - vue.createElementVNode("view", { + details.pageType !== 3 ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, style: vue.normalizeStyle({ color: item.isManuallyAdd ? "#f00" : "#000" }), onClick: ($event) => editOrderCode(item) - }, " 合同号: " + vue.toDisplayString(item.orderCode || "暂无数据"), 13, ["onClick"]) + }, " 合同号: " + vue.toDisplayString(item.orderCode || "暂无数据"), 13, ["onClick"])) : vue.createCommentVNode("v-if", true) ], 8, ["onClick"])) : vue.unref(tabBarCode) === 2 && Number(item.questTarget) === 2 ? (vue.openBlock(), vue.createElementBlock( vue.Fragment, { key: 1 }, @@ -68569,13 +68456,13 @@ ${i3} 1 /* TEXT */ ), - vue.createElementVNode( + details.pageType !== 3 ? (vue.openBlock(), vue.createElementBlock( "view", - null, + { key: 0 }, " 合同号: " + vue.toDisplayString(item.orderCode || "暂无数据"), 1 /* TEXT */ - ) + )) : vue.createCommentVNode("v-if", true) ], 12, ["onClick"]) ], 64 @@ -68593,19 +68480,19 @@ ${i3} 1 /* TEXT */ ), - vue.createElementVNode( + details.pageType !== 3 ? (vue.openBlock(), vue.createElementBlock( "view", - null, + { key: 0 }, " 合同号: " + vue.toDisplayString(item.orderCode || "暂无数据"), 1 /* TEXT */ - ) + )) : vue.createCommentVNode("v-if", true) ])) : vue.createCommentVNode("v-if", true), vue.createElementVNode("view", { class: "main_render_item" }, [ vue.createElementVNode( "view", null, - " 库位: " + vue.toDisplayString(item.allocation || "暂无数据"), + " 库位: " + vue.toDisplayString(item.positionCode || "暂无数据"), 1 /* TEXT */ ), @@ -68623,7 +68510,7 @@ ${i3} vue.createElementVNode( "view", null, - " 数量: " + vue.toDisplayString(item.stockNum || "暂无数据"), + " 数量: " + vue.toDisplayString(item.maxNum || "暂无数据"), 1 /* TEXT */ ) @@ -68633,7 +68520,7 @@ ${i3} )) : (vue.openBlock(), vue.createElementBlock( "view", { key: 1 }, - " 状态: " + vue.toDisplayString(details.stateArr.find((val) => val.code === Number(item.cargoName)).title || "暂无数据"), + " 状态: " + vue.toDisplayString((details.stateArr.find((val) => val.code === Number(item.cargoName)) || {}).title || "暂无数据"), 1 /* TEXT */ )) @@ -68642,7 +68529,7 @@ ${i3} vue.unref(tabBarCode) !== 1 ? (vue.openBlock(), vue.createElementBlock( "view", { key: 0 }, - " 状态: " + vue.toDisplayString(details.stateArr.find((val) => val.code === Number(item.cargoName)).title || "暂无数据"), + " 状态: " + vue.toDisplayString((details.stateArr.find((val) => val.code === Number(item.cargoName)) || {}).title || "暂无数据") + " " + vue.toDisplayString(item.cargoName), 1 /* TEXT */ )) : vue.createCommentVNode("v-if", true), @@ -68676,7 +68563,7 @@ ${i3} class: "button", onClick: ($event) => handleState(item) }, " 处理 ", 8, ["onClick"]), - details.pageType !== 4 ? (vue.openBlock(), vue.createElementBlock("view", { + details.pageType !== 4 && details.pageType !== 2 ? (vue.openBlock(), vue.createElementBlock("view", { key: 0, class: "button", onClick: ($event) => handleItemUp(item) @@ -68744,7 +68631,7 @@ ${i3} (vue.openBlock(true), vue.createElementBlock( vue.Fragment, null, - vue.renderList(details.stateArr, (item) => { + vue.renderList(details.stateArr, (item, index2) => { return vue.openBlock(), vue.createElementBlock("view", { key: item, class: "popUp_row" @@ -68794,8 +68681,8 @@ ${i3} key: 0, class: "input", type: "number", - onBlur: () => inputNum(item), - disabled: item.disabled, + onBlur: () => inputNum(item, index2), + disabled: item.disabled || !item.isCheck, "onUpdate:modelValue": ($event) => item.value = $event }, null, 40, ["onBlur", "disabled", "onUpdate:modelValue"])), [ [vue.vModelText, item.value] @@ -68807,7 +68694,7 @@ ${i3} vue.createElementVNode( "view", { class: "input" }, - vue.toDisplayString(item.value - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value), + vue.toDisplayString(item.maxNum - details.stateArr[2].value - details.stateArr[4].value - details.stateArr[5].value), 1 /* TEXT */ ) @@ -68876,6 +68763,43 @@ ${i3} 512 /* NEED_PATCH */ ), + vue.createCommentVNode(" 弹出层 -- 是否移库 "), + vue.createVNode( + _component_PopUp, + { + ref_key: "popUp_RemoveAllocation", + ref: popUp_RemoveAllocation + }, + { + default: vue.withCtx(() => [ + vue.createElementVNode( + "view", + { class: "" }, + " 包条码: " + vue.toDisplayString(details.removeTray.orderPackageCode), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + { class: "" }, + " 该包条绑定库位: " + vue.toDisplayString(details.removeTray.positionCode), + 1 + /* TEXT */ + ), + vue.createElementVNode( + "view", + { class: "" }, + " 本托盘: " + vue.toDisplayString(details.pageInfos.trayCode), + 1 + /* TEXT */ + ) + ]), + _: 1 + /* STABLE */ + }, + 512 + /* NEED_PATCH */ + ), vue.createCommentVNode(" 弹出层 -- 新增 "), vue.createVNode( _component_PopUp, @@ -69357,7 +69281,7 @@ ${i3} vue.createElementVNode( "text", null, - vue.toDisplayString(details.detailsInfo.allocation), + vue.toDisplayString(details.detailsInfo.positionCode), 1 /* TEXT */ ) diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index 9437e28..c72c651 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -7,8 +7,8 @@ "id": "__UNI__EB22F37", "name": "货无忧", "version": { - "name": "1.1.25", - "code": 1125 + "name": "1.1.26", + "code": 1126 }, "description": "", "developer": {