diff --git a/manifest.json b/manifest.json index dda93ea..e057204 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "欧伦", "appid" : "__UNI__DE2F207", "description" : "欧伦WMS手持系统", - "versionName" : "1.0.5", - "versionCode" : 105, + "versionName" : "1.0.6", + "versionCode" : 106, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue index 2dd200b..929611e 100644 --- a/pages/common/mater-list.vue +++ b/pages/common/mater-list.vue @@ -81,6 +81,11 @@ this._getMaterialList() }, async _getMaterialList () { + alert(this.$route.query.code + 666) + // uni.showToast({ + // title: this.$route.query.code, + // icon: 'none' + // }) let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '', this.$route.query.code) // this.dataList = res.data this.totalCount = res.totalElements diff --git a/pages/home/home.vue b/pages/home/home.vue index 75e1005..eff00b8 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -42,7 +42,7 @@ userName: '', menuList: [ {title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group2'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]}, - {title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}]}, + {title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}]}, {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]}, {title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]}, // {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]}, diff --git a/pages/outbound/line-callmater.vue b/pages/outbound/line-callmater.vue index c173e96..10e491b 100644 --- a/pages/outbound/line-callmater.vue +++ b/pages/outbound/line-callmater.vue @@ -36,22 +36,22 @@ 物料名称 数量 + 物料规格 物料编码 批次号 库位 单位 - 物料规格 {{e.material_name}} {{e.qty}} + {{e.material_spec}} {{e.material_code}} {{e.pcsn}} {{e.struct_code}} {{e.qty_unit_name}} - {{e.material_spec}} @@ -195,6 +195,12 @@ } catch (e) { this.disabled = false } + }, + clearUp () { + this.val1 = '' + this.pkId = '' + this.pkObj = {} + this.dataList = [] } } } diff --git a/pages/outbound/line-transfer.vue b/pages/outbound/line-transfer.vue index 075eab2..72e493d 100644 --- a/pages/outbound/line-transfer.vue +++ b/pages/outbound/line-transfer.vue @@ -14,6 +14,16 @@ /> + + + 起点点位 + + + + + 站点类型 @@ -24,7 +34,7 @@ - 目标站点 + 终点站点 @@ -60,6 +70,7 @@ return { title: '', val1: '', + val3: '', val2: '', options: [{text:'站点', value:'1'},{text:'区域',value: '2'}], index: '', @@ -104,12 +115,12 @@ }, async _transferConfirm () { this.disabled = true - if (!this.val1 || !this.index) { + if (!this.val3 || !this.val1 || !this.index) { this.disabled = false return } try { - let res = await transferConfirm(this.val1, this.val2, this.index2) + let res = await transferConfirm(this.val3, this.val1, this.val2, this.index2) if (res.code === '200') { uni.showToast({ title: res.message, diff --git a/pages/outbound/quhuo-confirm.vue b/pages/outbound/quhuo-confirm.vue index 9b06924..1dc14f6 100644 --- a/pages/outbound/quhuo-confirm.vue +++ b/pages/outbound/quhuo-confirm.vue @@ -84,7 +84,7 @@ - + diff --git a/utils/getData3.js b/utils/getData3.js index 2271c55..4eb5d29 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -112,9 +112,9 @@ export const bindOrUnbind = (siteCode, shelfCode, mode) => request({ data: {siteCode: siteCode, shelfCode: shelfCode, mode: mode} }) // 转运确认 -export const transferConfirm = (scode, siteCode, rcode) => request({ +export const transferConfirm = (pointCode, scode, siteCode, rcode) => request({ url:'api/pda/iosOut/transferConfirm', - data: {storagevehicle_code: scode, siteCode: siteCode, region_code: rcode} + data: {pointCode: pointCode, storagevehicle_code: scode, siteCode: siteCode, region_code: rcode} }) // 空载具/CTU出库确认 export const vehicleOutConfirm = (sid, siteCode, qty) => request({