diff --git a/pages.json b/pages.json index 54578d8..5ca5e11 100644 --- a/pages.json +++ b/pages.json @@ -127,6 +127,14 @@ "navigationStyle": "custom" } + } + ,{ + "path" : "pages/outbound/quhuo-confirm", + "style" : + { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/in/store-info", @@ -385,6 +393,14 @@ "navigationStyle": "custom" } + } + ,{ + "path" : "pages/entry/mater-group2", + "style" : + { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/entry/empty-vehicle-instore", diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue index 3eff11d..2dd200b 100644 --- a/pages/common/mater-list.vue +++ b/pages/common/mater-list.vue @@ -18,28 +18,16 @@ - - - - - - - + - - - - - - - +
物料编码 物料名称 物料规格单位物料单重物料批次物料数量载具编码仓库编码物料编码
{{e.material_code}} {{e.material_name}} {{e.material_spec}}{{e.unit_id}}{{e.single_weight}}{{e.pcsn}}{{e.qty}}{{e.vehicle_code}}{{e.stor_code}}{{e.material_code}}
@@ -93,7 +81,7 @@ this._getMaterialList() }, async _getMaterialList () { - let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '') + let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '', this.$route.query.code) // this.dataList = res.data this.totalCount = res.totalElements if (res.totalElements > 0) { diff --git a/pages/entry/mater-group.vue b/pages/entry/mater-group.vue index 709180a..0af31a9 100644 --- a/pages/entry/mater-group.vue +++ b/pages/entry/mater-group.vue @@ -4,14 +4,6 @@ - - - 源单编码 - - - - - 载具编码 @@ -68,11 +60,27 @@ + + + 地面站点 + + + + + + + + 源单编码 + + + + + - + @@ -93,6 +101,7 @@ title: '', val1: '', val2: '', + val3: '', currentData: {}, options: [], index: '', @@ -120,13 +129,13 @@ }, async _groupPlate () { this.disabled = true - if (JSON.stringify(this.currentData) === '{}') { + if (JSON.stringify(this.currentData) === '{}' || !this.val3) { this.disabled = false return } try { this.currentData.stor_code = this.index - let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1) + let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1, this.val3) uni.showToast({ title: res.message, icon: 'none' diff --git a/pages/entry/mater-group2.vue b/pages/entry/mater-group2.vue new file mode 100644 index 0000000..48057f4 --- /dev/null +++ b/pages/entry/mater-group2.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index b48ef71..75e1005 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -41,8 +41,8 @@ return { userName: '', menuList: [ - {title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {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: '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: '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 efeed0b..c173e96 100644 --- a/pages/outbound/line-callmater.vue +++ b/pages/outbound/line-callmater.vue @@ -113,6 +113,7 @@ let res = await getRegion('YZHJ') if (res) { this.options = res + this.index = res[0].value } else { this.options =[] } diff --git a/pages/outbound/quhuo-confirm.vue b/pages/outbound/quhuo-confirm.vue new file mode 100644 index 0000000..9b06924 --- /dev/null +++ b/pages/outbound/quhuo-confirm.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/utils/getData3.js b/utils/getData3.js index 93e3314..2271c55 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -33,349 +33,16 @@ export const getRegion = (region, page, size) => request({ data: {region: region, page: page, size: size} }) // 获取物料列表 -export const getMaterialList = (search, page, size) => request({ +export const getMaterialList = (search, page, size, region) => request({ url:'api/pda/iosIn/getMaterialList', - data: {search: search, page: page, size: size} + data: {search: search, page: page, size: size, region: region} }) -// export const getMaterialList = () => { -// let res = { -// "totalElements": 2067, -// "message": "查询成功", -// "content": null, -// "code": "200", -// "msg": null, -// "data": [ -// { -// "cubage": null, -// "material_model": null, -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "塑料托盘", -// "update_time": "2025-07-08 16:32:10", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "空托盘", -// "height": null, -// "create_time": "2025-07-08 16:32:10", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "14", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1", -// "material_code": "KT001", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": null, -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "SJD-208E，国标，3*1.0*2.1m，带漏电保护", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "漏保电源线", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608350371840", -// "material_code": "105030400000055", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "CFZ-8.8S10S-DYX", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "CFZ-8.8S10S-DYX YZ3*2.5+2*1.5，线长2.8m/根", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线10S", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608367149056", -// "material_code": "105030300101001", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "OL-503-501B", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "欧标烟斗插，16A/250V，3*1.0mm2，3.2m，黑色，TUV;VDE，旧图号：OL-503-501，250旗型插片，外露2.5m.", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线OL-503E", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608388120576", -// "material_code": "105010205031001", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "OL-503-501C", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "美标插，13A/125V，3*16AWG，3.5m，耐温105℃，黑色，UL，SJT，旧图号：OL-503-501，250旗型插片，外露2.8m", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608425869312", -// "material_code": "105010250301002", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "G001-501D", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "韩规，16A/250V，3*0.75mm2，2.52m，灰色，KC，250旗插带锁，外露1.8m", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608438452224", -// "material_code": "105011500101001", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "G125-501C", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "美标插，15A/125V，3*14AWG，8.15m，耐温105℃，黑色，UL，SJT，旧图号：OJ-G125E-501A，250直插带锁，外露7.6m", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线OL-G125E", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608451035136", -// "material_code": "105010201251001", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "D080-501C", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "美标插，15A/125V，3*14AWG，8.15m，耐温105℃，黑色，UL，，15A/125V，3*14AWG，8.15m，耐温105℃，黑色，UL，SJT，250旗插带锁，外露7.6m", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608459423744", -// "material_code": "105011008001001", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "901-501C", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "美标插，15A/125V，3*14AWG，3.5m，耐温105℃，黑色，UL，旧图号：901E-501，尾部O型圈，外露3m", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线SJ-901E", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608467812352", -// "material_code": "105010209011002", -// "create_name": "admin", -// "update_optid": "1" -// }, -// { -// "cubage": null, -// "material_model": "D059-210D", -// "is_used_time": null, -// "net_weight": null, -// "english_name": null, -// "weight_unit_id": null, -// "cubage_unit_id": null, -// "material_spec": "韩插，16A/250V，3*1.5mm2，2.43m，黑色，KC，外露1.8m，，蓝色250#直插带锁，棕色250#旗插带锁", -// "update_time": "2025-07-10 15:55:55", -// "update_optname": "admin", -// "ext_id": null, -// "len_unit_id": null, -// "create_id": "1", -// "gross_weight": null, -// "material_name": "电源线-韩标", -// "height": null, -// "create_time": "2025-07-10 15:55:55", -// "ass_unit_id": null, -// "print_no": null, -// "length": null, -// "material_type_id": null, -// "base_unit_id": "1", -// "is_used": "1", -// "is_delete": "0", -// "approve_fileno": null, -// "width": null, -// "material_id": "1943217608480395264", -// "material_code": "105010200591005", -// "create_name": "admin", -// "update_optid": "1" -// } -// ] -// } -// return res -// } - // 入库管理 // 物料组盘确认 -export const groupPlate = (mid, pcsn, qty, vcode, ecode) => request({ +export const groupPlate = (mid, pcsn, qty, vcode, ecode, siteCode) => request({ url:'api/pda/iosIn/groupPlate', - data: {material_id: mid, pcsn: pcsn, qty: qty, vehicle_code: vcode, ext_code: ecode} + data: {material_id: mid, pcsn: pcsn, qty: qty, vehicle_code: vcode, ext_code: ecode, siteCode} }) // 组盘入库确认 export const confirmIn = (vcode, sitecode, sid) => request({ @@ -409,6 +76,11 @@ export const getMaterialDtl = (sid, search) => request({ url:'api/pda/iosOut/getMaterialDtl', data: {sect_id: sid, search: search} }) +// 获取取货确认回空架的点位 +export const getReturnPoint = (page, size) => request({ + url:'api/pda/iosOut/getReturnPoint', + data: {page: '1', size: '100'} +}) // 线边仓出库确认 export const materialConfirm = (sid, siteCode, obj) => request({ url:'api/pda/iosOut/materialConfirm', @@ -430,9 +102,9 @@ export const iosOutgetVehicleMaterial = (search) => request({ data: {search: search} }) // 出库确认 -export const confirm = (gid, scode, type) => request({ +export const confirm = (gid, scode, type, isAutoReturn, siteCode) => request({ url:'api/pda/iosOut/confirm', - data: {group_id: gid, storagevehicle_code: scode, type: type} + data: {group_id: gid, storagevehicle_code: scode, type: type, isAutoReturn: isAutoReturn, siteCode: siteCode} }) // 货架绑定/解绑 export const bindOrUnbind = (siteCode, shelfCode, mode) => request({