Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmoim-852 fix 新增 泰国备件上架页面

Browse Source
master
hou 3 years ago
parent 1e6ee39bd4
commit b078f74536
13 changed files with 72 additions and 178 deletions
Show Stats Download Patch File Download Diff File

3
src/i18n/lang/cn.ts
Unescape Escape View File

@ -475,5 +475,8 @@ export default {
shelves: '备件上架',
undercarriage: '备件下架',
SparePartsOutbound: '备件出库',
shelvesCode: '上架单号',
plan: '计划数量',
QuantityShelves: '已上架数量',
},
};

7
src/i18n/lang/en.ts
Unescape Escape View File

@ -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',
},
};

3
src/i18n/lang/ru.ts
Unescape Escape View File

@ -475,5 +475,8 @@ export default {
shelves: 'продаж',
ndercarriage: 'С полок',
SparePartsOutbound: 'На продаж',
shelvesCode: 'номер',
plan: 'план',
QuantityShelves: 'На крыше',
},
};

72
src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
Unescape Escape View File

@ -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;

2
src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
Unescape Escape View File

@ -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;
}

2
src/pages/raw/commission/RUS-entrant/config.ts
Unescape Escape View File

@ -34,7 +34,7 @@ export const headers = [
},
{
label: vm.$t('message.CommissionedLocation'),
key: 'sendSpot',
key: 'wlCode',
width: 200,
},
{

3
src/pages/raw/commission/RUS-entrant/index.vue
Unescape Escape View File

@ -82,7 +82,7 @@
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="4">
<u-button type="primary" @click="bill">{{ $t('message.CommissionedEntrantDetails') }}</u-button>
<u-button type="primary" @click="bill">{{ $t('message.CommissionedDetails') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
@ -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;

2
src/pages/raw/commission/entrant/config.ts
Unescape Escape View File

@ -34,7 +34,7 @@ export const headers = [
},
{
label: vm.$t('message.CommissionedLocation'),
key: 'sendSpot',
key: 'wlCode',
width: 200,
},
];

140
src/pages/raw/ingoods/SpareInbound/SparePartsStores/index.vue
Unescape Escape View File

@ -4,61 +4,61 @@
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
</view>
<view class="title">{{ $t('message.SemiProductGetOutOfTheWarehouse') }}</view>
<view class="title">{{ $t('message.shelves') }}</view>
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<!-- 移库码 -->
<!-- 单号 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Batch') }}</view>
<u-search :placeholder="$t('message.batch')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
<view>{{ $t('message.InventoryOrderNo') }}:</view>
<u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="userDefined4" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" style="height: 60rpx; width: 140rpx" @click="generate">{{ $t('message.generate') }}</u-button>
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view>
</view>
<!-- 总数 -->
<u-form-item :label="$t('message.Warehouse_TotalNumber')">
<u-input :disabled="true" v-model="allNum" placeholder="" />
<!-- 上架单号 -->
<u-form-item :label="$t('message.shelvesCode')">
<jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.WlList" />
</u-form-item>
<!-- 半成品编码 -->
<u-form-item :label="$t('message.coding')">
<jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.removeMaterialList" />
</u-form-item>
<!-- 半成品描述 -->
<u-form-item :label="$t('message.Description')">
<!-- 物料编码 -->
<u-form-item :label="$t('message.matcode')">
<u-input :disabled="true" v-model="histroyItem.materialDesc" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 数量 -->
<u-form-item :label="$t('message.product_Number')">
<!-- 物料描述 -->
<u-form-item :label="$t('message.po_MaterielDes')">
<u-input :disabled="true" v-model="histroyItem.materialDesc" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 行项目 -->
<u-form-item :label="$t('message.Line')">
<u-input :disabled="true" v-model="histroyItem.materialDesc" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 计划数量 -->
<u-form-item :label="$t('message.plan')">
<u-input :disabled="true" v-model="histroyItem.proNum" placeholder="" />
</u-form-item>
<!-- 已上架数量 -->
<u-form-item :label="$t('message.QuantityShelves')">
<u-input :disabled="true" v-model="histroyItem.proNum" placeholder="" />
</u-form-item>
<!-- 库位 -->
<u-form-item :label="$t('message.CommissionedLocation')">
<jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.WlList" />
</u-form-item>
<!-- 条码 -->
<u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
</u-form-item>
<!-- 库位 -->
<u-form-item :label="$t('message.product_Location')">
<u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
</u-form-item>
<!-- 目标库位 -->
<u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
</u-form-item>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<!-- 移库明细 -->
<u-col :span="4">
<u-button type="primary" @click="bill">{{ $t('message.detailed') }}</u-button>
</u-col>
<!-- 确定 -->
<u-col :span="4">
<u-col :span="6">
<u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
</u-col>
<!-- 返回 -->
<u-col :span="4">
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
</u-col>
</u-row>
@ -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);
}
});
}

8
src/pages/raw/ingoods/SpareInbound/SparePartsStores/model.ts
Unescape Escape View File

@ -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) => ({

4
src/pages/raw/warehouse/Container-scrap/index.vue
Unescape Escape View File

@ -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') {

2
src/pages/raw/warehouse/Container-scrap/model.ts
Unescape Escape View File

@ -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 };
}

2
src/utils/url.ts
Unescape Escape View File

@ -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',

Write Preview
Loading…
Cancel
Save