diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 3b10134..972d3d5 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -438,6 +438,7 @@ export default {
DocumentNumber: '文件号',
Posting: '过账',
fileNumber: '请输入文件号',
+ failed: '过账失败',
Warehouse_Tip10: '请选择sap库存地点',
Warehouse_Tip11: '该单号不存在或已经操作完成',
Warehouse_TotalNumber: '总数',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index b886219..4499299 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -21,6 +21,7 @@ export default {
request_Tip8: 'Gateway error',
inventory: 'inventory',
request_Tip9: 'Service Unavailable',
+ failed: 'Posting failed',
request_Tip10: 'Gateway timeout',
differences: 'differences',
shortage: 'shortage',
diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index 0a1a04d..7a295a7 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -71,9 +71,6 @@
{{ $t('message.Posting') }}
-
-
-
diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue
index 34b6598..ae43da6 100644
--- a/src/pages/raw/commission/entrant/index.vue
+++ b/src/pages/raw/commission/entrant/index.vue
@@ -269,10 +269,21 @@ export default class dnReceiptDom extends BasePage {
this.customToast(this.$t('message.Commission_tips5') as any);
return;
}
- await this.model.submitOutsourcing(this.list);
- this.empty();
- await this.QueryLoc();
- await this.query();
+ let res: any = await this.model.submitOutsourcing(this.list);
+ if (res.code == '2') {
+ uni.showToast({
+ duration: 2000,
+ title: this.$t('message.failed') as string,
+ image: '/static/icons/icon-52.png',
+ });
+ this.empty();
+ await this.QueryLoc();
+ await this.query();
+ } else {
+ this.empty();
+ await this.QueryLoc();
+ await this.query();
+ }
}
//跳转明细页面
async bill() {
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index 6294070..d127c2a 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -140,9 +140,6 @@ export default class RawReceiptDetail extends BasePage {
receiverName: '',
password: '',
};
- /**
- * 页面Module
- */
model = model;
materialList: any = [];
type = 'text';
@@ -151,15 +148,11 @@ export default class RawReceiptDetail extends BasePage {
operatorName = '';
//添加库位和数量的列表
LocationList: any = [];
- gather: any = [];
//库位
Location: any = [];
someIndex = 0;
some: any = {};
qty: any = '';
- /**
- * 表单数据
- */
form: any = {
documentNo: '',
amount: null,
@@ -168,17 +161,9 @@ export default class RawReceiptDetail extends BasePage {
operatorPass: '', // 接收人
rfPwd: '',
};
- /**
- * 表单校验
- */
rules: VFormRules = {
amount: [{ required: true, message: this.$t('message.Pi_tip1') as string }],
};
-
- /**
- * 库存地点选择
- */
- locationCodeSelect = false;
detailHeader = detailHeader;
empty() {
this.some = {};
@@ -232,22 +217,23 @@ export default class RawReceiptDetail extends BasePage {
this.Location = this.model.LocList;
this.wlCode = this.Location[0];
} else {
- this.Location = [];
- let content = {
- loginName: session.loginName,
- sendSpot: null,
- factoryCode: session.factoryCode,
- workArea: session.workareaCode,
- };
- let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
- res.forEach((item: any) => {
- let pickerName: any = {};
- pickerName.label = item.locationCode;
- pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
- pickerName.sendSpot = item.sendSpot;
- this.Location.push(pickerName);
- });
- this.wlCode = this.Location[0];
+ console.log('1');
+ // this.Location = [];
+ // let content = {
+ // loginName: session.loginName,
+ // sendSpot: null,
+ // factoryCode: session.factoryCode,
+ // workArea: session.workareaCode,
+ // };
+ // let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
+ // res.forEach((item: any) => {
+ // let pickerName: any = {};
+ // pickerName.label = item.locationCode;
+ // pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
+ // pickerName.sendSpot = item.sendSpot;
+ // this.Location.push(pickerName);
+ // });
+ // this.wlCode = this.Location[0];
}
}
async materialChoice(e: any) {
@@ -269,22 +255,23 @@ export default class RawReceiptDetail extends BasePage {
this.Location = this.model.LocList;
this.wlCode = this.Location[0];
} else {
- this.Location = [];
- let content = {
- loginName: session.loginName,
- sendSpot: null,
- factoryCode: session.factoryCode,
- workArea: session.workareaCode,
- };
- let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
- res.forEach((item: any) => {
- let pickerName: any = {};
- pickerName.label = item.locationCode;
- pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
- pickerName.sendSpot = item.sendSpot;
- this.Location.push(pickerName);
- });
- this.wlCode = this.Location[0];
+ console.log('1');
+ // this.Location = [];
+ // let content = {
+ // loginName: session.loginName,
+ // sendSpot: null,
+ // factoryCode: session.factoryCode,
+ // workArea: session.workareaCode,
+ // };
+ // let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
+ // res.forEach((item: any) => {
+ // let pickerName: any = {};
+ // pickerName.label = item.locationCode;
+ // pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
+ // pickerName.sendSpot = item.sendSpot;
+ // this.Location.push(pickerName);
+ // });
+ // this.wlCode = this.Location[0];
}
this.qty = '';
}
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 171ff34..0ec21dc 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -167,7 +167,7 @@ export const url = {
save: {
aggregate: '/wmspda/sortscan/save/aggregate',
order: '/wmspda/sortscan/save/order',
- queryWlByMat: '/wmspda/sortscan/queryWlByMat',
+ queryWlByMat: '/wmspda/sortscan/queryWlByMatBL',
},
unlock: {
list: '/wmspda/sortscan/unlock/list',
@@ -223,7 +223,7 @@ export const url = {
commit: '/wmspda/fg/completePd',
},
wholeTransfer: {
- list: '/wmspda/fg/getMdLocation',
+ list: '/wmspda/fg/getMdLocationFgAll',
content: '/wmspda/fg/getMaterialByCode',
del: '/wmspda/fg/scanBarcodeStock/del',
},