diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index a237345..7118b39 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -479,5 +479,8 @@ export default { plan: '计划数量', QuantityShelves: '已上架数量', TheShelves: '已下架数量', + Box: '箱码', + enterBox: '请输入箱码', + ScanBoxCode: '请先扫描箱码', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 8120fd1..a9f9e23 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -479,5 +479,8 @@ export default { plan: 'Plan QTY', QuantityShelves: 'Putaway QTY', TheShelves: 'Shelves QTY', + Box: 'Box Code', + enterBox: 'Please enter the box code', + ScanBoxCode: 'Please scan the box code first', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 4003cde..878c27f 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -479,5 +479,8 @@ export default { plan: 'план', QuantityShelves: 'На крыше', TheShelves: 'С полок', + Box: 'Ящик ярд', + enterBox: 'Введите код ящика', + ScanBoxCode: 'Сначала просканируйте ящики', }, }; diff --git a/src/pages.json b/src/pages.json index faf75b1..800503c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1090,6 +1090,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details", + "style": { + "navigationBarTitleText": "备件出库明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/handover/feeding/RUS-Location", "style": { diff --git a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue index 1ef6f75..a040906 100644 --- a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue +++ b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue @@ -48,7 +48,7 @@ - + @@ -136,6 +136,7 @@ export default class productCheckReceipt extends BasePage { this.barcode = ''; this.histroyItem = {}; this.productCodeList = {}; + this.model.empty(); await this.query(); } } diff --git a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts index 25e908e..c78f1e6 100644 --- a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts +++ b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts @@ -46,6 +46,11 @@ export class wholeTransfer extends VuexModule { const SubmitCode = result.code; return { SubmitCode }; } + @MutationAction + async empty() { + const productCodeList = []; + return { productCodeList }; + } } export default getModule(wholeTransfer); diff --git a/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/config.ts b/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/config.ts index 17ff94a..9f02e47 100644 --- a/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/config.ts +++ b/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/config.ts @@ -4,36 +4,41 @@ import vm from '@/main'; export const headers = [ { - label: vm.$t('message.Delivery'), - key: 'proMoveCode', //单号 + label: vm.$t('message.dn_OddNumbers'), + key: 'order1', width: 250, }, { - label: vm.$t('message.ModelCode'), - key: 'materialCode', //型号编码 + label: vm.$t('message.Line'), + key: 'order2', width: 220, }, { - label: vm.$t('message.ModelName'), - key: 'materialDesc', //型号名称 + label: vm.$t('message.matcode'), + key: 'productCode', width: 430, }, + { + label: vm.$t('message.po_MaterielDes'), + key: 'productDescZh', + width: 640, + }, { label: vm.$t('message.product_barCode'), - key: 'barCode', //条码号 - width: 260, + key: 'barcode', + width: 640, }, { - label: vm.$t('message.SourceLocation'), - key: 'wlFromCode', //源库位 + label: vm.$t('message.product_Location'), + key: 'locCode', }, { - label: vm.$t('message.Warehouse_TargetLocation'), - key: 'wlToCode', //目标库位 + label: vm.$t('message.Operation'), + key: 'createdBy', }, { label: vm.$t('message.operatingTime'), - key: 'moveTime', //操作时间 - width: 465, + key: 'createdDate', + width: 475, }, ]; diff --git a/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details.vue b/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details.vue index 5f2919d..f4340a2 100644 --- a/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details.vue +++ b/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details.vue @@ -4,10 +4,10 @@ - {{ $t('message.Warehouse_TransferDetails') }} + {{ $t('message.detailed') }} - + diff --git a/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/model.ts b/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/model.ts index 9e73c52..0eed4d4 100644 --- a/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/model.ts +++ b/src/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/model.ts @@ -1,149 +1,79 @@ -import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import store from '@/store'; import http from '@/utils/request'; import { url } from '@/utils/url'; import { session } from '@/store/modules/session'; -import vm from '@/main'; -// import { page } from '@/utils/page'; - -class OrderInInfo { - productDescZh?: string; - qty?: string; - custCode?: string; - custCodeName?: string; - productCode?: string; - locCode?: string; - barcode?: string; - // actualQty?: string; -} - @Module({ namespaced: true, dynamic: true, store, - name: 'product.Semi-finished-rowTransfer', + name: 'page.raw.ingoods.SpareInbound.SparePartsWarehouse', }) export class wholeTransfer extends VuexModule { - /** - * 库位地点列表 - */ WlList = []; - userDefined: any = ''; - detailedList: any; - code = ''; - delCode = ''; - removeList: any = []; - removeMaterialList: any = []; - dnNo = ''; - orderInInfo: OrderInInfo = new OrderInInfo(); @MutationAction async queryLocation() { - const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationSfgLine, { - params: { - factoryCode: session.factoryCode, - loginName: session.loginName, - }, + const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, { + factoryCode: session.factoryCode, + loginName: session.loginName, }); - console.log('库位数据', result); const WlList = result.data.map((_: any) => ({ label: _.locationCode, value: _.locationCode, })); return { WlList }; } - - /** - * 查询单号 - * 查询DN单号 - * @param dnNo - */ + orderNoItemList: any = []; + productCodeList: any = []; @MutationAction - async getProductCode(barcode: any) { - const res: any = await http.post(url.warehouse.wholeTransfer.getOdsRawStorageSnNew, { + async queryOrderNo(nxOutCode: any) { + const result: any = await http.post(url.warehouse.wholeTransfer.findSpareInfoByDN, { + factoryCode: session.factoryCode, + loginName: session.loginName, + nxOutCode, + }); + const orderNoItemList = result.data; + const productCodeList = result.data.map((_: any) => ({ + label: _.materialCode, + value: _.materialCode, + })); + return { orderNoItemList, productCodeList }; + } + BoxResCode: any = ''; + BoxObj: any = {}; + @MutationAction + async BoxCode(barcode: any) { + const result: any = await http.post(url.warehouse.wholeTransfer.scanBox, { factoryCode: session.factoryCode, loginName: session.loginName, barcode, }); - const code = res.code; - const orderInInfo = res.data.records[0]; - if (orderInInfo.custCode == '0') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any; - } else if (orderInInfo.custCode == '1') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any; - } else if (orderInInfo.custCode == '2') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any; - } else if (orderInInfo.custCode == '4') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any; - } - return { orderInInfo, code }; + const BoxResCode = result.code; + const BoxObj = result.data; + return { BoxResCode, BoxObj }; } - //退扫 + SubmitCode: any = ''; @MutationAction - async codeDel(params: any) { - const res: any = await http.post(url.warehouse.wholeTransfer.del, params); - const delCode = res.code; - return { delCode }; + async OnSubmit(params: any) { + const result: any = await http.post(url.warehouse.wholeTransfer.saleScan, params); + const SubmitCode = result.code; + return { SubmitCode }; } - //清除数据 @MutationAction async empty() { - const orderInInfo: any = []; - // const userDefined = ''; - // const WlList = []; - const code = ''; - return { orderInInfo, code }; + const productCodeList = []; + return { productCodeList }; } + DetailList: any = []; @MutationAction - async onTakeoutConfirm(list: any) { - const records: any = await http.post(url.warehouse.rowTransfer.confirmMoveRussia, list); - const code = records.code; - return { code }; - } - //生成移库码 - @MutationAction - async getCpMoveBatchNo(loginName: any) { - const res: any = await http.post(url.warehouse.rowTransfer.getSfgMoveBatchNo, loginName); - const userDefined: any = res.data; - return { userDefined }; - } - //查询已扫物料 - @MutationAction - async QueryHistory(params: any = {}) { - const res: any = await http.post(url.warehouse.rowTransfer.queryGroupListByMoveCode, params); - const removeList: any = res.data; - const removeMaterialList: any = []; - res.data.forEach((item: any) => { - const arr: any = { - value: item.materialCode, - laber: item.materialCode, - }; - removeMaterialList.push(arr); - }); - return { removeList, removeMaterialList }; - } - //查询明细 - @Action({ commit: 'updateCheckedOrderInInfoListKw' }) - async querydetaildlist(userDefined4: any) { - const res: any = await http.post('/wmspda/fg/queryListByMoveCode', { - loginName: session.loginName, + async SearchDetail(order1: any) { + const res: any = await http.post(url.warehouse.wholeTransfer.querySpareListInfoByDnNo, { factoryCode: session.factoryCode, - proMoveCode: userDefined4, - }); - console.log('明细》》》》》》》》》', res.list); - this.detailedList = res.data; - return res; - } - @Action({ commit: 'updateCheckedOrderInInfoListKw' }) - async changeOrderInLocation(kw: string) { - await http.post('/wmspda/material/orderin/enter', { loginName: session.loginName, - // loginName: '1999', - warehouseCode: '', - factoryCode: session.factoryCode, - // factoryCode: '1999', - locationCode: kw, + order1, }); - return kw; + const DetailList = res.data; + return { DetailList }; } } diff --git a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue index f271970..58f8f02 100644 --- a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue +++ b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/index.vue @@ -48,7 +48,7 @@ --> - + @@ -136,6 +136,7 @@ export default class productCheckReceipt extends BasePage { this.barcode = ''; this.histroyItem = {}; this.productCodeList = {}; + this.model.empty(); await this.query(); } } diff --git a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts index 30755e6..6f13c91 100644 --- a/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts +++ b/src/pages/raw/ingoods/SpareInbound/sparePartsShelves/model.ts @@ -46,6 +46,11 @@ export class wholeTransfer extends VuexModule { const SubmitCode = result.code; return { SubmitCode }; } + @MutationAction + async empty() { + const productCodeList = []; + return { productCodeList }; + } } export default getModule(wholeTransfer); diff --git a/src/utils/page.ts b/src/utils/page.ts index 16037a7..ddc3814 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -162,6 +162,9 @@ export const page = { SpareInboun: { details: '/pages/raw/ingoods/SpareInbound/Inbound/Local-details', }, + SparePartsWarehouse: { + details: '/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details', + }, }, warehouse: { index: '/pages/raw/warehouse/index', diff --git a/src/utils/url.ts b/src/utils/url.ts index 8199617..b2e22bd 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -268,8 +268,12 @@ export const url = { getSpareMdLocation: '/wmspda/sparePart/getSpareMdLocation', queryOnshelfOrder: '/wmspda/sparePart/queryOnshelfOrder', queryDownshelfOrder: '/wmspda/sparePart/queryDownshelfOrder', + findSpareInfoByDN: '/wmspda/fg/findSpareInfoByDN', upshelf: '/wmspda/sparePart/upshelf-scan', offshelf: '/wmspda/sparePart/offshelf-scan', + scanBox: '/wmspda/sparePart/scanBox', + saleScan: '/wmspda/fg/sparepart/sale/scan', + querySpareListInfoByDnNo: '/wmspda/fg/querySpareListInfoByDnNo', }, wholeLnventory: { content: '/wmspda/fg/findMaterialByPddNo',