From a0dfb0658875941d675d64ace46b049c62548e18 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 21 一月 2026 10:59:37 +0800
Subject: [PATCH] 添加格层编码
---
pages/AGV/CollectionPakin.vue | 3
pages/AGV/EmpBackLoc.vue | 330 +++++++++++++++++++++++++++++++++++++++++++++++
pages/home/home.vue | 7 +
pages/AGV/CachePakin.vue | 78 +++++++++-
4 files changed, 406 insertions(+), 12 deletions(-)
diff --git a/pages/AGV/CachePakin.vue b/pages/AGV/CachePakin.vue
index 8debdc3..5ad89a7 100644
--- a/pages/AGV/CachePakin.vue
+++ b/pages/AGV/CachePakin.vue
@@ -6,10 +6,15 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
@input="orderNoInput()">
</view>
- <view class="item">
+ <view class="item" style="display: none;">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
+ </view>
+ <view class="item">
+ <view class="code-decs">鏍煎眰缂栫爜:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="boxType1" :focus="boxType1Focus"
+ @input="boxType1Input()">
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
@@ -35,6 +40,12 @@
<view class="desc">璁㈠崟鍙凤細</view>
<view class="left-item">
<uni-tag :text="item.orderNo" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鏍煎眰缂栫爜锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.boxType1" type="primary"></uni-tag>
</view>
</view>
<view class="list-left-item">
@@ -84,15 +95,28 @@
</view>
</view>
<view class="popup-item">
- <view class="desc">渚涘簲鍟嗭細</view>
+ <view class="popup-item-left">渚涘簲鍟�:</view>
+ <view class="popup-item-right">
+ <input type="text" v-model="suppCode" disabled="true"
+ style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+ </view>
+ <!-- <view class="desc">渚涘簲鍟嗭細</view>
<view class="left-item">
<uni-tag :text="suppCode" type="warning"></uni-tag>
+ </view> -->
+ </view>
+ <view class="popup-item">
+ <view class="popup-item-left">鏍煎眰缂栫爜:</view>
+ <view class="popup-item-right">
+ <input type="text" v-model="tempBoxType"
+ style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
+ <uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
+ @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -146,12 +170,15 @@
rowNum: '',
matnr: '',
suppCode: '',
+ boxType1: '',
weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
title: '',
content: '',
+ tempBoxType: '',
+ boxType1Focus: true,
barcodeFocus: true,
matFocus: false,
orderNoFocus: false,
@@ -195,6 +222,22 @@
// this.focuss()
// }, 200)
},
+ boxType1Input() {
+ let bcode = this.boxType1.split("-")[0];
+ if (this.barcode != null && this.barcode != undefined && this.barcode != '') {
+ if (this.barcode != bcode && this.dataList.length > 0) {
+ this.messageText = "澶氭缁勬墭鍙拌溅涓嶄竴鑷达紝璇锋鏌ュ悗鍐嶆搷浣滐紒锛�"
+ this.messageToggle('error')
+ this.dataList = [];
+ return;
+ }
+ }
+
+ this.barcode = bcode;
+ console.log(this.barcode);
+
+ },
+
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
@@ -227,6 +270,8 @@
},
success(result) {
result = result.data
+ console.log("================>");
+ console.log(result);
if (result.code === 200 && result.data) {
that.matData = result.data
that.matnr = ''
@@ -270,12 +315,12 @@
},
selectMat() {
let that = this
- if (that.orderNo == null || that.orderNo == undefined ) {
+ if (that.orderNo == null || that.orderNo == undefined) {
that.messageText = '璇峰～鍐欒鍗曠紪鍙凤紒锛�'
that.messageToggle('error')
return;
}
-
+
uni.navigateTo({
url: "../mat/matQuery",
success: function(res) {
@@ -288,6 +333,7 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
acceptDataFromOpenedPage: function(data) {
that.matnr = data.data
+
that.findMat(that.matnr)
},
},
@@ -296,23 +342,24 @@
},
checkMat(mat) {
var len = this.dataList.length
- var add = true ,sameItem = false
+ var add = true,
+ sameItem = false
for (var i = 0; i < len; i++) {
if (mat.matnr == this.dataList[i].matnr) {
for (var j = 0; j < len; j++) {
- if (mat.suppCode == this.dataList[j].suppCode) {
+ if (mat.suppCode == this.dataList[j].suppCode && mat.orderNo == this.dataList[j].orderNo) {
sameItem = true
}
}
// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.suppCode != this.dataList[i].suppCode) {
+ if (mat.suppCode != this.dataList[i].suppCode || mat.orderNo != this.dataList[i].orderNo) {
this.$forceUpdate() // 寮哄埗鍒锋柊
if (sameItem) {
add = false
} else {
add = true
}
-
+
} else {
// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
this.dataList[i].anfme += mat.anfme
@@ -320,10 +367,16 @@
add = false
}
}
+ this.dataList[i].boxType1 = this.boxType1;
}
+
if (add) {
+ mat.boxType1 = this.boxType1;
this.dataList.unshift(mat)
}
+ this.tempBoxType = this.boxType1;
+
+ this.boxType1 = null;
},
// 淇敼鎵瑰彿
revise(item, i) {
@@ -340,7 +393,7 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
- this.removeNum = i
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -360,6 +413,7 @@
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].suppCode = this.suppCode
this.dataList[this.rowNum].weight = this.weight
+ this.dataList[this.rowNum].boxType1 = this.tempBoxType
this.matnr = ''
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
@@ -405,6 +459,7 @@
data: JSON.stringify({
orderNo: that.orderNo,
barcode: that.barcode,
+ boxType1: that.boxType1,
combMats: that.dataList,
type: '1'
}),
@@ -469,6 +524,7 @@
.list:first-child {
margin-top: 460rpx;
}
+
.code {
width: 100%;
position: fixed;
@@ -518,4 +574,4 @@
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/AGV/CollectionPakin.vue b/pages/AGV/CollectionPakin.vue
index 60f7ce6..247c390 100644
--- a/pages/AGV/CollectionPakin.vue
+++ b/pages/AGV/CollectionPakin.vue
@@ -12,7 +12,7 @@
/>
</view>
<view class="item">
- <view class="code-decs">鐩爣鎵樼洏:</view>
+ <view class="code-decs">鍙拌溅鐮�:</view>
<input
type="text"
placeholder=" 鎵爜 / 杈撳叆"
@@ -89,6 +89,7 @@
style="border: none; justify-content: center"
>
<uni-number-box
+ disabled="true"
v-model="item.workQty"
:max="item.anfme"
color="#747474"
diff --git a/pages/AGV/EmpBackLoc.vue b/pages/AGV/EmpBackLoc.vue
new file mode 100644
index 0000000..b40a29f
--- /dev/null
+++ b/pages/AGV/EmpBackLoc.vue
@@ -0,0 +1,330 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">鍙拌溅绔欑偣锛�</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="tarSite" >
+ <!-- <uni-combox :candidates="staList" placeholder="璇烽�夋嫨绔欑偣" v-model="tarSite"></uni-combox> -->
+ </view>
+ </view>
+ <view class="mat-list-title">
+ </view>
+ <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+ <view class="buttom">
+ <button size="mini" @click="reset('warn')">閲嶇疆</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">鍛煎彨</button>
+ </view>
+ <!-- 绉婚櫎纭 -->
+ <view>
+ <!-- 鎻愮ず绐楃ず渚� -->
+ <uni-popup ref="alertDialog" type="dialog">
+ <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+ @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <view>
+ <!-- 鎻愮ず淇℃伅寮圭獥 -->
+ <uni-popup ref="message" type="message">
+ <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+ </uni-popup>
+ </view>
+ <!-- 纭缁勬墭 -->
+ <view>
+ <uni-popup ref="combConfirm" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ @confirm="comb" @close="combClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <!-- 纭閲嶇疆 -->
+ <view>
+ <uni-popup ref="resetConfirm" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: uni.getStorageSync('baseUrl'),
+ token: '',
+ barcode: '',
+ orderNo: '',
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ orderNoFocus: false,
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ locNo:"",
+ orgSite:'',
+ tarSite:'',
+ staList:[],
+ }
+ },
+ onLoad() {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+ // that.getSites()
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ mounted() {
+ // this.tarSite = uni.getStorageSync('tarSite')
+ },
+ methods: {
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ clearOrderNo() {
+ this.orderNo = ''
+ let that = this;
+ that.orderNoFocus = false;
+ setTimeout(() => {
+ that.orderNo = '';
+ that.orderNoFocus = true;
+ }, 100);
+ },
+ orderNoInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.orderNo.length
+ this.barcodeFocuss()
+ }, 200)
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ this.focuss()
+ }, 200)
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ barcodeFocuss() {
+ let that = this;
+ that.barcodeFocus = false;
+ setTimeout(() => {
+ that.barcode = '';
+ that.barcodeFocus = true;
+ }, 100);
+ },
+ // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+ focuss() {
+ this.focus = false;
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
+ }, 100);
+ },
+
+ selectMat() {
+ let that = this
+ uni.navigateTo({
+ url: "../mat/matQuery",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ that.matnr = ''
+ },
+ checkMat(mat) {
+ this.dataList = mat
+ },
+ // 淇敼鎵瑰彿
+ revise(item, i) {
+ this.matnr = this.dataList[i].matnr
+ this.count = this.dataList[i].anfme
+ this.batch = this.dataList[i].batch
+ this.weight = this.dataList[i].weight
+ this.rowNum = i
+ this.eject()
+ },
+ eject(type) {
+ this.type = type
+ this.$refs.revise.open(type)
+ },
+ // 鍒楄〃绉婚櫎鎸夐挳
+ remove(item, i, type) {
+ this.removeNum = i
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+ this.$refs.alertDialog.open(i)
+ },
+ // 纭绉婚櫎
+ removeConfirm() {
+ this.messageText = "绉婚櫎鎴愬姛"
+ this.messageToggle('success')
+ this.dataList.splice(this.removeNum, 1)
+ },
+ // 鍙栨秷绉婚櫎
+ removeClose() {
+ this.$refs.alertDialog.close()
+ },
+ reviseConfirm() {
+ this.dataList[this.rowNum].anfme = this.count
+ this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].weight = this.weight
+ this.matnr = ''
+ this.messageText = "淇敼鎴愬姛"
+ this.messageToggle('success')
+ this.$refs.revise.close()
+ },
+ reviseClose() {
+ this.$refs.revise.close()
+ },
+ changeValue(value) {
+ this.count = value
+ },
+ combConfirm(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁鐜板湪鍛煎彨!'
+ this.$refs.combConfirm.open()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ comb() {
+ uni.setStorageSync('tarSite', this.tarSite);
+ uni.vibrateShort();
+ let that = this;
+ uni.request({
+ url: that.baseUrl + '/mobile/agv/call/back',
+ data: JSON.stringify({
+ orgSite: that.tarSite
+ }),
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.resst();
+ that.messageText = "鍛煎彨鎴愬姛"
+ that.messageToggle('success')
+ } else if (res.code == 403) {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ }
+ }
+ });
+ },
+ reset(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁閲嶇疆!'
+ this.$refs.resetConfirm.open()
+ },
+ // 纭閲嶇疆
+ resetConfirm() {
+ this.dataList = []
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.orgSite = ''
+ this.dataList = []
+
+
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 100rpx;
+ background-color: #FFF;
+ z-index: 10;
+ }
+
+ .item {
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ margin-left: 20rpx;
+ border-bottom: 1px solid #DCDFE6;
+ }
+
+ .item input {
+ height: 50rpx;
+ line-height: 50rpx;
+ /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+ font-size: 36upx;
+ font-family: PingFang SC;
+ width: 55vw;
+
+ }
+
+ .code-decs {
+ width: 25vw;
+ font-size: 18px;
+ color: #303133;
+ }
+
+ .item-right {
+ margin-left: auto;
+ margin-right: 20rpx;
+ }
+
+ .mat-list-title {
+ height: 80rpx;
+ line-height: 80rpx;
+ width: 100%;
+ background-color: white;
+ position: fixed;
+ margin-top: 100rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+ }
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 480914a..d1ebbf3 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -89,6 +89,13 @@
url: '/pakin/PakinBind'
},
{
+ title: '绌哄彴杞﹀洖搴�',
+ name: 'EmpBackLoc',
+ color: 'red',
+ cuIcon: 'pulldown',
+ url: '/AGV/EmpBackLoc'
+ },
+ {
title: '鐩樼偣',
name: 'Check',
color: 'green',
--
Gitblit v1.9.1