Teams/shanghaiganxiangtuzhuangworkshop_WMS_PDA
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PDA拼箱，多箱拼箱

Browse Source
This commit is contained in:
赵正易
2024-07-05 16:49:32 +08:00
parent d4b87a05a5
commit de7770a28f
3 changed files with 368 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/warehouse/wmGoodsAction.js
View File

@@ -24,3 +24,14 @@ export function doUnpackingGoods(data) {
}) })
} }
/**
* 拼箱2 多箱拼箱
* @param data
*/
export function doConsolidationGoods2(data) {
return request({
url: '/mes/wm/WmGoodsAction/doConsolidationGoods2',
method: 'post',
data: data,
})
}

182
pages/consolidation/consolidation.vue
View File

@@ -4,11 +4,11 @@
<!-- <span class="title-text">拼箱</span> --> <!-- <span class="title-text">拼箱</span> -->
<view class="warehoseInfo-box"> <view class="warehoseInfo-box">
<view class="row"> <view class="row">
<span class="col">已扫货物数：{{ quantityTotal }}</span> <span class="col">已扫零件数：{{ quantityTotal }}</span>
<span class="col">已扫箱数：{{ newMaterialList.length }}</span> <span class="col">已扫箱数：{{ newMaterialList.length }}</span>
</view> </view>
<view> <view>
<view v-if="searchType === 2" class="color2 aciton-box">请扫货物码</view> <view v-if="searchType === 2" class="color2 aciton-box">请扫外箱标签</view>
<!-- 扫描操作 --> <!-- 扫描操作 -->
<view class="pda-search-box"> <view class="pda-search-box">
<PdaScanInput @getInfo="handleGetInfo" :type="searchType" :hasFocus="false"></PdaScanInput> <PdaScanInput @getInfo="handleGetInfo" :type="searchType" :hasFocus="false"></PdaScanInput>
@@ -21,24 +21,39 @@
<view class="scroll-view-title">拼箱清单</view> <view class="scroll-view-title">拼箱清单</view>
<scroll-view :scroll-y="true" class="scroll-view-height"> <scroll-view :scroll-y="true" class="scroll-view-height">
<view v-for="(item, index) in newMaterialList" :key="index"> <view v-for="(item, index) in newMaterialList" :key="index">
<materialItem style="background-color: whitesmoke" :index="index" :materialInfo="item" @click.native="handleDeleteItem(item, index)"></materialItem> <materialItem style="background-color: whitesmoke" :index="index" :materialInfo="item"
@click.native="handleDeleteItem(item, index)"></materialItem>
</view> </view>
</scroll-view> </scroll-view>
<!-- <packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard> --> <!-- <packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard> -->
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="button-box"> <view class="button-box">
<u-button style="width: 40%" type="error" @click="clear" :disabled="loading" :loading="loading">清空</u-button> <u-button style="width: 40%" type="error" @click="clear" :disabled="loading"
<u-button style="width: 40%" type="primary" @click="handlerSubmit" :disabled="loading" :loading="loading">拼箱</u-button> :loading="loading">清空</u-button>
<u-button style="width: 40%" type="primary" @click="handlerSubmit" :disabled="loading"
:loading="loading">拼箱</u-button>
</view> </view>
<!-- 数量选择 --> <!-- 数量选择 -->
<u-modal :show="modalShow" showCancelButton title="请输入次箱拼入数量" @confirm="modalConfirm" @cancel="modalCancel"> <u-modal :show="modalShow" showCancelButton title="主箱需求数" @confirm="modalConfirm" @cancel="modalCancel">
<view class="slot-content"> <view class="slot-content">
<view> <!-- <view>
<u--text bold size="36" :text="'拼箱后主箱零件数:' + mainPackageQuantity"></u--text> <u--text bold size="36" :text="'拼箱后主箱零件数:' + mainPackageQuantity"></u--text>
</view> -->
<!-- <view>
<u--input placeholder="请输入拼入数量" type="number" border="surround" v-model="secondNum" @input="numInput"></u--input>
</view> -->
<view>
<u--text bold size="36" :text="'已扫箱数:' + newMaterialList.length"></u--text>
<u--text bold size="36" :text="'已扫零件数:' + quantityTotal"></u--text>
<u--text bold size="36" :text="'待拼箱主箱零件数:' + mainPackageQuantity"></u--text>
</view> </view>
<view> <view>
<u--input placeholder="请输入拼入数量" type="number" border="surround" v-model="secondNum" @input="numInput"></u--input> <u--text bold type="primary" size="36" text="请填写拼箱后主箱总零件数:"></u--text>
<u--input placeholder="请输入拼箱后主箱总零件数" type="number" border="surround" v-model="mainPackageActionNum"
@input="numInput2"></u--input>
<u--text size="24" type="error" text="如需要拼箱后零件号结果为48个,则填写数字48."></u--text>
<u--text size="24" type="error" text="结果需要大于主箱零件数,小于已扫零件数"></u--text>
</view> </view>
</view> </view>
</u-modal> </u-modal>
@@ -46,12 +61,12 @@
</template> </template>
<script> <script>
import materialItem from '@/components/material-item/material-item.vue'; import materialItem from '@/components/material-item/material-item.vue';
import packageCard from '@/components/package-card/package-card.vue'; import packageCard from '@/components/package-card/package-card.vue';
import * as WarehoseApi from '@/api/warehouse/warehose.js'; import * as WarehoseApi from '@/api/warehouse/warehose.js';
import * as GoodsActionApi from '@/api/warehouse/wmGoodsAction.js'; import * as GoodsActionApi from '@/api/warehouse/wmGoodsAction.js';
// 拼箱 // 拼箱
export default { export default {
components: { components: {
materialItem, materialItem,
packageCard packageCard
@@ -88,7 +103,9 @@ export default {
// 1-仓库扫码 2-货物扫码 3-出货单扫码 // 1-仓库扫码 2-货物扫码 3-出货单扫码
searchType: 2, searchType: 2,
modalShow: false, modalShow: false,
secondNum: 0 secondNum: 0,
// 主箱需求数
mainPackageActionNum: 0
}; };
}, },
watch: {}, watch: {},
@@ -105,10 +122,11 @@ export default {
} }
return num; return num;
}, },
//主箱零件数
mainPackageQuantity() { mainPackageQuantity() {
try { try {
if (this.newMaterialList.length === 2) { if (this.newMaterialList.length > 0) {
return this.newMaterialList[0].quantity * 1 + this.secondNum * 1; return this.newMaterialList[0].quantity * 1;
} else { } else {
return 0; return 0;
} }
@@ -171,15 +189,15 @@ export default {
} }
} }
} }
if (this.newMaterialList.length > 2) { // if (this.newMaterialList.length > 2) {
uni.showModal({ // uni.showModal({
title: '提示', // title: '提示',
content: '只可录入两箱！', // content: '只可录入两箱！',
showCancel: false, // showCancel: false,
confirmText: '确定' // confirmText: '确定'
}); // });
return; // return;
} // }
const checkData = { const checkData = {
originalCode: data.originalCode originalCode: data.originalCode
}; };
@@ -217,16 +235,21 @@ export default {
}, },
modalConfirm() { modalConfirm() {
this.loading = true; this.loading = true;
setTimeout(()=>{ setTimeout(() => {
this.loading = false; this.loading = false;
},30000) }, 30000)
// let data = {
// packageList: this.newMaterialList,
// createBy: 'admin',
// secondNum: this.secondNum || 0
// };
let data = { let data = {
packageList: this.newMaterialList, packageList: this.newMaterialList,
createBy: 'admin', createBy: 'pda',
secondNum: this.secondNum || 0 mainPackageActionNum: this.mainPackageActionNum
}; };
uni.$u.throttle(()=>{ uni.$u.throttle(() => {
GoodsActionApi.doConsolidationGoods(data).then((res) => { GoodsActionApi.doConsolidationGoods2(data).then((res) => {
if (res.code === 200) { if (res.code === 200) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
@@ -240,13 +263,13 @@ export default {
} else { } else {
uni.showToast({ uni.showToast({
icon: 'error', icon: 'error',
title: '拼箱失败！' title: res.message
}); });
this.modalShow = false; this.modalShow = false;
this.loading = false; this.loading = false;
} }
}); });
},5000) }, 5000)
}, },
modalCancel() { modalCancel() {
this.modalShow = false; this.modalShow = false;
@@ -263,26 +286,49 @@ export default {
return; return;
} }
}, },
numInput2(value) {
const num = value * 1;
const packageList = this.newMaterialList;
if (packageList.length < 1) {
this.mainPackageActionNum = 0;
return;
}
let minQuantity = packageList[0]?.quantity * 1;
let maxQuantity = this.quantityTotal * 1;
if (num < minQuantity) {
this.$nextTick(() => {
this.mainPackageActionNum = minQuantity;
})
return;
}
if (num > maxQuantity) {
this.$nextTick(() => {
this.mainPackageActionNum = maxQuantity;
})
return;
}
},
// 点击拼箱 // 点击拼箱
handlerSubmit() { handlerSubmit() {
if (this.newMaterialList.length < 2) { if (this.newMaterialList.length < 2) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '需要主次两箱才能拼箱！', content: '需要至少两箱才能拼箱！',
showCancel: false, showCancel: false,
confirmText: '确认' confirmText: '确认'
}); });
return; return;
} }
this.secondNum = this.newMaterialList[1].quantity * 1; // this.secondNum = this.newMaterialList[1].quantity * 1;
this.mainPackageActionNum = this.quantityTotal * 1;
this.modalShow = true; this.modalShow = true;
} }
} }
}; };
</script> </script>
<style scoped> <style scoped>
.title-box { .title-box {
margin-top: 54px; margin-top: 54px;
margin-bottom: 20px; margin-bottom: 20px;
height: 60px; height: 60px;
@@ -291,9 +337,9 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.warehoseInfo-box { .warehoseInfo-box {
font-size: 20px; font-size: 20px;
width: 94%; width: 94%;
margin: 0 auto; margin: 0 auto;
@@ -303,48 +349,48 @@ export default {
border-radius: 10px; border-radius: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.warehoseInfo-box .row { .warehoseInfo-box .row {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.warehoseInfo-box .row .col { .warehoseInfo-box .row .col {
width: 50%; width: 50%;
} }
.aciton-box { .aciton-box {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.color1 { .color1 {
color: yellowgreen; color: yellowgreen;
} }
.color2 { .color2 {
color: orange; color: orange;
} }
.pda-search-box { .pda-search-box {
margin-bottom: 5px; margin-bottom: 5px;
} }
.list-box { .list-box {
width: 100%; width: 100%;
} }
.scroll-view-title { .scroll-view-title {
font-size: 24px; font-size: 24px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.scroll-view-box { .scroll-view-box {
width: 94%; width: 94%;
margin: 0 auto; margin: 0 auto;
margin-top: 50px; margin-top: 50px;
@@ -352,11 +398,13 @@ export default {
padding: 10px; padding: 10px;
background-color: rgba(179, 179, 179, 0.7); background-color: rgba(179, 179, 179, 0.7);
border-radius: 5px; border-radius: 5px;
} }
.scroll-view-height {
.scroll-view-height {
height: 300px; height: 300px;
} }
.scroll-view-last {
.scroll-view-last {
width: 100%; width: 100%;
height: 60px; height: 60px;
font-size: 20px; font-size: 20px;
@@ -369,18 +417,18 @@ export default {
padding-right: 10px; padding-right: 10px;
border-radius: 10px; border-radius: 10px;
background-color: white; background-color: white;
} }
.button-box { .button-box {
width: 80%; width: 80%;
margin: 10px auto; margin: 10px auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.changeInput { .changeInput {
font-size: 20px; font-size: 20px;
background-color: gainsboro; background-color: gainsboro;
border: 1px solid grey; border: 1px solid grey;
} }
</style> </style>

2
pages/materialManagement/AGVRemoteControl/AGVRemoteControl.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<view class="box-container"> <view class="box-container">
<!-- 功能筛选区 --> <!-- 功能筛选区 -->
<uni-card :is-shadow="false"> <uni-card :is-shadow="false" is-full>
<uni-forms label-width="100"> <uni-forms label-width="100">
<!-- 选择小车 --> <!-- 选择小车 -->
<uni-forms-item label="AGV小车"> <uni-forms-item label="AGV小车">