diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index d4b5621..abc9020 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -504,5 +504,11 @@ export default { SemiFinishedName: '半成品名称', batch: '请输入批次码', batchCode: '请先扫描批次码', + consolidation: '容器整理', + Target: '目标容器', + TargetContainer: '请扫描目标容器条码', + source: '源容器', + barcodeSource: '请扫描源容器条码', + ContainerBarcode: '容器条码', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 6e99638..d47058b 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -511,5 +511,11 @@ export default { SemiFinishedName: 'Name', batch: 'Please enter the batch code', batchCode: 'Please scan the batch code first', + consolidation: 'Container consolidation', + Target: 'Target', + TargetContainer: 'Scan the bar code of the target container', + source: 'Source', + barcodeSource: 'Scan the barcode of the source container', + ContainerBarcode: 'Container barcode', }, }; diff --git a/src/pages.json b/src/pages.json index 42bf48c..63a118f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -322,6 +322,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/warehouse/Container-consolidation/index", + "style": { + "navigationBarTitleText": "容器整理", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/warehouse/Container-consolidation/details", + "style": { + "navigationBarTitleText": "容器整理明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/ingoods/poReceipt/index", "style": { diff --git a/src/pages/raw/warehouse/Container-consolidation/config.ts b/src/pages/raw/warehouse/Container-consolidation/config.ts new file mode 100644 index 0000000..fc2aad0 --- /dev/null +++ b/src/pages/raw/warehouse/Container-consolidation/config.ts @@ -0,0 +1,84 @@ +/** + * 看单交接明细表格列 + */ +import vm from '@/main'; +export const headers = [ + { + label: vm.$t('message.Warehouse_OrderNo'), + key: 'orderNo', //单号 + // width: '15%', + }, + { + label: vm.$t('message.po_MaterielNo'), + key: 'productCode', //物料号 + // width: '15%', + }, + { + label: vm.$t('message.po_MaterielDes'), + key: 'productDescZh', //物料描述 + width: 350, + }, + { + label: vm.$t('message.dn_Number'), + key: 'qty', //数量 + }, + { + label: vm.$t('message.Warehouse_OriginalLocation'), + key: 'originWl', //原库位 + }, + { + label: vm.$t('message.Warehouse_TargetLocation'), + key: 'aimWl', //目标库位 + }, +]; +export const RUSdetailHeader = [ + { + label: vm.$t('message.Warehouse_OrderNo'), + key: 'orderNo', //单号 + width: 270, + }, + { + label: vm.$t('message.po_MaterielNo'), + key: 'productCode', //物料号 + width: 270, + }, + { + label: vm.$t('message.po_MaterielDes'), + key: 'productDescZh', //物料描述 + width: 520, + }, + { + label: vm.$t('message.Container'), + key: 'barCode', //物料描述 + width: 400, + }, + { + label: vm.$t('message.dn_Number'), + key: 'qty', //数量 + }, + { + label: vm.$t('message.Warehouse_OriginalLocation'), + key: 'originWl', //原库位 + }, + { + label: vm.$t('message.Warehouse_TargetLocation'), + key: 'aimWl', //目标库位 + }, +]; +export const TargetTitle = [ + { + label: vm.$t('message.ContainerBarcode'), + key: 'barcode', //容器条码 + width: 270, + }, + { + label: vm.$t('message.dn_Number'), + key: 'qty', //数量 + // width: 270, + }, + { + label: vm.$t('message.CommissionedLocation'), + key: 'locCode', //库位 + width: 250, + }, +]; diff --git a/src/pages/raw/warehouse/Container-consolidation/details.vue b/src/pages/raw/warehouse/Container-consolidation/details.vue new file mode 100644 index 0000000..1310ff8 --- /dev/null +++ b/src/pages/raw/warehouse/Container-consolidation/details.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/pages/raw/warehouse/Container-consolidation/index.vue b/src/pages/raw/warehouse/Container-consolidation/index.vue new file mode 100644 index 0000000..dfd3ed6 --- /dev/null +++ b/src/pages/raw/warehouse/Container-consolidation/index.vue @@ -0,0 +1,318 @@ + + + diff --git a/src/pages/raw/warehouse/Container-consolidation/model.ts b/src/pages/raw/warehouse/Container-consolidation/model.ts new file mode 100644 index 0000000..4ddb358 --- /dev/null +++ b/src/pages/raw/warehouse/Container-consolidation/model.ts @@ -0,0 +1,53 @@ +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: 'raw.warehouse.Container-consolidation', +}) +export class rowTransfer extends VuexModule { + //目标容器查询 + SearchCode: any = ''; + CodeDetail: any = ''; + @MutationAction + async searchBarcode(barcode: any) { + const res: any = await http.post(url.warehouse.container.getRawStorageSnNew, { + barcode, + factoryCode: session.factoryCode, + loginName: session.loginName, + }); + const SearchCode = res.code; + const CodeDetail = res.data; + if (CodeDetail.cpRef4 != null) { + CodeDetail.qty = parseFloat(CodeDetail.qty) - parseFloat(CodeDetail.cpRef4); + } + return { SearchCode, CodeDetail }; + } + //源容器查询 + SourceCode: any = ''; + SourceDetail: any = ''; + @MutationAction + async searchSource(params: any) { + const res: any = await http.post(url.warehouse.container.getOdsRawStorageSnNew, params); + const SourceCode = res.code; + const SourceDetail = res.data; + if (SourceDetail.cpRef4 != null) { + SourceDetail.qty = parseFloat(SourceDetail.qty) - parseFloat(SourceDetail.cpRef4); + } + return { SourceCode, SourceDetail }; + } + //提交数据 + submitCode: any = ''; + @MutationAction + async submit(params: any) { + const res: any = await http.post(url.warehouse.container.russia, params); + const submitCode = res.code; + return { submitCode }; + } +} + +export default getModule(rowTransfer); diff --git a/src/utils/url.ts b/src/utils/url.ts index c330d23..dba857b 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -232,6 +232,11 @@ export const url = { queryListByMoveCode: '/wmspda/fg/queryListByMoveCode', close: '/wmspda/fg/closeHandOrder', }, + container: { + getRawStorageSnNew: '/wmspda/material/getRawStorageSnNew', + getOdsRawStorageSnNew: '/wmspda/bl/getOdsRawStorageSnNew', + russia: '/wmspda/material/restructureContainer/russia', + }, rowScrap: { list: '/wmspda/fg/listByOrder', },