diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 4caedd6..c54372f 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -499,5 +499,6 @@ export default { Sofspinlew: '线边库半成品报废', LineSide: '线边库', DNLine_PleaseSelect: '请选择DN行项目', + semi_finished_Transfer: '线边库半成品移库', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 9680b50..b3c2ea1 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -499,5 +499,6 @@ export default { Sofspinlew: 'Semi-manufactures Scrap', LineSide: 'Line side warehouse', DNLine_PleaseSelect: 'Please select DN line item', + semi_finished_Transfer: 'Transfer of semi-finished products', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index dffa194..2506780 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -499,5 +499,6 @@ export default { Sofspinlew: 'браковка полуфабрикатов', LineSide: 'линейный склад', DNLine_PleaseSelect: 'Выберите пункт в строке DN', + semi_finished_Transfer: 'складирование полуфабрикатов', }, }; diff --git a/src/pages.json b/src/pages.json index 93b6a6e..002dc99 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1210,6 +1210,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/LineSide/semi-finished-Transfer/index", + "style": { + "navigationBarTitleText": "线边库半成品移库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/LineSide/semi-finished-Transfer/details", + "style": { + "navigationBarTitleText": "线边库半成品移库明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/product/STO-Outbound/index", "style": { diff --git a/src/pages/raw/LineSide/semi-finished-Transfer/config.ts b/src/pages/raw/LineSide/semi-finished-Transfer/config.ts new file mode 100644 index 0000000..e183ebc --- /dev/null +++ b/src/pages/raw/LineSide/semi-finished-Transfer/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: 460, + }, + { + label: vm.$t('message.product_barCode'), + key: 'barCode', //条码号 + width: 280, + }, + { + label: vm.$t('message.SourceLocation'), + key: 'wlFromCode', //源库位 + }, + { + label: vm.$t('message.Warehouse_TargetLocation'), + key: 'wlToCode', //目标库位 + }, + { + label: vm.$t('message.operatingTime'), + key: 'moveTime', //操作时间 + width: 475, + }, +]; diff --git a/src/pages/raw/LineSide/semi-finished-Transfer/details.vue b/src/pages/raw/LineSide/semi-finished-Transfer/details.vue new file mode 100644 index 0000000..c16989e --- /dev/null +++ b/src/pages/raw/LineSide/semi-finished-Transfer/details.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/pages/raw/LineSide/semi-finished-Transfer/index.vue b/src/pages/raw/LineSide/semi-finished-Transfer/index.vue new file mode 100644 index 0000000..4d94df6 --- /dev/null +++ b/src/pages/raw/LineSide/semi-finished-Transfer/index.vue @@ -0,0 +1,338 @@ + + + diff --git a/src/pages/raw/LineSide/semi-finished-Transfer/model.ts b/src/pages/raw/LineSide/semi-finished-Transfer/model.ts new file mode 100644 index 0000000..cad8d98 --- /dev/null +++ b/src/pages/raw/LineSide/semi-finished-Transfer/model.ts @@ -0,0 +1,150 @@ +import { Action, 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 { 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: 'row.LineSide.semi-finished-Transfer', +}) +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.getMdLocationSfg, { + params: { + factoryCode: session.factoryCode, + loginName: session.loginName, + }, + }); + console.log('库位数据', result); + const WlList = result.data.map((_: any) => ({ + label: _.locationCode, + value: _.locationCode, + })); + return { WlList }; + } + + /** + * 查询单号 + * 查询DN单号 + * @param dnNo + */ + @MutationAction + async getProductCode(barcode: any) { + const res: any = await http.post(url.warehouse.container.getOdsRawStorageSnNewHalf, { + factoryCode: session.factoryCode, + loginName: session.loginName, + barcode, + }); + const code = res.code; + const orderInInfo = res.data; + // 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 }; + } + //退扫 + @MutationAction + async codeDel(params: any) { + const res: any = await http.post(url.warehouse.wholeTransfer.del, params); + const delCode = res.code; + return { delCode }; + } + //清除数据 + @MutationAction + async empty() { + const orderInInfo: any = []; + // const userDefined = ''; + // const WlList = []; + const code = ''; + return { orderInInfo, code }; + } + @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(params: any = {}) { + const res: any = await http.post(url.warehouse.rowTransfer.getSfgMoveBatchNo, params); + 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' }) + //@MutationAction + async querydetaildle(userDefined4: any) { + const res: any = await http.post(url.warehouse.rowTransfer.queryListByMoveCode, { + loginName: session.loginName, + factoryCode: session.factoryCode, + proMoveCode: userDefined4, + }); + console.log('明细》》》》》》》》》', res.data); + 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, + }); + return kw; + } +} + +export default getModule(wholeTransfer); diff --git a/src/utils/page.ts b/src/utils/page.ts index ddc3814..317c166 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -212,6 +212,12 @@ export const page = { detail: '/pages/raw/Semi-finished/Semi-finished-rowTransfer/details', }, }, + LineSide: { + semifinishedTransfer: { + index: '/pages/raw/LineSide/semi-finished-Transfer/index', + detail: '/pages/raw/LineSide/semi-finished-Transfer/details', + }, + }, }, SemiProduct: { index: '/pages/SemiProduct/index', diff --git a/src/utils/url.ts b/src/utils/url.ts index 5b7f86d..c21355f 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -275,6 +275,7 @@ export const url = { getOdsRawStorageSnNew: 'wmspda/bl/getOdsRawStorageSnNew', del: '/wmspda/fg/scanBarcodeStock/del', getMdLocationSfgLine: '/wmspda/fg/getMdLocationSfgLine', + getMdLocationSfg: '/wmspda/fg/getMdLocationSfg', getSpareMdLocation: '/wmspda/sparePart/getSpareMdLocation', queryOnshelfOrder: '/wmspda/sparePart/queryOnshelfOrder', queryDownshelfOrder: '/wmspda/sparePart/queryDownshelfOrder',