diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index c54372f..ec69ebe 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -500,5 +500,6 @@ export default { LineSide: '线边库', DNLine_PleaseSelect: '请选择DN行项目', semi_finished_Transfer: '线边库半成品移库', + Lineedge_raw_transfer: '线边库原材料移库', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index b3c2ea1..28b0ebf 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -500,5 +500,6 @@ export default { LineSide: 'Line side warehouse', DNLine_PleaseSelect: 'Please select DN line item', semi_finished_Transfer: 'Transfer of semi-finished products', + Lineedge_raw_transfer: 'Line edge raw material transfer', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 2506780..f47f592 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -500,5 +500,6 @@ export default { LineSide: 'линейный склад', DNLine_PleaseSelect: 'Выберите пункт в строке DN', semi_finished_Transfer: 'складирование полуфабрикатов', + Lineedge_raw_transfer: 'транзитный склад', }, }; diff --git a/src/pages.json b/src/pages.json index 002dc99..adea88d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1226,6 +1226,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/LineSide/Lineedge-raw-transfer/index", + "style": { + "navigationBarTitleText": "线边库原材料移库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/product/STO-Outbound/index", "style": { diff --git a/src/pages/raw/LineSide/Lineedge-raw-transfer/index.vue b/src/pages/raw/LineSide/Lineedge-raw-transfer/index.vue new file mode 100644 index 0000000..14bafdc --- /dev/null +++ b/src/pages/raw/LineSide/Lineedge-raw-transfer/index.vue @@ -0,0 +1,321 @@ + + + diff --git a/src/pages/raw/LineSide/Lineedge-raw-transfer/model.ts b/src/pages/raw/LineSide/Lineedge-raw-transfer/model.ts new file mode 100644 index 0000000..2ea60c3 --- /dev/null +++ b/src/pages/raw/LineSide/Lineedge-raw-transfer/model.ts @@ -0,0 +1,146 @@ +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.Lineedge-raw-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.getMdLocationRawAndLine, { + 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(params: any) { + const res: any = await http.post(url.warehouse.container.getRawStorageSnNew, params); + 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.getCode, 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 317c166..3fc69df 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -217,6 +217,9 @@ export const page = { index: '/pages/raw/LineSide/semi-finished-Transfer/index', detail: '/pages/raw/LineSide/semi-finished-Transfer/details', }, + Lineedgerawtransfer: { + index: '/pages/raw/LineSide/Lineedge-raw-transfer/index', + }, }, }, SemiProduct: { diff --git a/src/utils/url.ts b/src/utils/url.ts index c21355f..84cb28e 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -276,6 +276,7 @@ export const url = { del: '/wmspda/fg/scanBarcodeStock/del', getMdLocationSfgLine: '/wmspda/fg/getMdLocationSfgLine', getMdLocationSfg: '/wmspda/fg/getMdLocationSfg', + getMdLocationRawAndLine: '/wmspda/fg/getMdLocationRawAndLine', getSpareMdLocation: '/wmspda/sparePart/getSpareMdLocation', queryOnshelfOrder: '/wmspda/sparePart/queryOnshelfOrder', queryDownshelfOrder: '/wmspda/sparePart/queryDownshelfOrder',