diff --git a/src/pages/raw/STO/STO-Outbound/index.vue b/src/pages/raw/STO/STO-Outbound/index.vue
index 2aabdf9..cd5a0ec 100644
--- a/src/pages/raw/STO/STO-Outbound/index.vue
+++ b/src/pages/raw/STO/STO-Outbound/index.vue
@@ -452,7 +452,7 @@ export default class dnReceiptDom extends BasePage {
display: flex;
.material-right-title {
- width: 140rpx;
+ width: 200rpx;
height: 100%;
line-height: 100rpx;
}
diff --git a/src/pages/raw/STO/STO-Storage/config.ts b/src/pages/raw/STO/STO-Storage/config.ts
index b7db42f..2df3db1 100644
--- a/src/pages/raw/STO/STO-Storage/config.ts
+++ b/src/pages/raw/STO/STO-Storage/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-Storage/index.vue b/src/pages/raw/STO/STO-Storage/index.vue
index 981ae2d..e98aa7b 100644
--- a/src/pages/raw/STO/STO-Storage/index.vue
+++ b/src/pages/raw/STO/STO-Storage/index.vue
@@ -76,14 +76,19 @@
{{ $t('message.CommissionedLocation') }}
+
+
+
+
+
{{ $t('message.dn_Number') }}:
-
+
{{ $t('message.product_add') }}
@@ -123,10 +128,13 @@ export default class dnReceiptDom extends BasePage {
Tabheaders = Tabheaders;
model = model;
dnNo: any = '';
+ firstFocus = false;
+ barCode: any = '';
dnNoList: any = [];
DnlineNo: any = {};
LocList: any = [];
Loc: any = {};
+ locCode: any = '';
async QueryLoc() {
await this.model.QueryLoc(this.TheItem.receiveRegion);
this.LocList = this.model.LocList;
@@ -181,6 +189,37 @@ export default class dnReceiptDom extends BasePage {
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.DnlineNo.value) {
+ this.customToast(this.$t('message.DNLine_PleaseSelect') as any);
+ return;
+ }
+ const selctlist = {
+ dnNo: this.dnNo,
+ barCode: this.barCode,
+ dnItem: this.DnlineNo.value,
+ 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.scanAmount);
+ //this.TheItem.scanAmount = this.TheItem.scanAmount + 1;
+ //this.barCode = '';
+ }
+ }
num: any = '';
SunmitList: any = [];
Add() {
@@ -192,10 +231,18 @@ export default class dnReceiptDom extends BasePage {
this.customToast(this.$t('message.Warehouse_Tip6') as any);
return;
}
+ if (!this.barCode) {
+ this.customToast(this.$t('message.barcode_PleaseScan') as any);
+ return;
+ }
if (!this.Loc) {
this.customToast(this.$t('message.Warehouse_Tip2') as any);
return;
}
+ // if (!this.Loc) {
+ // this.customToast(this.$t('message.Warehouse_Tip2') as any);
+ // return;
+ // }
if (!this.num) {
this.customToast(this.$t('message.Summary_PleaseInputNumber') as any);
return;
@@ -225,9 +272,12 @@ export default class dnReceiptDom extends BasePage {
scanAmount: this.TheItem.orderAmount,
wlCode: this.Loc.value,
nowAmount: this.num,
+ barCode: this.barCode,
};
this.SunmitList.push(obj);
this.num = '';
+ this.barCode = '';
+ //this.locCode = '';
console.log('this.model.dnNoList', this.model.dnNoList);
}
deleteItem(e: any) {
@@ -272,6 +322,8 @@ export default class dnReceiptDom extends BasePage {
empty() {
this.dnNo = '';
this.LocList = [];
+ this.barCode = '';
+ //this.locCode = '';
this.Loc = {};
this.TheItem = {};
this.ItemIndex = 0;
@@ -405,7 +457,7 @@ export default class dnReceiptDom extends BasePage {
display: flex;
.material-right-title {
- width: 140rpx;
+ width: 200rpx;
height: 100%;
line-height: 100rpx;
}
diff --git a/src/pages/raw/STO/STO-Storage/model.ts b/src/pages/raw/STO/STO-Storage/model.ts
index 2af7530..344a6d1 100644
--- a/src/pages/raw/STO/STO-Storage/model.ts
+++ b/src/pages/raw/STO/STO-Storage/model.ts
@@ -1,3 +1,12 @@
+/*
+ * @Author: zhou lei
+ * @Date: 2022-09-28 10:26:36
+ * @LastEditTime: 2022-10-28 20:00:58
+ * @LastEditors: zhou lei
+ * @Description:
+ * @FilePath: \hgwms-factory-app\src\pages\raw\STO\STO-Storage\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.stoDnReceiveScan, list);
+ //const SubCode = res.code;
+ return { res };
+ }
//俄罗斯 入库提交
SubCode: any = '';
@MutationAction
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 5d56232..f073642 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -35,6 +35,7 @@ export const url = {
queryByFactoryCodeAndWorkAreaCode: '/wmspda/fg/queryByFactoryCodeAndWorkAreaCode',
russia: '/wmspda/fg/stoDnConfirm/russia',
stoDnReceiveConfirm: '/wmspda/fg/stoDnReceiveConfirm/russia',
+ stoDnReceiveScan: '/wmspda/fg/stoDnReceiveScan/russia',
},
systime: '/wmspda/auth/systime',
userInfo: '/wmspda/auth/userinfo',