diff --git a/src/config/getData3.js b/src/config/getData3.js index 243f2df..852ff60 100644 --- a/src/config/getData3.js +++ b/src/config/getData3.js @@ -27,3 +27,23 @@ export const confirmGroupBucketAndBag = (mst, dtl) => post('api/pda/set/bucket/c mst: mst, dtl: dtl }) + +/** 粉料移库-2024/12/04 */ +// 1.1物料库存查询 +export const moveQueryMaterialList = (code, page, size) => post('api/pda/st/move/queryMaterialList', { + material_code: code, + page: page, + size: size +}) +// export const moveQueryMaterialList = (code, page, size) => { +// let res = { +// code: '1', +// rows: [{turnout_sect_name: 'turnout_sect_name', turnout_struct_code: 'turnout_struct_code', storagevehicle_code: 'storagevehicle_code', material_code: 'material_code', material_name: 'material_name', pcsn: 'pcsn', stockrecord_id: '1', quality_scode: '01', ivt_level: '01', is_active: '01', qty: '100', qty_unit_name: 'pc'}] +// } +// return res +// } +// 1.2确认 +export const moveConfirm = (code, dtl) => post('api/pda/st/move/confirm', { + point_code: code, + dtl: dtl +}) diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue index edcc332..7bb5d40 100644 --- a/src/pages/login/Home.vue +++ b/src/pages/login/Home.vue @@ -78,6 +78,7 @@ --> +
@@ -122,7 +123,7 @@ export default { toPage (e) { // if (e.sonTree.length === 0) { // let name = e.path.substr(2) - // if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore') { + // if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'PowderMaterMoveStore') { // this.$store.dispatch('setKeepAlive', [name]) // } // this.$router.push(e.path.substr(2)) @@ -137,7 +138,7 @@ export default { }, toPage2 (e) { let name = e.path.substr(2) - if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill' || name === 'XingcaiDeliver') { + if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill' || name === 'XingcaiDeliver' || name === 'PowderMaterMoveStore') { this.$store.dispatch('setKeepAlive', [name]) } this.$router.push(e.path.substr(2)) @@ -163,7 +164,7 @@ export default { }, goInner (path) { let name = path.substr(1) - if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill') { + if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill' || name === 'PowderMaterMoveStore') { this.$store.dispatch('setKeepAlive', [name]) } this.$router.push(path) diff --git a/src/pages/xinrui/move/PowderMater.vue b/src/pages/xinrui/move/PowderMater.vue new file mode 100644 index 0000000..b8dcfae --- /dev/null +++ b/src/pages/xinrui/move/PowderMater.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/pages/xinrui/move/PowderMaterMoveStore.vue b/src/pages/xinrui/move/PowderMaterMoveStore.vue new file mode 100644 index 0000000..0c48144 --- /dev/null +++ b/src/pages/xinrui/move/PowderMaterMoveStore.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index aec9029..3e302a1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -110,6 +110,10 @@ const ScanOutStore = r => require.ensure([], () => r(require('../pages/xinrui/eq const UseReturn = r => require.ensure([], () => r(require('../pages/xinrui/equipment/UseReturn')), 'UseReturn') const RunLogFill = r => require.ensure([], () => r(require('../pages/xinrui/equipment/RunLogFill')), 'RunLogFill') +// 移库 +const PowderMaterMoveStore = r => require.ensure([], () => r(require('../pages/xinrui/move/PowderMaterMoveStore')), 'move') +const PowderMater = r => require.ensure([], () => r(require('../pages/xinrui/move/PowderMater')), 'move') + // 公用 const EquipSearchRadio = r => require.ensure([], () => r(require('../pages/xinrui/common/EquipSearchRadio')), 'common') const EquipSearchCheckbox = r => require.ensure([], () => r(require('../pages/xinrui/common/EquipSearchCheckbox')), 'common') @@ -544,6 +548,14 @@ export default new Router({ { path: '/InsideSoftWasteInStore', // 内部软废入库 component: InsideSoftWasteInStore + }, + { + path: '/PowderMaterMoveStore', // 粉料移库 + component: PowderMaterMoveStore + }, + { + path: '/PowderMater', // 粉料物料查询 + component: PowderMater } ], scrollBehavior (to, from, savedPosition) {