diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 0d61bc4..65044bd 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -585,5 +585,12 @@ export default { FactorySTOoutbound: '工厂间STO 出库', FactorySTOStorage: '工厂间STO 入库', ConfirmPosting: '确认过账？', + pickOrder: '拣选订单', + pickno: '拣选单号', + shurupickno: '请输入拣选单号', + pselctrowitem: '请选择一个行项目', + boxnoscan: '请输入箱码', + matscan: '请输入物料条码', + bosnum: '顺序/数量', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 79e3894..f4f0b9d 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -587,5 +587,12 @@ export default { FactorySTOoutbound: 'STO outbound between factories', FactorySTOStorage: 'STO storage between factories', ConfirmPosting: 'Confirm posting?', + pickOrder: 'Pick order', + pickno: 'Pick NO', + shurupickno: 'Please enter the pick number', + pselctrowitem: 'Please select a row item', + boxnoscan: 'Please enter the box code', + matscan: 'Please enter the material barcode', + bosnum: 'Box No/All', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 30e3b14..983a24c 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -578,5 +578,12 @@ export default { FactorySTOoutbound: 'Заводское хранилище STO', FactorySTOStorage: 'Заводское хранилище СТО', ConfirmPosting: 'Подтвердить счет?', + pickOrder: 'Выбирайте.', + pickno: 'Выбери номер', + shurupickno: 'Пожалуйста, введите номер списка', + pselctrowitem: 'Пожалуйста, выберите строку', + boxnoscan: 'Введите код ящика', + matscan: 'Введите штрих-код, пожалуйста', + bosnum: 'Порядок/количество', }, }; diff --git a/src/pages.json b/src/pages.json index d762d5f..f6909d2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1599,6 +1599,14 @@ "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } + }, + { + "path": "pages/raw/ingoods/SpareInbound/pickOrder/index", + "style": { + "navigationBarTitleText": "拣选订单", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } } ], "globalStyle": { diff --git a/src/pages/raw/ingoods/SpareInbound/pickOrder/config.ts b/src/pages/raw/ingoods/SpareInbound/pickOrder/config.ts new file mode 100644 index 0000000..17ff94a --- /dev/null +++ b/src/pages/raw/ingoods/SpareInbound/pickOrder/config.ts @@ -0,0 +1,39 @@ +/** + * 看单交接明细表格列 + */ +import vm from '@/main'; +export const headers = [ + { + label: vm.$t('message.Delivery'), + key: 'proMoveCode', //单号 + width: 250, + }, + { + label: vm.$t('message.ModelCode'), + key: 'materialCode', //型号编码 + width: 220, + }, + { + label: vm.$t('message.ModelName'), + key: 'materialDesc', //型号名称 + width: 430, + }, + { + label: vm.$t('message.product_barCode'), + key: 'barCode', //条码号 + width: 260, + }, + { + label: vm.$t('message.SourceLocation'), + key: 'wlFromCode', //源库位 + }, + { + label: vm.$t('message.Warehouse_TargetLocation'), + key: 'wlToCode', //目标库位 + }, + { + label: vm.$t('message.operatingTime'), + key: 'moveTime', //操作时间 + width: 465, + }, +]; diff --git a/src/pages/raw/ingoods/SpareInbound/pickOrder/index.vue b/src/pages/raw/ingoods/SpareInbound/pickOrder/index.vue new file mode 100644 index 0000000..b489bb5 --- /dev/null +++ b/src/pages/raw/ingoods/SpareInbound/pickOrder/index.vue @@ -0,0 +1,371 @@ + + + diff --git a/src/pages/raw/ingoods/SpareInbound/pickOrder/model.ts b/src/pages/raw/ingoods/SpareInbound/pickOrder/model.ts new file mode 100644 index 0000000..fc083d7 --- /dev/null +++ b/src/pages/raw/ingoods/SpareInbound/pickOrder/model.ts @@ -0,0 +1,70 @@ +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'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.raw.ingoods.SpareInbound.pickOrder', +}) +export class wholeTransfer extends VuexModule { + WlList = []; + @MutationAction + async queryLocation() { + const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, { + factoryCode: session.factoryCode, + loginName: session.loginName, + }); + const WlList = result.data.map((_: any) => ({ + label: _.locationCode, + value: _.locationCode, + })); + return { WlList }; + } + orderNoItemList: any = []; + productCodeList: any = []; + //查单号 + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.post(url.warehouse.wholeTransfer.queryPickingOrders, { + factoryCode: session.factoryCode, + loginName: session.loginName, + orderNumber: orderNo, + }); + const orderNoItemList = result.data; + const productCodeList = result.data.map((_: any) => ({ + label: _.rowItem, + value: _.rowItem, + ..._, + })); + return { orderNoItemList, productCodeList }; + } + SubmitCode: any = ''; + boxreturndata: any = {}; + //扫箱码 + @MutationAction + async OnSubmit(params: any) { + const result: any = await http.post(url.warehouse.wholeTransfer.queryPickingOrders, params); + const SubmitCode = result.code; + const boxreturndata = result.data; + return { SubmitCode, boxreturndata }; + } + matreturndata: any = {}; + //扫物料条码 + @MutationAction + async OnSubmitmart(params: any) { + const result: any = await http.post(url.warehouse.wholeTransfer.queryPickingOrders, params); + const SubmitCode = result.code; + const matreturndata = result.data; + return { SubmitCode, matreturndata }; + } + @MutationAction + async empty() { + const productCodeList = []; + return { productCodeList }; + } +} + +export default getModule(wholeTransfer); diff --git a/src/utils/url.ts b/src/utils/url.ts index bf55c1b..c9c2a4a 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -342,6 +342,8 @@ export const url = { getInfoByDoorBarcode: '/wmspda/fg/getInfoByDoorBarcode', scrapSfgOfflineConfirm: '/wmspda/fg/scrapSfgOfflineConfirm', checkDicCode: '/wmspda/fg/checkDicCode', + queryPickingOrders: '/wmspda/sparePart/queryPickingOrders', + createPickingOrders: '/wmspda/sparePart/createPickingOrders', }, wholeLnventory: { content: '/wmspda/fg/findMaterialByPddNo',