diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index fdae858..a413333 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -512,9 +512,11 @@ export default { PleaseThere: '请输入责任工序', rawWasteJudgment: '原材料判废', reason1: '原因', + PleaseFour: '请输入原因', ResponsibilityCategory: '责任大类', Please_category: '请选择责任大类', VirtualReplenishment: '虚拟补料', VirtualInventory: '虚拟库存', + semifinishedWasteJudgment: '半成品判废', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index c4f95c1..206ef28 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -512,9 +512,11 @@ export default { PleaseThere: 'Please enter the responsible operation', rawWasteJudgment: 'Waste judgment of raw materials', reason1: 'reason', + PleaseFour: 'Please enter the reason', ResponsibilityCategory: 'Responsibility category', Please_category: 'Please select the responsibility category', VirtualReplenishment: 'Virtual replenishment', VirtualInventory: 'Virtual inventory', + semifinishedWasteJudgment: 'Semi finished products are scrapped', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index ee4f9d9..b7f6643 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -512,9 +512,11 @@ export default { PleaseThere: 'Введите ответственную операцию', rawWasteJudgment: 'утилизация сырья', reason1: 'причина', + PleaseFour: 'Введите причину', ResponsibilityCategory: 'категория ответственности', Please_category: 'Выберите категорию ответственности', VirtualReplenishment: 'виртуальная добавка', VirtualInventory: 'виртуальный запас', + semifinishedWasteJudgment: 'браковка полуфабрикатов', }, }; diff --git a/src/pages.json b/src/pages.json index 9e61d34..83241cc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1258,6 +1258,14 @@ // "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 // } // }, + { + "path": "pages/raw/LineSide/semifinished-wasteJudgment/index", + "style": { + "navigationBarTitleText": "半成品判废", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + } + }, { "path": "pages/product/STO-Outbound/index", "style": { diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue new file mode 100644 index 0000000..216817a --- /dev/null +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue @@ -0,0 +1,276 @@ + + + diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/model.ts b/src/pages/raw/LineSide/semifinished-wasteJudgment/model.ts new file mode 100644 index 0000000..c0cf63b --- /dev/null +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/model.ts @@ -0,0 +1,49 @@ +/* + * @Author: zhou lei + * @Date: 2022-09-29 13:45:51 + * @LastEditTime: 2022-10-27 17:33:47 + * @LastEditors: zhou lei + * @Description: + * @FilePath: \hgwms-factory-app\src\pages\raw\LineSide\semifinished-wasteJudgment\model.ts + * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 + */ +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.LineSide.semifinished-wasteJudgment', +}) +export class semifinishedWasteJudgment extends VuexModule { + //目标容器查询 + SearchCode: any = ''; + CodeDetail: any = ''; + @MutationAction + async searchBarcode(barcode: any) { + const res: any = await http.post(url.warehouse.container.getSfgStorageSnPreScrap, { + 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 }; + } + //提交数据 + submitCode: any = ''; + @MutationAction + async submit(params: any) { + const res: any = await http.post(url.warehouse.container.preScrapSfgConfirm, params); + const submitCode = res.code; + return { submitCode }; + } +} + +export default getModule(semifinishedWasteJudgment); diff --git a/src/utils/url.ts b/src/utils/url.ts index cc5e5be..6fa9147 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -256,6 +256,8 @@ export const url = { scrapContainers: '/wmspda/material/scrapContainers', getOdsRawStorageSnNewHalf: '/wmspda/bl/getOdsRawStorageSnNewHalf', odsRawStorageSnNewScrapped: '/wmspda/bl/odsRawStorageSnNewScrapped', + getSfgStorageSnPreScrap: '/wmspda/material/getSfgStorageSnPreScrap', + preScrapSfgConfirm: '/wmspda/fg/preScrapSfgConfirm', }, rowScrap: { list: '/wmspda/fg/listByOrder',