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 13acf5aefd
commit 9542aede6c
10 changed files with 112 additions and 9 deletions
Show Stats Download Patch File Download Diff File

9
src/pages/raw/handover/aggregating/order.vue
Unescape Escape View File

@ -147,7 +147,11 @@ export default class AggregatingOrder extends BasePage {
this.unlock(); this.unlock();
} }
} }
onHide() {
if (model.orderList.length > 0 && !this.isHandoverFinished) {
this.unlock();
}
}
/** /**
* 全选 * 全选
*/ */
@ -351,13 +355,16 @@ export default class AggregatingOrder extends BasePage {
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
.title { .title {
flex: 3; flex: 3;
} }
.left, .left,
.right { .right {
flex: 1; flex: 1;
} }
.icon { .icon {
display: flex; display: flex;
justify-content: center; justify-content: center;

9
src/pages/raw/handover/aggregating/summary.vue
Unescape Escape View File

@ -171,7 +171,11 @@ export default class AggregatingSummary extends BasePage {
this.unlock(); this.unlock();
} }
} }
onHide() {
if (model.aggregateList.length > 0 && !this.isBusinessFinished) {
this.unlock();
}
}
/** /**
* 全选 * 全选
*/ */
@ -399,13 +403,16 @@ export default class AggregatingSummary extends BasePage {
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
.title { .title {
flex: 3; flex: 3;
} }
.left, .left,
.right { .right {
flex: 1; flex: 1;
} }
.icon { .icon {
display: flex; display: flex;
justify-content: center; justify-content: center;

33
src/pages/raw/handover/picking/ByOrder.vue
Unescape Escape View File

@ -5,10 +5,10 @@
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" /> <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view> </view>
<view class="title">{{ $t('message.Pi_ByOrderPicking') }}</view> <view class="title">{{ $t('message.Pi_ByOrderPicking') }}</view>
<view class="right"></view> <view class="right"> </view>
</view> </view>
<view class="table-wrapper"> <view class="table-wrapper">
<wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.proOrderResultList" :show-vert-border="false" @onCheck="handleRow"></wyb-table> <wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.proOrderResultList" :show-vert-border="false" @onCheck="handleRow"> </wyb-table>
</view> </view>
<!-- 列表展示数据 --> <!-- 列表展示数据 -->
<view class="Exhibition"> <view class="Exhibition">
@ -114,6 +114,7 @@ export default class RawReceiptDetail extends BasePage {
model = model; model = model;
type = 'text'; type = 'text';
wlCode: any = ''; wlCode: any = '';
LOCKProOrderResultListParams: any = '';
border = true; border = true;
//添加库位和数量的列表 //添加库位和数量的列表
LocationList: any = []; LocationList: any = [];
@ -325,6 +326,7 @@ export default class RawReceiptDetail extends BasePage {
this.wlCode = ''; this.wlCode = '';
return; return;
} }
this.LOCKProOrderResultListParams = this.model.proOrderResultList;
await this.model.lockProOrderResult(this.model.proOrderResultList); await this.model.lockProOrderResult(this.model.proOrderResultList);
this.some = {}; this.some = {};
this.LocationList = []; this.LocationList = [];
@ -348,6 +350,15 @@ export default class RawReceiptDetail extends BasePage {
this.Location.push(pickerName); this.Location.push(pickerName);
}); });
} }
beforeDestroy() {
this.unlock();
}
onHide() {
this.unlock();
}
async unlock() {
await this.model.unlockProOrderResult(this.LOCKProOrderResultListParams);
}
} }
</script> </script>
@ -372,13 +383,16 @@ export default class RawReceiptDetail extends BasePage {
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
.title { .title {
flex: 3; flex: 3;
} }
.left, .left,
.right { .right {
flex: 1; flex: 1;
} }
.icon { .icon {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -399,21 +413,25 @@ export default class RawReceiptDetail extends BasePage {
padding: 40rpx; padding: 40rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
.Exhibition { .Exhibition {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
margin-top: 20rpx; margin-top: 20rpx;
display: flex; display: flex;
.Exhibition-left { .Exhibition-left {
width: 50%; width: 50%;
height: 100%; height: 100%;
display: flex; display: flex;
.Exhibition-left-title { .Exhibition-left-title {
width: 50%; width: 50%;
height: 100%; height: 100%;
text-align: center; text-align: center;
line-height: 100rpx; line-height: 100rpx;
} }
.Exhibition-left-data { .Exhibition-left-data {
width: 50%; width: 50%;
height: 100%; height: 100%;
@ -421,16 +439,19 @@ export default class RawReceiptDetail extends BasePage {
line-height: 100rpx; line-height: 100rpx;
} }
} }
.Exhibition-right { .Exhibition-right {
width: 50%; width: 50%;
height: 100%; height: 100%;
display: flex; display: flex;
.Exhibition-right-title { .Exhibition-right-title {
width: 50%; width: 50%;
height: 100%; height: 100%;
// text-align: center; // text-align: center;
line-height: 100rpx; line-height: 100rpx;
} }
.Exhibition-right-data { .Exhibition-right-data {
width: 50%; width: 50%;
height: 100%; height: 100%;
@ -439,11 +460,13 @@ export default class RawReceiptDetail extends BasePage {
} }
} }
} }
.library { .library {
width: 100%; width: 100%;
height: 200rpx; height: 200rpx;
// display: flex; // display: flex;
display: block; display: block;
.library-left { .library-left {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
@ -455,26 +478,31 @@ export default class RawReceiptDetail extends BasePage {
// text-align: center; // text-align: center;
// } // }
} }
.library-right { .library-right {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
padding-left: 36rpx; padding-left: 36rpx;
display: flex; display: flex;
.library-right-title { .library-right-title {
width: 120rpx; width: 120rpx;
height: 100%; height: 100%;
line-height: 100rpx; line-height: 100rpx;
} }
.input { .input {
width: 200rpx; width: 200rpx;
height: 70rpx; height: 70rpx;
margin-top: 15rpx; margin-top: 15rpx;
margin-left: 4rpx; margin-left: 4rpx;
} }
.add { .add {
width: 200rpx; width: 200rpx;
height: 100rpx; height: 100rpx;
position: relative; position: relative;
button { button {
position: absolute; position: absolute;
top: 10rpx; top: 10rpx;
@ -483,6 +511,7 @@ export default class RawReceiptDetail extends BasePage {
} }
} }
} }
.bottom-bar { .bottom-bar {
z-index: 21; z-index: 21;
position: fixed; position: fixed;

29
src/pages/raw/handover/picking/BySummary.vue
Unescape Escape View File

@ -110,6 +110,7 @@ export default class RawReceiptDetail extends BasePage {
LocationList: any = []; LocationList: any = [];
//库位 //库位
Location: any = []; Location: any = [];
unLockParams: any = '';
someIndex = 0; someIndex = 0;
some: any = {}; some: any = {};
qty: any = ''; qty: any = '';
@ -318,6 +319,7 @@ export default class RawReceiptDetail extends BasePage {
loginName: session.loginName, loginName: session.loginName,
orderOutIdList, orderOutIdList,
}; };
this.unLockParams = params;
await this.model.queryAggregateList(params); await this.model.queryAggregateList(params);
this.some = {}; this.some = {};
this.LocationList = []; this.LocationList = [];
@ -341,6 +343,15 @@ export default class RawReceiptDetail extends BasePage {
this.Location.push(pickerName); this.Location.push(pickerName);
}); });
} }
beforeDestroy() {
this.unlock();
}
onHide() {
this.unlock();
}
async unlock() {
await this.model.unlockAggregateResult(this.unLockParams);
}
} }
</script> </script>
@ -365,13 +376,16 @@ export default class RawReceiptDetail extends BasePage {
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
.title { .title {
flex: 3; flex: 3;
} }
.left, .left,
.right { .right {
flex: 1; flex: 1;
} }
.icon { .icon {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -392,21 +406,25 @@ export default class RawReceiptDetail extends BasePage {
padding: 40rpx; padding: 40rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
.Exhibition { .Exhibition {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
margin-top: 20rpx; margin-top: 20rpx;
display: flex; display: flex;
.Exhibition-left { .Exhibition-left {
width: 50%; width: 50%;
height: 100%; height: 100%;
display: flex; display: flex;
.Exhibition-left-title { .Exhibition-left-title {
width: 50%; width: 50%;
height: 100%; height: 100%;
text-align: center; text-align: center;
line-height: 100rpx; line-height: 100rpx;
} }
.Exhibition-left-data { .Exhibition-left-data {
width: 50%; width: 50%;
height: 100%; height: 100%;
@ -414,16 +432,19 @@ export default class RawReceiptDetail extends BasePage {
line-height: 100rpx; line-height: 100rpx;
} }
} }
.Exhibition-right { .Exhibition-right {
width: 50%; width: 50%;
height: 100%; height: 100%;
display: flex; display: flex;
.Exhibition-right-title { .Exhibition-right-title {
width: 50%; width: 50%;
height: 100%; height: 100%;
text-align: left; text-align: left;
line-height: 100rpx; line-height: 100rpx;
} }
.Exhibition-right-data { .Exhibition-right-data {
width: 50%; width: 50%;
height: 100%; height: 100%;
@ -432,11 +453,13 @@ export default class RawReceiptDetail extends BasePage {
} }
} }
} }
.library { .library {
width: 100%; width: 100%;
height: 200rpx; height: 200rpx;
// display: flex; // display: flex;
display: block; display: block;
.library-left { .library-left {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
@ -448,26 +471,31 @@ export default class RawReceiptDetail extends BasePage {
// text-align: center; // text-align: center;
// } // }
} }
.library-right { .library-right {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
padding-left: 36rpx; padding-left: 36rpx;
display: flex; display: flex;
.library-right-title { .library-right-title {
width: 120rpx; width: 120rpx;
height: 100%; height: 100%;
line-height: 100rpx; line-height: 100rpx;
} }
.input { .input {
width: 200rpx; width: 200rpx;
height: 70rpx; height: 70rpx;
margin-top: 15rpx; margin-top: 15rpx;
margin-left: 4rpx; margin-left: 4rpx;
} }
.add { .add {
width: 200rpx; width: 200rpx;
height: 100rpx; height: 100rpx;
position: relative; position: relative;
button { button {
position: absolute; position: absolute;
top: 10rpx; top: 10rpx;
@ -476,6 +504,7 @@ export default class RawReceiptDetail extends BasePage {
} }
} }
} }
.bottom-bar { .bottom-bar {
z-index: 21; z-index: 21;
position: fixed; position: fixed;

9
src/pages/raw/handover/picking/model.ts
Unescape Escape View File

@ -375,7 +375,14 @@ export class PickingModule extends VuexModule {
// //
} }
} }
@Action
async unlockAggregateResult(params: any) {
try {
await http.post(url.sortscan.unlock.aggregateList, params);
} catch {
//
}
}
/** /**
* 锁定数据 * 锁定数据
* @param list * @param list

2
src/pages/raw/handover/picking/result.vue
Unescape Escape View File

@ -52,7 +52,7 @@ export default class RawReceiptDetail extends BasePage {
async onOrder() { async onOrder() {
// const list = this.model.proOrderResultList; // const list = this.model.proOrderResultList;
// await this.model.lockProOrderResult(list); // await this.model.lockProOrderResult(list);
await this.model.lock(this.model.proOrderResultList); // await this.model.lock(this.model.proOrderResultList);
this.toPage(this.page.raw.handover.picking.byorder); this.toPage(this.page.raw.handover.picking.byorder);
} }
//汇总 //汇总

17
src/pages/raw/handover/returning/Time-filter.vue
Unescape Escape View File

@ -7,8 +7,13 @@
<view class="title">{{ $t('message.screen') }}</view> <view class="title">{{ $t('message.screen') }}</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<view>
<u-form-item :label="$t('message.Warehouse_OrderNo')" prop="prdOrder" style="background: white; border-radius: 5px">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="prdOrderFrom" :show-action="false"> </u-search>
</u-form-item>
</view>
<!-- 开始时间 --> <!-- 开始时间 -->
<view style="display: flex"> <view style="display: flex; padding-top: 3px">
<u-field style="background: white; border-radius: 10rpx" v-model="startMobile" :placeholder="$t('message.starttime')" :label="$t('message.start')"> </u-field> <u-field style="background: white; border-radius: 10rpx" v-model="startMobile" :placeholder="$t('message.starttime')" :label="$t('message.start')"> </u-field>
<u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="startShow" :params="startParams" mode="time" @confirm="startConfirm"></u-picker> <u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="startShow" :params="startParams" mode="time" @confirm="startConfirm"></u-picker>
<u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button> <u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
@ -21,7 +26,7 @@
</view> </view>
<!-- 表格 --> <!-- 表格 -->
<view class="table-wrapper" style="margin-top: 10rpx"> <view class="table-wrapper" style="margin-top: 10rpx">
<wyb-table class="table" ref="table" width="100%" enable-check="single" checkType="single" show-left-and-right-border :headers="headers" :contents="OddList" :show-vert-border="false" @onCheck="onCheck"></wyb-table> <wyb-table class="table" ref="table" width="100%" enable-check="single" checkType="single" show-left-and-right-border :headers="headers" :contents="OddList" :show-vert-border="false" @onCheck="onCheck"> </wyb-table>
</view> </view>
<view class="bottom-bar"> <view class="bottom-bar">
<u-row class="button-bar"> <u-row class="button-bar">
@ -52,6 +57,7 @@ export default class returningDom extends BasePage {
endMobile = ''; endMobile = '';
materialList = []; materialList = [];
OddList: any = []; OddList: any = [];
prdOrderFrom: any = '';
data: any = { data: any = {
label: '', label: '',
value: '', value: '',
@ -112,6 +118,9 @@ export default class returningDom extends BasePage {
async onReady() { async onReady() {
this.startMobile = this.getNowFormatDate(); this.startMobile = this.getNowFormatDate();
this.endMobile = this.getNowFormatDate(); this.endMobile = this.getNowFormatDate();
let proorder = uni.getStorageSync('prdOrderFrom') as any;
this.prdOrderFrom = JSON.parse(proorder);
uni.removeStorageSync('prdOrderFrom');
await this.onSubmit(); await this.onSubmit();
} }
async onSubmit() { async onSubmit() {
@ -122,6 +131,7 @@ export default class returningDom extends BasePage {
let time = { let time = {
requireDateMin: this.startMobile, requireDateMin: this.startMobile,
requireDateMax: this.endMobile, requireDateMax: this.endMobile,
prdOrderFrom: this.prdOrderFrom,
}; };
await this.model.queryTimeInInfo(time); await this.model.queryTimeInInfo(time);
this.OddList = model.materielList; this.OddList = model.materielList;
@ -148,13 +158,16 @@ export default class returningDom extends BasePage {
font-size: 34rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
.title { .title {
flex: 3; flex: 3;
} }
.left, .left,
.right { .right {
flex: 1; flex: 1;
} }
.icon { .icon {
display: flex; display: flex;
justify-content: center; justify-content: center;

11
src/pages/raw/handover/returning/index.vue
Unescape Escape View File

@ -149,9 +149,18 @@ export default class returningDom extends BasePage {
amount: [{ required: true, message: this.$t('message.return_Tip3') as string }], amount: [{ required: true, message: this.$t('message.return_Tip3') as string }],
}; };
screen() { screen() {
this.redirectTo(this.page.raw.handover.returning.filter); if (this.form.prdOrder != null) {
uni.setStorageSync('prdOrderFrom', JSON.stringify(this.form.prdOrder));
this.redirectTo(this.page.raw.handover.returning.filter);
} else {
this.redirectTo(this.page.raw.handover.returning.filter);
}
} }
async query() { async query() {
if (this.form.prdOrder == null || this.form.prdOrder.length == 0) {
this.customToast(this.$t('message.borrow_Tip') as string);
return;
}
await this.model.queryOrderInInfo(this.form.prdOrder); await this.model.queryOrderInInfo(this.form.prdOrder);
this.form.materialCode = this.model.orderInInfo.materialCode; this.form.materialCode = this.model.orderInInfo.materialCode;
this.form.sendSpot = this.model.orderInInfo.sendSpot; this.form.sendSpot = this.model.orderInInfo.sendSpot;

1
src/pages/raw/handover/returning/model.ts
Unescape Escape View File

@ -86,6 +86,7 @@ export class ReturningModule extends VuexModule {
page: '1', page: '1',
rows: '50', rows: '50',
loginName: session.loginName, loginName: session.loginName,
prdOrderFrom: time.prdOrderFrom,
}); });
console.log('qqqqqqqqq', data); console.log('qqqqqqqqq', data);
const materielList = data.map((item: any) => ({ const materielList = data.map((item: any) => ({

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

@ -177,6 +177,7 @@ export const url = {
}, },
unlock: { unlock: {
list: '/wmspda/sortscan/unlock/list', list: '/wmspda/sortscan/unlock/list',
aggregateList: '/wmspda/sortscan/unlock/aggregate/list',
}, },
lock: { lock: {
list: '/wmspda/sortscan/lock/list', list: '/wmspda/sortscan/lock/list',

Write Preview
Loading…
Cancel
Save