Skip to content

梁建民 / wmsMin

Go to a project
Commit f579ba19 by LJM
Options

单一物料多箱货物支持快捷理货装(分)箱及相关联功能

parent 2a163828
Expand all
Inline Side-by-side
Showing with 222 additions and 43 deletions
assets/css/tally/closeBox.scss
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
width: 33.3%; width: 33.3%;
margin-bottom: 10rpx; margin-bottom: 10rpx;
.t1 { .t1 {
font-size: 24rpx; font-size: 26rpx;
color: #6e767a; color: #6e767a;
} }
.t2 { .t2 {
font-size: 24rpx; font-size: 26rpx;
color: #404547; color: #197adb;
font-weight: bold; font-weight: bold;
} }
} }
...@@ -33,7 +33,13 @@ ...@@ -33,7 +33,13 @@
font-size: 28rpx; font-size: 28rpx;
color: #919399; color: #919399;
} }
.status-color {
font-size: 26rpx;
color: #197adb;
font-weight: bold;
}
.uni-input { .uni-input {
width: 216rpx;
height: 55rpx; height: 55rpx;
background: #ffffff; background: #ffffff;
border-radius: 10rpx; border-radius: 10rpx;
...@@ -42,6 +48,14 @@ ...@@ -42,6 +48,14 @@
padding-left: 18rpx; padding-left: 18rpx;
margin: 0 6rpx; margin: 0 6rpx;
} }
.btn {
width: 122rpx;
height: 51rpx;
background: #197adb;
font-size: 28rpx;
color: #ffffff;
border-radius: 10rpx;
}
} }
} }
.list { .list {
...@@ -265,3 +279,59 @@ ...@@ -265,3 +279,59 @@
::v-deep .uni-drawer__content { ::v-deep .uni-drawer__content {
width: 85% !important; width: 85% !important;
} }
.popup-content-tally-num {
background-color: #f1f4f6;
padding: 50rpx 24rpx 50rpx 24rpx;
border-radius: 10rpx;
width: 550rpx;
.input-box {
margin-bottom: 30rpx;
.label {
width: 190rpx;
font-size: 26rpx;
color: #6e767a;
white-space: nowrap;
}
.tt {
font-weight: bold;
font-size: 28rpx;
color: #404547;
}
.uni-input {
width: 210rpx;
height: 55rpx;
background: #e6edf0;
border-radius: 4rpx;
padding-left: 20rpx;
font-size: 26rpx;
color: #404547;
font-weight: bold;
}
}
.tip {
font-size: 26rpx;
color: #f39d18;
margin-bottom: 40rpx;
}
.btn {
padding: 0 70rpx;
.ok {
width: 140rpx;
height: 60rpx;
background: #197adb;
border-radius: 10rpx;
font-size: 26rpx;
color: #ffffff;
}
.canel {
width: 140rpx;
height: 60rpx;
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #197adb;
font-size: 24rpx;
color: #197adb;
}
}
}
pages/tally/abnormalTally.vue
...@@ -355,9 +355,10 @@ ...@@ -355,9 +355,10 @@
}); });
}, },
/** /**
* 异常型号装箱 1装箱 0去除 * 异常型号装箱 1装箱 0取出
*/ */
submitAbnormalBox(type, wstydl_id, item) { submitAbnormalBox(type, wstydl_id, item) {
debugger
if (type == 1) { if (type == 1) {
//装箱的时候验证 //装箱的时候验证
if (!this.box_sn) { if (!this.box_sn) {
...@@ -377,23 +378,67 @@ ...@@ -377,23 +378,67 @@
confirmText: '确认取出', confirmText: '确认取出',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
this.request(API.submitAbnormalBox, 'POST', { type: type, wstydl_id: wstydl_id, wsty_id: this.wsty_id }, true).then(res => { this.request(API.getBoxNumByDetailId, 'POST', { wsty_id: this.form[index].wsty_id }, true).then(json => {
if (res.err_code === 0) { if (json.err_code === 0) {
uni.showModal({ if (json.data > 1) {
title: '', let text = `${item.erp_order_sn}货物分部在${this.box_sn}的${json.data.length}个子箱，请确认是否全部取消`;
content: type == 1 ? '装箱成功' : '取出成功', uni.showModal({
showCancel: false, title: '提示',
success: (res) => { content: text,
if (res.confirm) { success: (res) => {
this.getData(); if (res.confirm) {
} else if (res.cancel) { this.request(API.submitAbnormalBox, 'POST', { type: type, wstydl_id: wstydl_id, wsty_id: this.wsty_id }, true).then(res => {
console.log('用户点击取消'); if (res.err_code === 0) {
uni.showModal({
title: '',
content: type == 1 ? '装箱成功' : '取出成功',
showCancel: false,
success: (res) => {
if (res.confirm) {
this.getData();
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
} else if (res.cancel) {
console.log('用户点击取消');
}
} }
} });
}); } else {
this.request(API.submitAbnormalBox, 'POST', { type: type, wstydl_id: wstydl_id, wsty_id: this.wsty_id }, true).then(res => {
if (res.err_code === 0) {
uni.showModal({
title: '',
content: type == 1 ? '装箱成功' : '取出成功',
showCancel: false,
success: (res) => {
if (res.confirm) {
this.getData();
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.err_msg, title: json.err_msg,
icon: 'none' icon: 'none'
}); });
} }
......
pages/tally/unboxing.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="action-bar row verCenter"> <view class="action-bar row verCenter">
<text class="iconfont icon-jinggao2" @click="clearInput(1)" v-if="box_sn"></text> <text class="iconfont icon-jinggao2" @click="clearInput(1)" v-if="box_sn"></text>
<template v-if="box_sn && is_unboxing && tallyData.detail && tallyData.detail.length > 0"> <template v-if="box_sn && is_unboxing && tallyData.detail && tallyData.detail.length > 0">
<view class="btn1 row rowCenter verCenter" @click="closeBox()">重新封箱</view> <navigator class="btn1 row rowCenter verCenter" :url="'/pages/tally/closeBox?box_sn='+box_sn+'&wsty_id='+wsty_id" hover-class="none" @click="closeBox()">重新封箱</navigator>
</template> </template>
<template v-else> <template v-else>
<view class="btn row rowCenter verCenter" @click="unboxing()" v-if="box_sn && tallyData.detail && tallyData.detail.length > 0">开 箱</view> <view class="btn row rowCenter verCenter" @click="unboxing()" v-if="box_sn && tallyData.detail && tallyData.detail.length > 0">开 箱</view>
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
is_focus_1: true, //获取焦点动态化 is_focus_1: true, //获取焦点动态化
is_focus_2: false, //获取焦点动态化 is_focus_2: false, //获取焦点动态化
box_sn: '', box_sn: '',
wsty_id: '', //箱子id
keyword: '', keyword: '',
all_search: '', //全量搜索字段 all_search: '', //全量搜索字段
tallyData: {}, //理货信息 tallyData: {}, //理货信息
...@@ -280,9 +281,15 @@ ...@@ -280,9 +281,15 @@
title: '开箱成功', title: '开箱成功',
icon: 'success' icon: 'success'
}) })
//这里的必须性是为了拿到箱子id
setTimeout(() => { setTimeout(() => {
this.is_unboxing = true; //表示开箱成功 this.request(API.getBoxSn, 'POST', { box_sn: box_sn }, true).then(res => {
this.getTallyData(); if (res.err_code === 0) {
this.wsty_id = res.data.wsty_id;
this.is_unboxing = true; //表示开箱成功
this.getTallyData();
}
});
}, 2000) }, 2000)
} else { } else {
this.form = []; this.form = [];
...@@ -610,7 +617,7 @@ ...@@ -610,7 +617,7 @@
net_weight: item.net_weight, // 净重 net_weight: item.net_weight, // 净重
goods_check_pic: item.goods_check_pic, // 商检的必须上传图片 goods_check_pic: item.goods_check_pic, // 商检的必须上传图片
wstydl_id: item.wstydl_id, // 理货明细ID wstydl_id: item.wstydl_id, // 理货明细ID
erp_order_sn: this.erp_order_sn, // 入仓号 erp_order_sn: item.erp_order_sn, // 入仓号
box_sn: this.box_sn, // 箱子 box_sn: this.box_sn, // 箱子
is_goods_check: item.is_goods_check, //是否商检 is_goods_check: item.is_goods_check, //是否商检
sync_status: item.sync_status, //明细同步状态 sync_status: item.sync_status, //明细同步状态
...@@ -907,20 +914,61 @@ ...@@ -907,20 +914,61 @@
}); });
return false; return false;
} }
this.request(API.cancelTallyDetail, 'POST', { wstydl_id: this.form[this.formIndex].wstydl_id, box_sn: this.box_sn, gross_weight: val }, true).then(res => { this.request(API.getBoxNumByDetailId, 'POST', { wsty_id: this.form[index].wsty_id }, true).then(json => {
if (res.err_code === 0) { if (json.err_code === 0) {
uni.showToast({ if (json.data > 1) {
title: '取消理货成功', let text = `${this.form[this.formIndex].erp_order_sn}货物分部在${this.box_sn}的${json.data.length}个子箱，请确认是否全部取消`;
icon: 'success', uni.showModal({
duration: 2000 title: '提示',
}); content: text,
setTimeout(() => { success: (res) => {
this.$refs.canelInputDialog.close(); if (res.confirm) {
this.getTallyData(); this.request(API.cancelTallyDetail, 'POST', { wstydl_id: this.form[this.formIndex].wstydl_id, box_sn: this.box_sn, gross_weight: val }, true).then(res => {
}, 2000); if (res.err_code === 0) {
uni.showToast({
title: '取消理货成功',
icon: 'success',
duration: 2000
});
setTimeout(() => {
this.$refs.canelInputDialog.close();
this.getTallyData();
}, 2000);
} else {
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
this.request(API.cancelTallyDetail, 'POST', { wstydl_id: this.form[this.formIndex].wstydl_id, box_sn: this.box_sn, gross_weight: val }, true).then(res => {
if (res.err_code === 0) {
uni.showToast({
title: '取消理货成功',
icon: 'success',
duration: 2000
});
setTimeout(() => {
this.$refs.canelInputDialog.close();
this.getTallyData();
}, 2000);
} else {
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.err_msg, title: json.err_msg,
icon: 'none' icon: 'none'
}); });
} }
......
util/api.js
const API_BASE = 'https://api.ichunt.com'; // const API_BASE = 'https://api.ichunt.com';
const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 // const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK // const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统 // const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE = 'http://api.liexin.com'; const API_BASE = 'http://api.liexin.com';
// const API_BASE_OSS = 'http://image.liexindev.net'; const API_BASE_OSS = 'http://image.liexindev.net';
// const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
// const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统 const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
const API = { const API = {
...@@ -325,7 +325,23 @@ const API = { ...@@ -325,7 +325,23 @@ const API = {
/** /**
* 获取app版本 * 获取app版本
*/ */
getAppLatestVersion: API_BASE + '/supplywechatwms/getAppLatestVersion' getAppLatestVersion: API_BASE + '/supplywechatwms/getAppLatestVersion',
/**
* 获取获取标签打印列表版本
*/
getPrintScanList: API_BASE + '/tallyGoodsAjax/getPrintScanList',
/**
* app 修改子箱数量
*/
alterTallyTagBySubBoxQty: API_BASE + '/supplywechatwms/alterTallyTagBySubBoxQty',
/**
* app 根据获取标签号
*/
getPrintScanList: API_BASE + '/supplywechatwms/getPrintScanList',
/**
* app 根据理货明细获取箱数
*/
getBoxNumByDetailId: API_BASE + '/supplywechatwms/getBoxNumByDetailId'
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment