From b078f74536d7ef5f68bab724f75a7b800feffe1c Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Mon, 8 Aug 2022 17:55:25 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=96=B0=E5=A2=9E=20?=
=?UTF-8?q?=E6=B3=B0=E5=9B=BD=E5=A4=87=E4=BB=B6=E4=B8=8A=E6=9E=B6=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/lang/cn.ts | 3 +
src/i18n/lang/en.ts | 7 +-
src/i18n/lang/ru.ts | 3 +
.../Semi-finished/Semi-finished-SO/index.vue | 72 ++-------
.../Semi-finished-offline/index.vue | 2 +-
.../raw/commission/RUS-entrant/config.ts | 2 +-
.../raw/commission/RUS-entrant/index.vue | 3 +-
src/pages/raw/commission/entrant/config.ts | 2 +-
.../SpareInbound/SparePartsStores/index.vue | 140 ++++--------------
.../SpareInbound/SparePartsStores/model.ts | 8 +-
.../raw/warehouse/Container-scrap/index.vue | 4 +
.../raw/warehouse/Container-scrap/model.ts | 2 +-
src/utils/url.ts | 2 +
13 files changed, 72 insertions(+), 178 deletions(-)
diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 8102c5e..93d2651 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -475,5 +475,8 @@ export default {
shelves: '备件上架',
undercarriage: '备件下架',
SparePartsOutbound: '备件出库',
+ shelvesCode: '上架单号',
+ plan: '计划数量',
+ QuantityShelves: '已上架数量',
},
};
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 60410e8..ffe726a 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -181,8 +181,8 @@ export default {
Pi_QuantityHandedOver: 'Handedover Qty',
Pi_distribution: 'Distribution',
successful: 'Query was successful',
- ModelCode: 'code',
- ModelName: 'material',
+ ModelCode: 'MAT DESC',
+ ModelName: 'MAT CODE',
ModelScanned: 'Model scanned',
Pi_tip13: 'Please select the material to submit',
Pi_tip15: 'Please ensure that the handover quantity is equal to the demand quantity',
@@ -475,5 +475,8 @@ export default {
shelves: 'Shelves',
ndercarriage: 'Under',
SparePartsOutbound: 'outbound',
+ shelvesCode: 'Code',
+ plan: 'Plan QTY',
+ QuantityShelves: 'Shelves QTY',
},
};
diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts
index a6a19be..bf473b2 100644
--- a/src/i18n/lang/ru.ts
+++ b/src/i18n/lang/ru.ts
@@ -475,5 +475,8 @@ export default {
shelves: 'продаж',
ndercarriage: 'С полок',
SparePartsOutbound: 'На продаж',
+ shelvesCode: 'номер',
+ plan: 'план',
+ QuantityShelves: 'На крыше',
},
};
diff --git a/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue b/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
index 5b8cb11..3fbd84c 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
@@ -237,39 +237,6 @@ export default class SemiFinishedSO extends BasePage {
return;
}
}
- // let codenum = 0;
- // if (this.list.length != 0) {
- // this.list.forEach((item: any) => {
- // if (item.barCode == this.Container.barcode) {
- // num += parseFloat(item.receiptAmount);
- // }
- // });
- // }
- // if (this.Container.cpRef4 == null) {
- // if (parseFloat(this.nowAmount) + codenum > this.Container.qty) {
- // this.customToast(this.$t('message.AppendMateriel3') as any);
- // console.log('3');
- // return;
- // }
- // } else {
- // if (parseFloat(this.nowAmount) + codenum > this.Container.qty - parseFloat(this.Container.cpRef4)) {
- // this.customToast(this.$t('message.AppendMateriel3') as any);
- // console.log('4');
- // return;
- // }
- // }
- let isTrue = true;
- if (this.list.length != 0) {
- this.list.forEach((item: any) => {
- if (item.barCode == this.Container.barcode) {
- return (isTrue = false);
- }
- });
- }
- if (isTrue != true) {
- this.customToast(this.$t('message.repeatedly') as any);
- return;
- }
if (!this.every) {
this.customToast(this.$t('message.Commission_tips6') as any);
return;
@@ -282,33 +249,22 @@ export default class SemiFinishedSO extends BasePage {
this.customToast(this.$t('message.Commission_tips3') as any);
return;
}
+ let isTrue = true;
+ if (this.list.length != 0) {
+ this.list.forEach((item: any) => {
+ if (item.barcode == this.Container.barcode) {
+ return (isTrue = false);
+ }
+ });
+ }
+ if (isTrue != true) {
+ this.customToast(this.$t('message.repeatedly') as any);
+ this.Container = '';
+ this.Barcode = '';
+ return;
+ }
let num: number = parseFloat(this.nowAmount) + parseFloat(this.every.outAmount);
if (num > parseFloat(this.every.orderAmount)) {
- // uni.showModal({
- // title: this.$t('message.Pi_tip') as any,
- // content: this.$t('message.demandQuantity') as any,
- // cancelText: this.$t('message.Cancel') as any,
- // confirmText: this.$t('message.workArea_Confirm') as any,
- // success: (res) => {
- // if (res.confirm) {
- // let arr = {
- // poNo: this.form.documentNo,
- // materialCode: this.every.materialCode,
- // loginName: this.session.loginName,
- // factoryCode: this.session.factoryCode,
- // wlCode: this.wlCode.label,
- // nowAmount: this.nowAmount,
- // // barCode: this.Container.barcode,
- // barCode: this.Barcode,
- // };
- // this.list.push(arr);
- // this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].nowAmount);
- // this.nowAmount = '';
- // } else if (res.cancel) {
- // return;
- // }
- // },
- // });
this.customToast(this.$t('message.AppendMateriel3') as any);
console.log('5');
return;
diff --git a/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
index e00b906..1c05c01 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
@@ -300,7 +300,7 @@ export default class finishProductOfflineDom extends BasePage {
height: 100%;
display: flex;
.material-right-title {
- width: 140rpx;
+ width: 93px;
height: 100%;
line-height: 100rpx;
}
diff --git a/src/pages/raw/commission/RUS-entrant/config.ts b/src/pages/raw/commission/RUS-entrant/config.ts
index 595e20d..48aebbe 100644
--- a/src/pages/raw/commission/RUS-entrant/config.ts
+++ b/src/pages/raw/commission/RUS-entrant/config.ts
@@ -34,7 +34,7 @@ export const headers = [
},
{
label: vm.$t('message.CommissionedLocation'),
- key: 'sendSpot',
+ key: 'wlCode',
width: 200,
},
{
diff --git a/src/pages/raw/commission/RUS-entrant/index.vue b/src/pages/raw/commission/RUS-entrant/index.vue
index fc40d81..de54a76 100644
--- a/src/pages/raw/commission/RUS-entrant/index.vue
+++ b/src/pages/raw/commission/RUS-entrant/index.vue
@@ -82,7 +82,7 @@
- {{ $t('message.CommissionedEntrantDetails') }}
+ {{ $t('message.CommissionedDetails') }}
{{ $t('message.product_Upload') }}
@@ -375,6 +375,7 @@ export default class dnReceiptDom extends BasePage {
receiptAmount: this.receiptAmount,
wlCode: this.wl.label,
palletCode: this.Container.palletCode,
+ // palletCode: this.Barcode,
});
this.DNReceivingList[this.everyIndex].wllist.push(this.LocationList[this.LocationList.length - 1]);
let num: any = 0;
diff --git a/src/pages/raw/commission/entrant/config.ts b/src/pages/raw/commission/entrant/config.ts
index d101737..284d5a6 100644
--- a/src/pages/raw/commission/entrant/config.ts
+++ b/src/pages/raw/commission/entrant/config.ts
@@ -34,7 +34,7 @@ export const headers = [
},
{
label: vm.$t('message.CommissionedLocation'),
- key: 'sendSpot',
+ key: 'wlCode',
width: 200,
},
];
diff --git a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue
index 9e4c2d5..e65a90c 100644
--- a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue
+++ b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue
@@ -4,61 +4,61 @@
- {{ $t('message.SemiProductGetOutOfTheWarehouse') }}
+ {{ $t('message.shelves') }}
-
+
- {{ $t('message.Batch') }}
-
+ {{ $t('message.InventoryOrderNo') }}:
+
- {{ $t('message.generate') }}
+ {{ $t('message.Query') }}
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{ $t('message.detailed') }}
-
-
+
{{ $t('message.workArea_Confirm') }}
-
+
{{ $t('message.po_Return') }}
@@ -102,93 +102,21 @@ export default class productCheckReceipt extends BasePage {
};
value = '';
show = false;
- //选择目标库位回调函数
- bookTypeChange(e: any) {
- this.form.aimWl = e.pickerName;
- }
selectItem(e: any) {
this.remove = e.pickerName;
- this.model.removeList.forEach((item: any) => {
- if (item.materialCode == this.remove.value) {
- this.histroyItem = item;
- console.log('this.histroyItem', this.histroyItem);
- }
- });
- }
- //扫描条码回车
- async query() {
- if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
- this.customToast(this.$t('message.product_unit7') as string);
- return;
- }
- if (this.userDefined4 == '' || this.userDefined4.length == 0) {
- this.customToast(this.$t('message.Warehouse_Tip') as string);
- return;
- }
- await model.getProductCode(this.form.productCode);
- if (this.model.code == '1') {
- uni.showToast({
- //icon: 'success',
- title: this.$t('message.successful') as string,
- duration: 2000,
- image: '/static/icons/icon-51.png',
- });
- }
- }
- //查询已扫物料
- async QueryHistory() {
- if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
- this.customToast(this.$t('message.barcode') as string);
- return;
- }
- this.allNum = 0;
- let params = {
- loginName: session.loginName,
- factoryCode: session.factoryCode,
- proMoveCode: this.userDefined4,
- };
- await this.model.QueryHistory(params);
- 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() {
- this.$form.setRules(this.rules);
- this.model.empty();
await this.model.queryLocation();
- this.form.aimWl = this.model.WlList[0];
+ this.remove = this.model.WlList[0];
}
//点击生成随机移库码
- async generate() {
+ async query() {
await this.model.getCpMoveBatchNo({
loginName: session.loginName,
});
this.userDefined4 = model.userDefined;
}
- //移库明细
- async bill() {
- if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
- this.customToast(this.$t('message.LibraryCode') as string);
- return;
- }
- await this.model.querydetaildlist(this.userDefined4);
- this.toPage(this.page.raw.SemiFinished.SemiFinishedRowTcransfer.detail);
- }
//移库确认
onSubmit() {
this.$form.validate(async (valid: boolean) => {
@@ -230,10 +158,6 @@ export default class productCheckReceipt extends BasePage {
// this.query()
this.form.productCode = '';
this.allNum = 0;
- this.QueryHistory();
- // setTimeout(() => {
- // this.$forceUpdate();
- // }, 2000);
}
});
}
diff --git a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts
index 9e73c52..317319a 100644
--- a/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts
+++ b/src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts
@@ -38,11 +38,9 @@ export class wholeTransfer extends VuexModule {
orderInInfo: OrderInInfo = new OrderInInfo();
@MutationAction
async queryLocation() {
- const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationSfgLine, {
- params: {
- factoryCode: session.factoryCode,
- loginName: session.loginName,
- },
+ const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
+ factoryCode: session.factoryCode,
+ loginName: session.loginName,
});
console.log('库位数据', result);
const WlList = result.data.map((_: any) => ({
diff --git a/src/pages/raw/warehouse/Container-scrap/index.vue b/src/pages/raw/warehouse/Container-scrap/index.vue
index 58b1245..0ffe73e 100644
--- a/src/pages/raw/warehouse/Container-scrap/index.vue
+++ b/src/pages/raw/warehouse/Container-scrap/index.vue
@@ -53,6 +53,7 @@ import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import model from './model';
import jPicker from '@/components/J-Picker/jPicker.vue';
+import { session } from '@/store/modules/session';
@Component({
components: {
jPicker,
@@ -100,6 +101,9 @@ export default class KanDanHandOver extends BasePage {
locCode: this.every.locCode,
qty: this.every.qty,
cpRef4: this.every.cpRef4,
+ reason: this.reason,
+ factoryCode: session.factoryCode,
+ loginName: session.loginName,
};
await this.model.submit(params);
if (this.model.submitCode == '1') {
diff --git a/src/pages/raw/warehouse/Container-scrap/model.ts b/src/pages/raw/warehouse/Container-scrap/model.ts
index b5565a7..46235e4 100644
--- a/src/pages/raw/warehouse/Container-scrap/model.ts
+++ b/src/pages/raw/warehouse/Container-scrap/model.ts
@@ -31,7 +31,7 @@ export class rowTransfer extends VuexModule {
submitCode: any = '';
@MutationAction
async submit(params: any) {
- const res: any = await http.post(url.warehouse.container.russia, params);
+ const res: any = await http.post(url.warehouse.container.scrapContainers, params);
const submitCode = res.code;
return { submitCode };
}
diff --git a/src/utils/url.ts b/src/utils/url.ts
index bc2e650..feab4fb 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -241,6 +241,7 @@ export const url = {
getRawStorageSnNew: '/wmspda/material/getRawStorageSnNew',
getOdsRawStorageSnNew: '/wmspda/bl/getOdsRawStorageSnNew',
russia: '/wmspda/material/restructureContainer/russia',
+ scrapContainers: '/wmspda/material/scrapContainers',
},
rowScrap: {
list: '/wmspda/fg/listByOrder',
@@ -264,6 +265,7 @@ export const url = {
getOdsRawStorageSnNew: 'wmspda/bl/getOdsRawStorageSnNew',
del: '/wmspda/fg/scanBarcodeStock/del',
getMdLocationSfgLine: '/wmspda/fg/getMdLocationSfgLine',
+ getSpareMdLocation: '/wmspda/sparePart/getSpareMdLocation',
},
wholeLnventory: {
content: '/wmspda/fg/findMaterialByPddNo',