From 23f1bfd330c5f93cad58e92755ab181353cb89f1 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Tue, 5 Jul 2022 18:02:14 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=96=B0=E5=A2=9E=E5=8D=8A?= =?UTF-8?q?=E6=88=90=E5=93=81=E4=BA=A4=E6=8E=A5=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 6 + src/i18n/lang/en.ts | 6 + src/pages.json | 16 ++ .../Semi-finished-rowTransfer/config.ts | 39 +++ .../Semi-finished-rowTransfer/details.vue | 100 ++++++++ .../Semi-finished-rowTransfer/index.vue | 226 ++++++++++++++++++ .../Semi-finished-rowTransfer/model.ts | 92 +++++++ src/pages/raw/handover/RUS-picking/config.ts | 5 + src/utils/page.ts | 3 + src/utils/url.ts | 3 + 10 files changed, 496 insertions(+) create mode 100644 src/pages/raw/Semi-finished/Semi-finished-rowTransfer/config.ts create mode 100644 src/pages/raw/Semi-finished/Semi-finished-rowTransfer/details.vue create mode 100644 src/pages/raw/Semi-finished/Semi-finished-rowTransfer/index.vue create mode 100644 src/pages/raw/Semi-finished/Semi-finished-rowTransfer/model.ts diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 93c4249..d4b5621 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -498,5 +498,11 @@ export default { SemiFinished_SO: '半成品SO', SemiFinishedOffline: '半成品下线', sweepCode: '请先扫码', + outbound: '交接出库', + Batch: '批次码', + coding: '半成品编码', + SemiFinishedName: '半成品名称', + batch: '请输入批次码', + batchCode: '请先扫描批次码', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 8da2cfc..6e99638 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -505,5 +505,11 @@ export default { SemiFinished_SO: 'Semi-finished SO', SemiFinishedOffline: 'Semi-finished offline', sweepCode: 'Please sweep the code first', + outbound: 'Transfer of outbound', + Batch: 'Batch code', + coding: 'coding', + SemiFinishedName: 'Name', + batch: 'Please enter the batch code', + batchCode: 'Please scan the batch code first', }, }; diff --git a/src/pages.json b/src/pages.json index f0d86dc..42bf48c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -970,6 +970,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/Semi-finished/Semi-finished-rowTransfer/index", + "style": { + "navigationBarTitleText": "半成品出库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/Semi-finished/Semi-finished-rowTransfer/details", + "style": { + "navigationBarTitleText": "半成品出库明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/ingoods/SpareInbound/Inbound/index", "style": { diff --git a/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/config.ts b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/config.ts new file mode 100644 index 0000000..ed6cce2 --- /dev/null +++ b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/config.ts @@ -0,0 +1,39 @@ +/** + * 看单交接明细表格列 + */ +import vm from '@/main'; +export const headers = [ + { + label: vm.$t('message.Pi_OrderNo'), + 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/Semi-finished/Semi-finished-rowTransfer/details.vue b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/details.vue new file mode 100644 index 0000000..83a3107 --- /dev/null +++ b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/details.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/index.vue b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/index.vue new file mode 100644 index 0000000..69390ad --- /dev/null +++ b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/index.vue @@ -0,0 +1,226 @@ + + + diff --git a/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/model.ts b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/model.ts new file mode 100644 index 0000000..5402396 --- /dev/null +++ b/src/pages/raw/Semi-finished/Semi-finished-rowTransfer/model.ts @@ -0,0 +1,92 @@ +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'; +class OrderInInfo { + checked?: boolean; + poNo?: string; + kw?: string; + userDefined10?: string; + orderStatus?: string; +} +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'Semi-finished-rowTransfer', +}) +export class rowTransfer extends VuexModule { + cboPlaceList = []; + poNo = ''; + orderInInfo: OrderInInfo = new OrderInInfo(); + orderInInfoList: OrderInInfo[] = []; + materielList = []; + code = ''; + @MutationAction + async takeYKOrder(order3: any) { + const res: any = await http.post(url.warehouse.rowTransfer.listByOrder, { + ...order3, + orderType: 'SFG', + page: 1, + rows: 50, + factoryCode: session.factoryCode, + loginName: session.loginName, + }); + console.log('res', res); + const code = res.code; + const orderInInfoList = res.data.records; + const materielList = orderInInfoList.map((item: any) => ({ + label: item.productCode, + value: item.productCode, + ...item, + })); + console.log('materielList', materielList); + return { orderInInfoList, materielList, code }; + } + SearchCode: any = ''; + SearchCodeList: any = ''; + @MutationAction + async SearchBarcode(params: any) { + const res: any = await http.post(url.warehouse.rowTransfer.getOdsRawStorageSnNew, { + factoryCode: session.factoryCode, + loginName: session.loginName, + ...params, + }); + console.log('rrrrr', res); + const SearchCode = res.code; + const SearchCodeList = res.data; + return { SearchCode, SearchCodeList }; + } + @MutationAction + async onTakeoutConfirm(list: any) { + const records: any = await http.post(url.warehouse.rowTransfer.commit, list); + const code = records.code; + return { code }; + } + submitCode: any = ''; + @MutationAction + async submit(submitList: any) { + const res: any = await http.post(url.warehouse.rowTransfer.confirmMove, submitList); + console.log(res); + const submitCode = res.code; + return { submitCode }; + } + detailList: any = []; + @MutationAction + async queryDetail(proMoveCode: any) { + const res = await http.post(url.warehouse.rowTransfer.queryListByMoveCode, { + factoryCode: session.factoryCode, + loginName: session.loginName, + proMoveCode, + }); + const detailList = res.data; + return { detailList }; + } + @MutationAction + async empty() { + const materielList = null; + return { materielList }; + } +} +export default getModule(rowTransfer); diff --git a/src/pages/raw/handover/RUS-picking/config.ts b/src/pages/raw/handover/RUS-picking/config.ts index 28ea9cf..d86a47f 100644 --- a/src/pages/raw/handover/RUS-picking/config.ts +++ b/src/pages/raw/handover/RUS-picking/config.ts @@ -245,6 +245,11 @@ export const Headers = [ key: 'materialCode', width: 220, }, + { + label: vm.$t('message.product_barCode'), + key: 'userDefined1', + width: 220, + }, { label: vm.$t('message.po_DemandQuantity'), key: 'amount', diff --git a/src/utils/page.ts b/src/utils/page.ts index c487945..dc96239 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -195,6 +195,9 @@ export const page = { index: '/pages/raw/Semi-finished/Semi-finished-SO/index', detail: '/pages/raw/Semi-finished/Semi-finished-SO/detail', }, + SemiFinishedRowTcransfer: { + detail: '/pages/raw/Semi-finished/Semi-finished-rowTransfer/details', + }, }, }, SemiProduct: { diff --git a/src/utils/url.ts b/src/utils/url.ts index bc68b5b..c330d23 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -220,7 +220,10 @@ export const url = { warehouse: { rowTransfer: { list: '/wmspda/fg/listByOrder', + listByOrder: '/wmspda/fg/listByOrder', + getOdsRawStorageSnNew: 'wmspda/bl/getOdsRawStorageSnNew', commit: '/wmspda/fg/confirmMove', + confirmMove: 'wmspda/fg/confirmMove/russia', russia: '/wmspda/fg/confirmMove/russia', getMaterialByCode: '/wmspda/fg/getMaterialByCode', getCode: '/wmspda/fg/getCpMoveBatchNo',