diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 80b8d87..4caedd6 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -498,5 +498,6 @@ export default { Nomatch: '没有与该条码匹配的物料', Sofspinlew: '线边库半成品报废', LineSide: '线边库', + DNLine_PleaseSelect: '请选择DN行项目', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index c9f691f..9680b50 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -498,5 +498,6 @@ export default { Nomatch: 'There is no material matching this barcode', Sofspinlew: 'Semi-manufactures Scrap', LineSide: 'Line side warehouse', + DNLine_PleaseSelect: 'Please select DN line item', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 63792b5..dffa194 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -261,7 +261,7 @@ export default { InventoryNumber: 'Инвентарный номер', InventoryFinish: 'Заканчивать', closure: 'Закрывать', - CommissionEntrant: 'Оприходование комплектующих после доработки поставщиком', + CommissionEntrant: 'Возврат аутсорсинг (SP)', CommissionedSingleNumber: 'Заказ', CommissionedMaterielNo: 'код МАТ', CommissionedMaterielDesc: 'описание МАТ', @@ -273,7 +273,7 @@ export default { CommissionedEntrantDetails: 'Складирование', CommissionedReceiptQuantity: 'Количество поступления', subcontract: 'Субподряд', - CommissionGoOut: 'Аутсорсинговый выход из склада', + CommissionGoOut: 'Передача аутсорсинг(SP)', Outbound: 'Исходящее местоположение', Warehousing: 'Расположение склада', PleaseQuantity: 'Пожалуйста, введите это количество', @@ -498,5 +498,6 @@ export default { Nomatch: 'Нет совпадений с штриховым кодом', Sofspinlew: 'браковка полуфабрикатов', LineSide: 'линейный склад', + DNLine_PleaseSelect: 'Выберите пункт в строке DN', }, }; diff --git a/src/pages.json b/src/pages.json index 63bafa1..93b6a6e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1210,14 +1210,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, - // { - // "path": "pages/product/STO-Outbound/index", - // "style": { - // "navigationBarTitleText": "成品STO出库", - // "navigationStyle": "custom", // 隐藏系统导航栏 - // "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 - // } - // }, + { + "path": "pages/product/STO-Outbound/index", + "style": { + "navigationBarTitleText": "成品STO出库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/demo/index", "style": { diff --git a/src/pages/product/STO-Outbound/index.vue b/src/pages/product/STO-Outbound/index.vue new file mode 100644 index 0000000..3850774 --- /dev/null +++ b/src/pages/product/STO-Outbound/index.vue @@ -0,0 +1,465 @@ + + + diff --git a/src/pages/product/STO-Outbound/model.ts b/src/pages/product/STO-Outbound/model.ts new file mode 100644 index 0000000..d3d32a8 --- /dev/null +++ b/src/pages/product/STO-Outbound/model.ts @@ -0,0 +1,82 @@ +/* + * @Author: zhou lei + * @Date: 2022-10-10 15:40:04 + * @LastEditTime: 2022-10-12 11:35:25 + * @LastEditors: zhou lei + * @Description: + * @FilePath: \hgwms-factory-app\src\pages\product\STO-Outbound\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: 'product.STO.STO-Outbound.index', +}) +export class ReceiptModule extends VuexModule { + //俄罗斯 STO出库 扫描DN单号 + dnNoList: any = []; + DnLineList: any = []; + res: any = ''; + @MutationAction + async Querydn(dnNo: any) { + console.log('dnNo', dnNo); + const res: any = await http.post(url.outbound.stoOutbound.dnQuery, { + factoryCode: session.factoryCode, + loginName: session.loginName, + dnNo, + }); + const dnNoList = res.data; + const DnLineList = []; + dnNoList.forEach((item: any) => { + const obj = { + value: item.dnItem, + lable: item.dnItem, + }; + DnLineList.push(obj); + }); + return { dnNoList, DnLineList }; + } + //俄罗斯sto成品扫码出库 + @MutationAction + async stoDnProdScan(list: any) { + const res: any = await http.post(url.outbound.stoOutbound.stoDnProdScan, list); + //const resCode = res.code; + return { res }; + } + //俄罗斯 STO出库 查询库位 + LocList: any = []; + @MutationAction + async QueryLoc(sendSpot: any) { + const res: any = await http.post(url.auth.query.queryByFactoryCodeAndWorkAreaCode, { + factoryCode: session.factoryCode, + loginName: session.loginName, + workArea: session.workareaCode, + sendSpot, + }); + const LocList = []; + res.forEach((item: any) => { + const obj = { + value: item.locationCode, + lable: item.locationCode, + }; + LocList.push(obj); + }); + return { LocList }; + } + //俄罗斯 出库提交 + SubCode: any = ''; + @MutationAction + async SubmitList(list: any) { + const res: any = await http.post(url.outbound.stoOutbound.stoDnOutPost, list); + const SubCode = res.code; + return { SubCode }; + } +} + +export default getModule(ReceiptModule); diff --git a/src/pages/raw/LineSide/LineEdge-scrap/model.ts b/src/pages/raw/LineSide/LineEdge-scrap/model.ts index b8c52f9..357243a 100644 --- a/src/pages/raw/LineSide/LineEdge-scrap/model.ts +++ b/src/pages/raw/LineSide/LineEdge-scrap/model.ts @@ -1,10 +1,10 @@ /* * @Author: zhou lei * @Date: 2022-09-29 13:45:51 - * @LastEditTime: 2022-09-29 15:56:26 + * @LastEditTime: 2022-10-12 13:40:44 * @LastEditors: zhou lei * @Description: - * @FilePath: \hgwms-factory-app\src\pages\raw\Semi-finished\LineEdge-scrap\model.ts + * @FilePath: \hgwms-factory-app\src\pages\raw\LineSide\LineEdge-scrap\model.ts * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 */ import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; @@ -16,7 +16,7 @@ import { session } from '@/store/modules/session'; namespaced: true, dynamic: true, store, - name: 'raw.Semi-finished.LineEdge-scrap', + name: 'raw.LineSide.LineEdge-scrap', }) export class semifinished extends VuexModule { //目标容器查询 diff --git a/src/pages/raw/STO/STO-Outbound/config.ts b/src/pages/raw/STO/STO-Outbound/config.ts index b7db42f..2df3db1 100644 --- a/src/pages/raw/STO/STO-Outbound/config.ts +++ b/src/pages/raw/STO/STO-Outbound/config.ts @@ -47,6 +47,11 @@ export const Tabheaders = [ key: 'wlCode', width: 350, }, + { + label: vm.$t('message.Container'), + key: 'barCode', + width: 350, + }, { label: vm.$t('message.product_Number'), key: 'nowAmount', diff --git a/src/pages/raw/STO/STO-Outbound/index.vue b/src/pages/raw/STO/STO-Outbound/index.vue index b7db08f..2aabdf9 100644 --- a/src/pages/raw/STO/STO-Outbound/index.vue +++ b/src/pages/raw/STO/STO-Outbound/index.vue @@ -72,18 +72,23 @@ {{ TheItem.deliveryRegion }} + + + + {{ $t('message.CommissionedLocation') }} - + + {{ $t('message.dn_Number') }}: - + {{ $t('message.product_add') }} @@ -119,6 +124,8 @@ import { Tabheaders } from './config'; }) export default class dnReceiptDom extends BasePage { border = true; + firstFocus = false; + barCode: any = ''; type = 'text'; Tabheaders = Tabheaders; model = model; @@ -127,6 +134,7 @@ export default class dnReceiptDom extends BasePage { DnlineNo: any = {}; LocList: any = []; Loc: any = {}; + locCode: any = ''; async QueryLoc() { await this.model.QueryLoc(this.TheItem.deliveryRegion); this.LocList = this.model.LocList; @@ -150,7 +158,7 @@ export default class dnReceiptDom extends BasePage { this.DnlineNo = this.model.DnLineList[0]; this.TheItem = this.model.dnNoList[0]; this.ItemIndex = 0; - await this.QueryLoc(); + //await this.QueryLoc(); } else if (res.cancel) { return; } @@ -162,7 +170,7 @@ export default class dnReceiptDom extends BasePage { this.DnlineNo = this.model.DnLineList[0]; this.TheItem = this.model.dnNoList[0]; this.ItemIndex = 0; - await this.QueryLoc(); + //await this.QueryLoc(); } } TheItem: any = {}; @@ -175,12 +183,42 @@ export default class dnReceiptDom extends BasePage { this.ItemIndex = index; } }); - await this.QueryLoc(); + //await this.QueryLoc(); } item: any = ''; SelectLoc(e: any) { this.Loc = e.pickerName; } + //扫码查询 + async onOk() { + if (!this.dnNo) { + this.customToast(this.$t('message.Warehouse_Tip1') as any); + return; + } + if (!this.barCode) { + this.customToast(this.$t('message.barcode_PleaseScan') as any); + return; + } + if (!this.TheItem.materialCode) { + this.customToast(this.$t('message.DNLine_PleaseSelect') as any); + return; + } + const selctlist = { + barcode: this.barCode, + productCode: this.TheItem.materialCode, + loginName: session.loginName, + factoryCode: session.factoryCode, + }; + await this.model.stoDnProdScan(selctlist); + if (this.model.res.code == '1') { + this.customToast(this.$t('message.Warehouse_Tip9') as any); + const data = this.model.res.data; + this.locCode = data.locCode; + this.num = parseFloat(data.qty) - (data.cpRef4 ? parseFloat(data.cpRef4) : 0); + //this.TheItem.scanAmount = this.TheItem.scanAmount + 1; + //this.barCode = ''; + } + } num: any = ''; SunmitList: any = []; Add() { @@ -192,7 +230,11 @@ export default class dnReceiptDom extends BasePage { this.customToast(this.$t('message.Warehouse_Tip6') as any); return; } - if (!this.Loc) { + if (!this.barCode) { + this.customToast(this.$t('message.barcode_PleaseScan') as any); + return; + } + if (!this.locCode) { this.customToast(this.$t('message.Warehouse_Tip2') as any); return; } @@ -223,11 +265,14 @@ export default class dnReceiptDom extends BasePage { materialCode: this.TheItem.materialCode, orderAmount: this.TheItem.orderAmount, scanAmount: this.TheItem.orderAmount, - wlCode: this.Loc.value, + wlCode: this.locCode, nowAmount: this.num, + barCode: this.barCode, }; this.SunmitList.push(obj); + this.barCode = ''; this.num = ''; + this.locCode = ''; console.log('this.model.dnNoList', this.model.dnNoList); } deleteItem(e: any) { @@ -272,7 +317,9 @@ export default class dnReceiptDom extends BasePage { empty() { this.dnNo = ''; this.LocList = []; - this.Loc = {}; + this.locCode = ''; + this.num = ''; + this.barCode = ''; this.TheItem = {}; this.ItemIndex = 0; this.dnNoList = []; diff --git a/src/pages/raw/STO/STO-Outbound/model.ts b/src/pages/raw/STO/STO-Outbound/model.ts index b12cad3..7f884ee 100644 --- a/src/pages/raw/STO/STO-Outbound/model.ts +++ b/src/pages/raw/STO/STO-Outbound/model.ts @@ -1,3 +1,12 @@ +/* + * @Author: zhou lei + * @Date: 2022-09-28 10:26:36 + * @LastEditTime: 2022-10-12 11:56:22 + * @LastEditors: zhou lei + * @Description: 修改为扫描条码出库 + * @FilePath: \hgwms-factory-app\src\pages\raw\STO\STO-Outbound\model.ts + * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 + */ import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import store from '@/store'; import http from '@/utils/request'; @@ -52,6 +61,14 @@ export class ReceiptModule extends VuexModule { }); return { LocList }; } + //扫描条码 + res: any = ''; + @MutationAction + async stoDnProdScan(list: any) { + const res: any = await http.post(url.auth.query.barcode, list); + //const SubCode = res.code; + return { res }; + } //俄罗斯 出库提交 SubCode: any = ''; @MutationAction diff --git a/src/utils/url.ts b/src/utils/url.ts index e2751b7..5b7f86d 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -137,6 +137,9 @@ export const url = { //出库 outbound: { stoOutbound: { + dnQuery: '/wmspda/fg/findStoDnInfo/fg/russia', + stoDnProdScan: '/wmspda/fg/stoDnProdScan/russia', + stoDnOutPost: '/wmspda/fg/stoDnOut/post/russia', info: '/wmspda/material/orderout/queryStoPlan', findProdInfoByDN: '/wmspda/fg/findProdInfoByDN', yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse',