diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 66c44fc..2549d56 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -422,6 +422,7 @@ export default {
selectCode: '请先选择编码',
standard: '条码长度必须是20位',
Warehouse_Tip8: '请输入成本中心',
+ barCodeLength:'条码长度不足20位',
Warehouse_Tip9: '操作成功',
DocumentNumber: '文件号',
Posting: '过账',
@@ -435,6 +436,7 @@ export default {
Warehouse_YJ: '样机',
Warehouse_BCP: '半成品',
DocumentScanned: '单据已扫',
+ Inventory_count:'盘点数',
//提示
AppendMateriel1: '请输入正确的库位和数量',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 5d55925..c4e7010 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -57,6 +57,7 @@ export default {
workArea_WorkAreaName: 'Work area name',
workArea_WarehouseClassify: 'WH classify',
Confirm:'Confirm',
+ Inventory_count:'Inventory count',
workArea_Confirm: 'Confirm',
//jpicker提示
unselected: 'Unchecked',
@@ -88,6 +89,7 @@ export default {
po_PleaseScan: 'Please scan PO',
po_PleaseScanMATcode: 'Please scan MAT barcode',
PleaseScan: 'Please scan',
+ barCodeLength:'FG barcode length must be 20',
po_PleaseInput: 'Plz input',
po_PleaseInputcar: 'Please input transfer vehicle',
po_PleaseSlect: 'Please select Loc',
diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue
index 7bb2764..d9308b8 100644
--- a/src/pages/product/inbound/finishProductOffline/index.vue
+++ b/src/pages/product/inbound/finishProductOffline/index.vue
@@ -247,7 +247,11 @@ export default class finishProductOfflineDom extends BasePage {
this.customToast(this.$t('message.product_Tip3') as string);
return;
}
- if(this.form.barCode.trim().length != 20){
+ if(this.form.barCode.length < 20){
+ this.customToast(this.$t('message.barCodeLength') as string);
+ return
+ }
+ if(this.form.barCode.length > 20){
this.customToast(this.$t('message.standard') as string);
return
}
diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index aba35dc..9afa09f 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -317,7 +317,9 @@ export default class stoOutboundDom extends BasePage {
// this.firstFocus = true;
// }, 0);
// }
- Posting() {}
+ Posting() {
+
+ }
onOk() {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index 29ecf70..aea3604 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -142,10 +142,23 @@ export default class productCheckReceipt extends BasePage {
proMoveCode: this.userDefined4,
};
await this.model.QueryHistory(params);
- this,
- model.removeList.forEach((item: any) => {
- this.allNum += parseFloat(item.proNum);
+ this.model.removeList.forEach((item: any) => {
+ this.allNum += parseFloat(item.proNum);
+ });
+ if (this.model.removeMaterialList.length == 0) {
+ this.remove = {};
+ this.histroyItem.proNum = 0;
+ this.histroyItem.materialDesc = '';
+ console.log('11111111111111111');
+ console.log('this.histroyItem', this.histroyItem);
+ } else {
+ this.remove = this.model.removeMaterialList[0];
+ this.model.removeList.forEach((item: any) => {
+ if ((item.materialCode = this.remove.value)) {
+ this.histroyItem = item;
+ }
});
+ }
}
//页面初始化
async onReady() {
diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
index 2db0ea0..d2fdc85 100644
--- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue
+++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
@@ -293,14 +293,14 @@ export default class RawReceiptDetail extends BasePage {
}
async onSubmit() {
let isTrue = true;
- this.model.dnReturnList.forEach((item: any) => {
- if (item.receiptAmount != null || item.receiptAmount != 0) {
- if (item.receiptAmount != item.poAmount) {
- this.customToast(this.$t('message.materials') as any);
- return (isTrue = false);
- }
- }
- });
+ // this.model.dnReturnList.forEach((item: any) => {
+ // if (item.receiptAmount != null || item.receiptAmount != 0) {
+ // if (item.receiptAmount != item.poAmount) {
+ // this.customToast(this.$t('message.materials') as any);
+ // return (isTrue = false);
+ // }
+ // }
+ // });
if (isTrue) {
await this.model.submit(this.LocationList).then(() => {
if (this.model.code == '1') {
diff --git a/src/pages/raw/warehouse/rowInventory/index.vue b/src/pages/raw/warehouse/rowInventory/index.vue
index 3b4a186..3a1ff1a 100644
--- a/src/pages/raw/warehouse/rowInventory/index.vue
+++ b/src/pages/raw/warehouse/rowInventory/index.vue
@@ -13,15 +13,26 @@
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
@@ -69,6 +80,8 @@ export default class rawMaterialInventory extends BasePage {
// 盘点数量
spQty: null,
};
+ originWl: any = {};
+ list: any = [];
cboPlaceSelect = false;
rules: VFormRules = {
pddNo: [{ required: true, message: this.$t('message.dn_PleaseScan') as string }],
@@ -76,6 +89,7 @@ export default class rawMaterialInventory extends BasePage {
};
value = '';
show = false;
+ originWlSelect = false;
// 扫描物料号检查
async checkRawProductCode(productCode: string) {
let result = await model.checkRawProductCode({