From 9382f2c611581996c9b015abeb079891acbddde4 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 17:56:19 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app
---
pages/AGV/CachePakin.vue | 65 +++++++++++++-------------------
1 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/pages/AGV/CachePakin.vue b/pages/AGV/CachePakin.vue
index cb3fbb5..c3c2d61 100644
--- a/pages/AGV/CachePakin.vue
+++ b/pages/AGV/CachePakin.vue
@@ -48,21 +48,11 @@
<view class="left-item">{{item.maktx}}</view>
</view>
<view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
+ <view class="desc">渚涘簲鍟嗭細</view>
<view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
+ <uni-tag :text="item.supCode" type="warning"></uni-tag>
</view>
</view>
- <!-- <view class="list-left-item">
- <view class="desc">閲嶉噺锛�</view>
- <view class="left-item">
- <uni-tag :text="item.weight" type="warning"></uni-tag>
- </view>
- </view> -->
<view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
@@ -94,13 +84,11 @@
</view>
</view>
<view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
+ <view class="desc">渚涘簲鍟嗭細</view>
+ <view class="left-item">
+ <uni-tag :text="supCode" 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="weight"></view>
- </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -157,7 +145,7 @@
count: 0,
rowNum: '',
matnr: '',
- batch: '',
+ supCode: '',
weight: '',
msgType1: 'success',
msgType: 'success',
@@ -193,19 +181,19 @@
},
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.barcode.length
- if (len != 8) {
- uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
- this.focuss()
- }, 200)
+ // setTimeout(() => {
+ // var len = this.barcode.length
+ // if (len != 8) {
+ // uni.showToast({
+ // title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ // icon: "none",
+ // position: 'top'
+ // });
+ // this.barcodeFocuss()
+ // return;
+ // }
+ // this.focuss()
+ // }, 200)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
@@ -242,7 +230,7 @@
if (result.code === 200 && result.data) {
that.matData = result.data
that.matnr = ''
- that.matData['batch'] = ''
+ that.matData['supCode'] = ''
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -312,12 +300,12 @@
for (var i = 0; i < len; i++) {
if (mat.matnr == this.dataList[i].matnr) {
for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
+ if (mat.supCode == this.dataList[j].supCode) {
sameItem = true
}
}
// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
+ if (mat.supCode != this.dataList[i].supCode) {
this.$forceUpdate() // 寮哄埗鍒锋柊
if (sameItem) {
add = false
@@ -341,7 +329,7 @@
revise(item, i) {
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
+ this.supCode = this.dataList[i].supCode
this.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
@@ -370,7 +358,7 @@
},
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].supCode = this.supCode
this.dataList[this.rowNum].weight = this.weight
this.matnr = ''
this.messageText = "淇敼鎴愬姛"
@@ -417,7 +405,8 @@
data: JSON.stringify({
orderNo: that.orderNo,
barcode: that.barcode,
- combMats: that.dataList
+ combMats: that.dataList,
+ type: '1'
}),
method: 'POST',
header: {
--
Gitblit v1.9.1