diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index a9d0ccd..73551db 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -495,5 +495,7 @@ export default { submitted: '还有数据没提交 是否重新查询', StorageLocation: '入库地点', BCPInventory: '半成品盘点', + Nomatch: '没有与该条码匹配的物料', + Sofspinlew: '线边库半成品报废', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 7abb1ec..5c0445d 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -495,5 +495,7 @@ export default { submitted: 'There is data not submitted whether to re-query', StorageLocation: 'Storage Loc', BCPInventory: 'Inventory', + Nomatch: 'There is no material matching this barcode', + Sofspinlew: 'Semi-manufactures Scrap', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 495fd9c..4f70dd0 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -495,5 +495,7 @@ export default { submitted: 'Есть также данные, которые не были представлены для повторного запроса', StorageLocation: 'Вход.', BCPInventory: 'инвентаризац', + Nomatch: 'Нет совпадений с штриховым кодом', + Sofspinlew: 'браковка полуфабрикатов', }, }; diff --git a/src/pages.json b/src/pages.json index 896e6f1..44c9812 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1194,6 +1194,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/Semi-finished/LineEdge-scrap/index", + "style": { + "navigationBarTitleText": "线边库半成品报废", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/demo/index", "style": { diff --git a/src/pages/raw/Semi-finished/LineEdge-scrap/config.ts b/src/pages/raw/Semi-finished/LineEdge-scrap/config.ts new file mode 100644 index 0000000..fc2aad0 --- /dev/null +++ b/src/pages/raw/Semi-finished/LineEdge-scrap/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/Semi-finished/LineEdge-scrap/index.vue b/src/pages/raw/Semi-finished/LineEdge-scrap/index.vue new file mode 100644 index 0000000..42acf17 --- /dev/null +++ b/src/pages/raw/Semi-finished/LineEdge-scrap/index.vue @@ -0,0 +1,252 @@ + + + diff --git a/src/pages/raw/Semi-finished/LineEdge-scrap/model.ts b/src/pages/raw/Semi-finished/LineEdge-scrap/model.ts new file mode 100644 index 0000000..b8c52f9 --- /dev/null +++ b/src/pages/raw/Semi-finished/LineEdge-scrap/model.ts @@ -0,0 +1,49 @@ +/* + * @Author: zhou lei + * @Date: 2022-09-29 13:45:51 + * @LastEditTime: 2022-09-29 15:56:26 + * @LastEditors: zhou lei + * @Description: + * @FilePath: \hgwms-factory-app\src\pages\raw\Semi-finished\LineEdge-scrap\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.Semi-finished.LineEdge-scrap', +}) +export class semifinished extends VuexModule { + //目标容器查询 + SearchCode: any = ''; + CodeDetail: any = ''; + @MutationAction + async searchBarcode(barcode: any) { + const res: any = await http.post(url.warehouse.container.getOdsRawStorageSnNewHalf, { + 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.odsRawStorageSnNewScrapped, params); + const submitCode = res.code; + return { submitCode }; + } +} + +export default getModule(semifinished); diff --git a/src/utils/url.ts b/src/utils/url.ts index 7849daa..e2751b7 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -247,6 +247,8 @@ export const url = { getOdsRawStorageSnNew: '/wmspda/bl/getOdsRawStorageSnNew', russia: '/wmspda/material/restructureContainer/russia', scrapContainers: '/wmspda/material/scrapContainers', + getOdsRawStorageSnNewHalf: '/wmspda/bl/getOdsRawStorageSnNewHalf', + odsRawStorageSnNewScrapped: '/wmspda/bl/odsRawStorageSnNewScrapped', }, rowScrap: { list: '/wmspda/fg/listByOrder',