diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index a413333..d1caf81 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -518,5 +518,11 @@ export default { VirtualReplenishment: '虚拟补料', VirtualInventory: '虚拟库存', semifinishedWasteJudgment: '半成品判废', + MaterialConversionL: '物料转换', + OriginalMaterial: '原物料号', + OriginalMaterialdes: '原物料描述', + TargetMaterial: '目标物料', + TargetMaterialdes: '目标物料描述', + allocation: '调拨', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 206ef28..dd33d05 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -518,5 +518,11 @@ export default { VirtualReplenishment: 'Virtual replenishment', VirtualInventory: 'Virtual inventory', semifinishedWasteJudgment: 'Semi finished products are scrapped', + MaterialConversionL: 'Material conversion', + OriginalMaterial: 'Original material', + OriginalMaterialdes: 'Raw material des', + TargetMaterial: 'Target material', + TargetMaterialdes: 'Target material des', + allocation: 'allocation', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index b7f6643..f3cf818 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -518,5 +518,11 @@ export default { VirtualReplenishment: 'виртуальная добавка', VirtualInventory: 'виртуальный запас', semifinishedWasteJudgment: 'браковка полуфабрикатов', + MaterialConversionL: 'конверсия материалов', + OriginalMaterial: 'инвентарный номер', + OriginalMaterialdes: 'описание исходного материала', + TargetMaterial: 'Целевой материалl', + TargetMaterialdes: 'описание цели', + allocation: 'переброска', }, }; diff --git a/src/pages.json b/src/pages.json index 83241cc..f19d517 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1250,14 +1250,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, - // { - // "path": "pages/raw/LineSide/rawWasteJudgment/index", - // "style": { - // "navigationBarTitleText": "原材料判废", - // "navigationStyle": "custom", // 隐藏系统导航栏 - // "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 - // } - // }, + { + "path": "pages/raw/LineSide/rawWasteJudgment/index", + "style": { + "navigationBarTitleText": "原材料判废", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/LineSide/semifinished-wasteJudgment/index", "style": { @@ -1296,6 +1296,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } } + // { + // "path": "pages/raw/warehouse/MaterialConversion/index", + // "style": { + // "navigationBarTitleText": "物料转换", + // "navigationStyle": "custom", // 隐藏系统导航栏 + // "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + // } + // }, + // { + // "path": "pages/raw/warehouse/allocation/index", + // "style": { + // "navigationBarTitleText": "调拨", + // "navigationStyle": "custom", // 隐藏系统导航栏 + // "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + // } + // } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/src/pages/raw/LineSide/rawWasteJudgment/index.vue b/src/pages/raw/LineSide/rawWasteJudgment/index.vue new file mode 100644 index 0000000..e588108 --- /dev/null +++ b/src/pages/raw/LineSide/rawWasteJudgment/index.vue @@ -0,0 +1,329 @@ + + + diff --git a/src/pages/raw/LineSide/rawWasteJudgment/model.ts b/src/pages/raw/LineSide/rawWasteJudgment/model.ts new file mode 100644 index 0000000..cb026ba --- /dev/null +++ b/src/pages/raw/LineSide/rawWasteJudgment/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.rawWasteJudgment', +}) +export class rawWasteJudgment 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.container.preScrapRawConfirm, 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(rawWasteJudgment); diff --git a/src/utils/url.ts b/src/utils/url.ts index 6fa9147..5d56232 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -248,6 +248,8 @@ export const url = { //查询明细 queryListByMoveCode: '/wmspda/fg/queryListByMoveCode', close: '/wmspda/fg/closeHandOrder', + stoAdjusList: '/wmspda/fg/stoAdjusList', + confirmMoveStoAdjus: '/wmspda/fg/confirmMoveStoAdjus', }, container: { getRawStorageSnNew: '/wmspda/material/getRawStorageSnNew', @@ -258,6 +260,7 @@ export const url = { odsRawStorageSnNewScrapped: '/wmspda/bl/odsRawStorageSnNewScrapped', getSfgStorageSnPreScrap: '/wmspda/material/getSfgStorageSnPreScrap', preScrapSfgConfirm: '/wmspda/fg/preScrapSfgConfirm', + preScrapRawConfirm: '/wmspda/fg/preScrapRawConfirm', }, rowScrap: { list: '/wmspda/fg/listByOrder',