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

成品出库

Browse Source
master
guoshuang 4 years ago
parent f0156e651e
commit 9babd49ac1
9 changed files with 136 additions and 55 deletions
Show Stats Download Patch File Download Diff File

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

@ -102,6 +102,7 @@ export default {
dn_Tip2: '实际退货数量不能大于需求数量',
dn_Tip3: '实际收货数量小于需求数量',
Line: '行项目',
po_Deliver: '出库',
//交接菜单页
Handover: '交接',
Picking: '拣配',

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

@ -305,6 +305,7 @@ export default {
Line: 'rowItem',
screen: 'screen',
time: 'Please select the time first',
po_Deliver: 'deliver',
//成品入库主菜单
product_item1: 'FG inward',
product_item2: 'Transfer vehicle offline',

120
src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
Unescape Escape View File

@ -33,7 +33,7 @@
<u-row gutter="0">
<u-col :span="6">
<u-form-item :label="$t('message.product_MaterilTotalNumber')">
<u-input v-model="form.orderAmount" :disabled="true" />
<u-input v-model="form.orderAmount" placeholder="" :disabled="true" />
</u-form-item>
</u-col>
<u-col :span="6">
@ -42,25 +42,28 @@
</u-form-item>
</u-col>
</u-row>
<!-- 扫码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.barCode" @search="onSubmit" :focus="firstFocus" :show-action="false"></u-search>
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.barCode" @search="onOk" :focus="firstFocus" :show-action="false"></u-search>
</u-form-item>
<u-col :span="12">
<!-- <u-col :span="12">
<view class="table-wrapper">
<wyb-table class="table" ref="table" width="100%" enable-check="multiple" show-left-and-right-border :headers="headers" :contents="materialList" :show-vert-border="false" @onCheck="onCheck"></wyb-table>
</view>
</u-col>
</u-col> -->
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="4">
<u-button type="warning" @click="toPage(page.product.outbound.stoOutboundDetail)">{{ $t('message.detailed') }}</u-button>
<!-- Guoshuang 详细跳转要改，调接口 -->
<u-col :span="6">
<u-button type="warning" @click="detailed">{{ $t('message.detailed') }}</u-button>
</u-col>
<u-col :span="4">
<!-- <u-col :span="4">
<u-button type="error" @click="resetHandle">{{ $t('message.product_Empty') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="primary" @click="onOk">{{ $t('message.po_Submit') }}</u-button>
</u-col> -->
<!-- Guoshuang 出库要改，入参 -->
<u-col :span="6">
<u-button type="primary" @click="onOk">{{ $t('message.po_Deliver') }}</u-button>
</u-col>
<!-- <u-col :span="3">-->
<!-- <u-button type="success" @click="uni.navigateBack()">重提</u-button>-->
@ -141,20 +144,33 @@ export default class stoOutboundDom extends BasePage {
this.$form.setRules(this.rules);
model.queryReturningTypeList();
}
onCheck(e: any) {
console.log('e.data', e.data);
this.selectMaterielList = [];
e.data.forEach((line: any) => {
const { lineData: item } = line;
this.selectMaterielList.push(item);
});
}
//去掉页面表格，没有了onCheck方法
// onCheck(e: any) {
// console.log('e.data', e.data);
// this.selectMaterielList = [];
// e.data.forEach((line: any) => {
// const { lineData: item } = line;
// this.selectMaterielList.push(item);
// });
// }
back() {
this.form.barCode = '';
this.model.orderInInfo.stoAmount = 0;
this.selectMaterielList = [];
uni.navigateBack({ delta: 1 });
this.$table.onEmpty();
//this.$table.onEmpty();
}
//查询单号详细页面
async detailed() {
if (!this.form.orderNo) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips1') as any,
});
return;
}
await this.model.queryDetailed(this.form.orderNo);
this.toPage(this.page.product.outbound.stoOutboundDetail);
}
async query() {
if (!this.form.orderNo) {
@ -220,7 +236,7 @@ export default class stoOutboundDom extends BasePage {
/**
* 条码回车
*/
//扫码也要改，扫码
onSubmit() {
this.$form.validate(async (valid: boolean) => {
// if (this.form.productCode.slice(0, 9) != this.form.barCode.slice(0, 9)) {
@ -265,6 +281,7 @@ export default class stoOutboundDom extends BasePage {
// // this.materialList.push(res);
// this.form.scanAmount = res.scanAmount;
// }
//guoshuang 注掉
if (this.materialList.length == 0) {
await this.materialList.push(res);
this.form.scanAmount += 1;
@ -308,26 +325,46 @@ export default class stoOutboundDom extends BasePage {
// } else {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
let selctlist: any = [];
this.selectMaterielList.forEach((item: any, index: any) => {
// item.originWl = item.locCode;
selctlist[index] = {
barCode: item.barcode,
keepBy: session.loginName,
loginName: session.loginName,
order3: this.form.orderNo,
orderType: 4,
type: 0,
productCode: item.productCode,
productDescZh: item.productDescZh,
orderItem: this.form.rowItem,
originWl: item.locCode,
dockCode: item.dockCode,
dockName: item.dockName,
whCode: item.whCode,
regionCode: item.regionCode,
};
});
if (parseInt(this.form.orderAmount) <= this.form.scanAmount) {
uni.showToast({
icon: 'none',
title: this.$t('message.product_Tip6') as string,
});
return;
}
//let selctlist: any = [];
//selectMaterielList 是选中表格数据列表
// this.selectMaterielList.forEach((item: any, index: any) => {
// // item.originWl = item.locCode;
// selctlist[index] = {
// barCode: item.barcode,
// keepBy: session.loginName,
// loginName: session.loginName,
// //单号
// order3: this.form.orderNo,
// orderType: 4,
// type: 0,
// productCode: item.productCode,
// productDescZh: item.productDescZh,
// orderItem: this.form.rowItem,
// originWl: item.locCode,
// dockCode: item.dockCode,
// dockName: item.dockName,
// whCode: item.whCode,
// regionCode: item.regionCode,
// };
// });
const selctlist = {
barcode: this.form.barCode,
loginName: session.loginName,
factoryCode: session.factoryCode,
keepBy: session.loginName,
order3: this.form.orderNo,
orderItem: this.form.rowItem,
type: 0,
orderType: 4,
productCode: this.form.productCode,
};
await this.model.confirmMove(selctlist);
// this.$form.resetFields();
// // this.form.barCode = '';
@ -336,10 +373,11 @@ export default class stoOutboundDom extends BasePage {
if (this.model.code == '1') {
this.materialList = [];
// this.model.materielList = [];
this.$table.onCheckAllTap();
//this.$table.onCheckAllTap();
uni.showToast({ icon: 'success', title: 'success' });
}
});
this.form.orderNo = '';
this.form.barCode = '';
this.form.productCode = '';
model.orderInInfo.stoAmount = 0;

5
src/pages/product/outbound/stoOutbound/config.ts
Unescape Escape View File

@ -18,4 +18,9 @@ export const headers = [
key: "productDescZh",
width: 300,
},
{
label: vm.$t("message.Line"),
key: "order2",
width: 300,
},
];

2
src/pages/product/outbound/stoOutbound/detail.vue
Unescape Escape View File

@ -4,7 +4,7 @@
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view>
<view class="title">{{ $t('message.product_StoListDetails') }}</view>
<view class="title">{{ $t('message.CommissionedGoOutDetails') }}</view>
<view class="right"></view>
</view>
<view class="table-wrapper">

18
src/pages/product/outbound/stoOutbound/model.ts
Unescape Escape View File

@ -162,7 +162,7 @@ export class ReturningModule extends VuexModule {
* @param orderNo
*/
@MutationAction
async confirmMove(list: any[]) {
async confirmMove(list: any) {
const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list);
console.log('res数据', data, code);
// if (code == '1') {
@ -173,6 +173,22 @@ export class ReturningModule extends VuexModule {
const materielList: any = [];
return { code, materielList };
}
/**
* 查询详细
* @param orderNo
*/
@MutationAction
async queryDetailed(order1: string) {
const { code, data } = await http.post(url.outbound.stoOutbound.getDetailByorderNo, {
order1,
loginName: session.loginName,
factoryCode: session.factoryCode,
});
console.log('res数据', data, code);
const materielList = data;
console.log(">>>>>>>",materielList);
return { code, materielList };
}
}
export default getModule(ReturningModule);

20
src/pages/raw/commission/entrant/index.vue
Unescape Escape View File

@ -39,11 +39,13 @@
@bindpicker="materialChoice"
showKey="value"
valKey="value"
:val="wlCode"
:val="every.materialCode"
class="search"
:options="materialList"
/>
</view>
</view>
<view class="material">
<view class="material-right">
<view class="material-right-title">{{
$t("message.CommissionedMaterielDesc")
@ -184,7 +186,7 @@ export default class dnReceiptDom extends BasePage {
//所选择的库位
wlCode: any = "";
//页面初始化
async onReady() {
async onLoad() {
//页面初始化 获取可选库位
let means: any = JSON.parse(
localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
@ -197,7 +199,7 @@ export default class dnReceiptDom extends BasePage {
workArea: session.workareaCode,
};
let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
console.log("res res",res[0]);
console.log("res res",res);
// 库位列表是undefined 委外入库、委外出库都是同样的问题
//guoshuang 修改 库位列表undefiend
res.forEach((item: any) => {
@ -227,6 +229,7 @@ export default class dnReceiptDom extends BasePage {
pickerName.value = item.materialCode;
this.materialList.push(pickerName);
});
this.every = this.material[0];
}
//选择物料后触发的回调事件 本次数量：receiptAmount 需求数量：requestAmount
materialChoice(e: any) {
@ -391,7 +394,7 @@ export default class dnReceiptDom extends BasePage {
height: 100rpx;
display: flex;
.material-left {
width: 50%;
width: 100%;
height: 100%;
display: flex;
view {
@ -399,8 +402,13 @@ export default class dnReceiptDom extends BasePage {
line-height: 100rpx;
}
}
}
.material {
width: 100%;
height: 100rpx;
display: flex;
.material-right {
width: 50%;
width: 100%;
height: 100%;
display: flex;
.material-right-title {
@ -409,7 +417,7 @@ export default class dnReceiptDom extends BasePage {
line-height: 100rpx;
}
.material-right-code {
width: 190rpx;
width: 80%;
height: 100%;
// line-height: 100rpx;
}

20
src/pages/raw/commission/goOut/index.vue
Unescape Escape View File

@ -39,11 +39,13 @@
@bindpicker="materialChoice"
showKey="value"
valKey="value"
:val="wlCode"
:val="every.materialCode"
class="search"
:options="materialList"
/>
</view>
</view>
<view class="material">
<view class="material-right">
<view class="material-right-title">{{
$t("message.CommissionedMaterielDesc")
@ -90,7 +92,7 @@
@bindpicker="LocationChoice"
showKey="value"
valKey="value"
:val="wlCode"
:val="wlCode.value"
class="search"
:options="Location"
/>
@ -197,6 +199,7 @@ export default class dnReceiptDom extends BasePage {
workArea: session.workareaCode,
};
let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
console.log("////res",res);
//库位为undefined，打印的res信息格式为[[],[]],且里面两个arry相同
//guoshuang 修改 库位列表undefined
res.forEach((item: any) => {
@ -225,6 +228,8 @@ export default class dnReceiptDom extends BasePage {
pickerName.value = item.materialCode;
this.materialList.push(pickerName);
});
this.every = this.material[0];
console.log("materialList????", this.materialList);
}
//选择物料后触发的回调事件 本次数量：receiptAmount 需求数量：requestAmount
materialChoice(e: any) {
@ -390,7 +395,7 @@ export default class dnReceiptDom extends BasePage {
height: 100rpx;
display: flex;
.material-left {
width: 50%;
width: 100%;
height: 100%;
display: flex;
view {
@ -398,8 +403,13 @@ export default class dnReceiptDom extends BasePage {
line-height: 100rpx;
}
}
}
.material {
width: 100%;
height: 100rpx;
display: flex;
.material-right {
width: 50%;
width: 100%;
height: 100%;
display: flex;
.material-right-title {
@ -408,7 +418,7 @@ export default class dnReceiptDom extends BasePage {
line-height: 100rpx;
}
.material-right-code {
width: 190rpx;
width: 80%;
height: 100%;
// line-height: 100rpx;
}

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

@ -123,13 +123,15 @@ export const url = {
info: '/wmspda/material/orderout/queryStoPlan',
findProdInfoByDN: '/wmspda/fg/findProdInfoByDN',
yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse',
Bookkeeping: '/wmspda/fg/confirmMove',
Bookkeeping: '/wmspda/fg/scanBarcodeDN',
// Bookkeeping: '/wmspda/fg/confirmMove',
checkScan: '/wmspda/fg/getMaterialByCode',
getMaterialByCode: '/wmspda/fg/getMaterialByCode',
queryOrder: '/wmspda/material/outsourcing/into/queryOrder',
submit: '/wmspda/material/outsourcing/into/materialComplete',
materialComplete: '/wmspda/material/outsourcing/materialComplete',
outsourcingQueryOrder: '/wmspda/material/outsourcing/queryOrder',
getDetailByorderNo: '/wmspda/fg/queryListInfoByDnNo',
},
},
inbound: {

Write Preview
Loading…
Cancel
Save