diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 9521719..1d0aaf1 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -171,7 +171,7 @@ export default class LoginPage extends BasePage {
console.log('......', server.serverAddress);
if (server.serverAddress.includes('https://eurmom.haier.net')) {
//修改俄罗斯版本号
- this.Version = '1.1.34';
+ this.Version = '1.1.35';
} else {
this.Version = '1.0.49';
}
diff --git a/src/pages/raw/LineSide/LineSide-inventory/index.vue b/src/pages/raw/LineSide/LineSide-inventory/index.vue
index ccd3d0f..8a4d12d 100644
--- a/src/pages/raw/LineSide/LineSide-inventory/index.vue
+++ b/src/pages/raw/LineSide/LineSide-inventory/index.vue
@@ -40,7 +40,7 @@
-
+
@@ -84,6 +84,7 @@ export default class rawMaterialInventory extends BasePage {
spQty: any = '';
productItem: any = {};
allNum = 0;
+ spQtyed = 0;
originWlSelect = false;
wl: any = {};
barcode: any = '';
@@ -102,6 +103,7 @@ export default class rawMaterialInventory extends BasePage {
this.spQty = '';
this.productItem = {};
this.allNum = 0;
+ // this.spQtyed = 0;
this.scanreturndata = {};
this.barcode = '';
}
@@ -186,6 +188,7 @@ export default class rawMaterialInventory extends BasePage {
uni.showToast({ title: this.$t('message.Warehouse_Tip9') as any });
this.empty();
this.pddNo = '';
+ this.spQtyed = 0;
}
} else if (res.cancel) {
return;
@@ -212,14 +215,10 @@ export default class rawMaterialInventory extends BasePage {
//this.customToast(this.$t('message.Warehouse_Tip9') as string);
// if (JSON.stringify(this.model.InventoryList).indexOf(this.model.Semifedcode) != -1) {
//this.scanreturndata = this.model.scandata;
+ ///&& item.locCode == this.model.scandata.locCode
this.spQty = Number(this.model.scandata.barQty);
- this.model.InventoryList.forEach((item: any) => {
- if (item.productCode == this.model.scandata.productCode && item.locCode == this.model.scandata.locCode) {
- this.productItem = item;
- // this.wl = item;
- this.productItem.spQty += 1;
- }
- });
+ this.productItem = this.model.scandata;
+ this.spQtyed += 1;
// } else {
// this.customToast(this.$t('message.Nomatch') as string);
// }
diff --git a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
index d5fed6c..e5188a0 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
@@ -40,7 +40,7 @@
-
+
@@ -84,6 +84,7 @@ export default class rawMaterialInventory extends BasePage {
spQty: any = '';
productItem: any = {};
allNum = 0;
+ spQtyed = 0;
originWlSelect = false;
wl: any = {};
barcode: any = '';
@@ -102,6 +103,7 @@ export default class rawMaterialInventory extends BasePage {
this.spQty = '';
this.productItem = {};
this.allNum = 0;
+ //this.spQtyed = 0;
this.scanreturndata = {};
this.barcode = '';
}
@@ -163,7 +165,8 @@ export default class rawMaterialInventory extends BasePage {
factoryCode: this.session.factoryCode,
loginName: this.session.loginName,
pddNo: this.pddNo,
- pddItem: this.productItem.pddItem,
+ // pddItem: this.productItem.pddItem,
+ productStatus: this.model.scandata.productStatus,
productCode: this.productItem.productCode,
locCode: this.productItem.locCode,
barcode: this.barcode,
@@ -186,6 +189,7 @@ export default class rawMaterialInventory extends BasePage {
uni.showToast({ title: this.$t('message.Warehouse_Tip9') as any });
this.empty();
this.pddNo = '';
+ this.spQtyed = 0;
}
} else if (res.cancel) {
return;
@@ -207,19 +211,22 @@ export default class rawMaterialInventory extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
- await this.model.getRawStorageSnNew(this.barcode);
+ await this.model.getRawStorageSnNew({ barcode: this.barcode, locCode: this.model.InventoryList[0].locCode });
if (this.model.Semifedcode == '1') {
//this.customToast(this.$t('message.Warehouse_Tip9') as string);
// if (JSON.stringify(this.model.InventoryList).indexOf(this.model.Semifedcode) != -1) {
//this.scanreturndata = this.model.scandata;
this.spQty = Number(this.model.scandata.barQty);
- this.model.InventoryList.forEach((item: any) => {
- if (item.productCode == this.model.scandata.productCode && item.locCode == this.model.scandata.locCode) {
- this.productItem = item;
- // this.wl = item;
- this.productItem.spQty += 1;
- }
- });
+ this.productItem = this.model.scandata;
+ // this.wl = item;
+ this.spQtyed += 1;
+ // this.model.InventoryList.forEach((item: any) => {
+ // if (item.productCode == this.model.scandata.productCode && item.locCode == this.model.scandata.locCode) {
+ // this.productItem = item;
+ // // this.wl = item;
+ // this.productItem.spQty += 1;
+ // }
+ // });
// } else {
// this.customToast(this.$t('message.Nomatch') as string);
// }
diff --git a/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts b/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts
index 1076f59..60af7ae 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts
+++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts
@@ -190,9 +190,9 @@ export class ReceiptModule extends VuexModule {
* @param barcode
*/
@MutationAction
- async getRawStorageSnNew(barcode: string) {
- const res: any = await http.post(url.material.rawMaterialInventory.getRawStorageSnNew, {
- barcode,
+ async getRawStorageSnNew(param: any) {
+ const res: any = await http.post(url.material.rawMaterialInventory.newbarcodeScanPd, {
+ ...param,
factoryCode: session.factoryCode,
loginName: session.loginName,
});
@@ -283,7 +283,7 @@ export class ReceiptModule extends VuexModule {
*/
@MutationAction
async checkRawOrderComplete(pddNo?: string | null) {
- const res: any = await http.post(url.material.rawMaterialInventory.orderComplete, {
+ const res: any = await http.post(url.material.rawMaterialInventory.sfgPdorderComplete, {
pddNo,
factoryCode: session.factoryCode,
loginName: session.loginName,
diff --git a/src/utils/url.ts b/src/utils/url.ts
index ed47cb9..062b67e 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -108,6 +108,8 @@ export const url = {
getRawStorageSnNew: '/wmspda/material/getRawStorageSnNew',
barcodeConfirm: '/wmspda/product/finished/sfgPd/barcodeConfirm',
barcodeScanPd: '/wmspda/material/barcodeScanPd',
+ newbarcodeScanPd: '/wmspda/material/inventoryPd/barcodeScanPd',
+ sfgPdorderComplete: '/wmspda/product/finished/sfgPd/orderComplete',
},
// 委外 commission
commission: {