From b8c1b13f3b805241362d4ecd38930dd88c020f27 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 十一月 2024 16:42:47 +0800
Subject: [PATCH] #
---
pages/pakin/leftovers.vue | 12
pages/home/home.vue | 9
pages/order/orderList.vue | 1
pages/order/orderPakin2.vue | 2
pages.json | 12
pages/AGV/AGVStart.vue | 68 +-
pages/order/orderDetlList.vue | 2
pages/AGV/AGVUnbind.vue | 548 ++++++++++++++++++++++++
pages/pakin/mergeStore.vue | 611 +++++++++++++++++++++++++++
pages/pakin/pakin.vue | 2
10 files changed, 1,223 insertions(+), 44 deletions(-)
diff --git a/pages.json b/pages.json
index 97b75bc..7bcfe3e 100644
--- a/pages.json
+++ b/pages.json
@@ -61,6 +61,12 @@
}
},
{
+ "path": "pages/AGV/AGVUnbind",
+ "style": {
+ "navigationBarTitleText": "AGV鍌ㄤ綅瑙ｇ粦"
+ }
+ },
+ {
"path": "pages/tzsk/AGV/AGVPakin",
"style": {
"navigationBarTitleText": "AGV缁勬墭"
@@ -145,6 +151,12 @@
}
},
{
+ "path": "pages/pakin/mergeStore",
+ "style": {
+ "navigationBarTitleText": "骞舵澘鍏ュ簱"
+ }
+ },
+ {
"path": "pages/pakin/leftovers",
"style": {
"navigationBarTitleText": "鎷ｆ枡绔欏埌绔�"
diff --git a/pages/AGV/AGVStart.vue b/pages/AGV/AGVStart.vue
index 7a699bc..e48fca6 100644
--- a/pages/AGV/AGVStart.vue
+++ b/pages/AGV/AGVStart.vue
@@ -4,13 +4,17 @@
<view class="item">
<view class="code-decs">鏆傚瓨浣�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="stationCode" :focus="stationCodeFocus"
- @input="stationCodeInput()">
+ @input="stationCodeInput()" >
+ </view>
+ <view class="item">
+ <view class="code-decs">鍏ュ簱绔�:</view>
+ <uni-combox :candidates="staList" placeholder="璇烽�夋嫨绔欑偣" v-model="sta"></uni-combox>
</view>
</view>
- <!-- <view class="mat-list-title">
- <view style="-webkit-flex: 1;flex: 1;">绔欑偣鍒楄〃</view>
- </view> -->
+ <view class="mat-list-title">
+ <view style="-webkit-flex: 1;flex: 1;"></view>
+ </view>
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
<view class="aside">
@@ -122,7 +126,9 @@
removeNum: 0,
floorList: [1,3],
floor: "",
- devNo: []
+ devNo: [],
+ staList:[],
+ sta:''
}
},
onLoad() {
@@ -134,19 +140,22 @@
methods: {
stationCodeInput() {
setTimeout(() => {
- var len = this.stationCode.length
- if (len != 15) {
- this.stationCode = ''
- this.stationCodeFocus = true
- uni.showToast({
- title: '鏆傚瓨鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- return;
+ console.log(this.stationCode.substring(0,1))
+ this.staList=[]
+ this.sta = ''
+ if(this.stationCode.substring(0,1) == 'a'){
+ this.staList.push(1040)
+ this.sta = 1040
+ }else if(this.stationCode.substring(0,1) == 'b'){
+ this.staList.push(2010)
+ this.staList.push(2000)
+ this.sta = 2010
+ }else if(this.stationCode.substring(0,1) == 'c'){
+ this.staList.push(3010)
+ this.sta = 3010
+
}
- this.pushDevNo()
- this.stationCodeFocuss()
+
}, 200)
},
pushDevNo() {
@@ -419,19 +428,18 @@
combClose() {
this.$refs.combConfirm.close()
},
- comb() {
- this.devNo = []
- uni.vibrateShort();
+ comb() {
let that = this;
- for (var i = 0; i < this.dataList.length; i++) {
- if (this.dataList[i].checked) {
- this.devNo.push(this.dataList[i].devNo)
- }
+ if (that.stationCode === '') {
+ this.messageText = "璇锋壂鎻忔殏瀛樹綅鏉＄爜"
+ this.messageToggle('error')
+ return;
}
uni.request({
- url: that.baseUrl + '/agvMobile/pakin/auth',
+ url: that.baseUrl + '/mobile/agv/start',
data: JSON.stringify({
- devNo: that.devNo
+ sta: that.stationCode,
+ inSta: that.sta
}),
method: 'POST',
header: {
@@ -478,8 +486,8 @@
},
// 娓呯┖
resst() {
- this.dataList = []
- this.barcode = ''
+ this.staList = []
+ this.sta = ''
this.stationCode = ''
this.floor = ''
this.barcodeFocuss()
@@ -549,11 +557,11 @@
.mat-list-title {
display: flex;
align-items: center;
- height: 80rpx;
+ height: 30rpx;
width: 100%;
background-color: white;
position: fixed;
- margin-top: 100rpx;
+ margin-top: 200rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/AGV/AGVUnbind.vue b/pages/AGV/AGVUnbind.vue
new file mode 100644
index 0000000..fd863bd
--- /dev/null
+++ b/pages/AGV/AGVUnbind.vue
@@ -0,0 +1,548 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">鏆傚瓨浣�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="stationCode" :focus="stationCodeFocus"
+ @input="stationCodeInput()" >
+ </view>
+ </view>
+
+ <view class="mat-list-title">
+ <view style="-webkit-flex: 1;flex: 1;"></view>
+ </view>
+ <scroll-view>
+ <view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
+ <view class="aside">
+ <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
+ </view>
+ <view class="list-left" style="display: flex;justify-content: center;">
+ {{item.devNo}}
+ </view>
+ <view class="list-right">
+ <!-- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons> -->
+ <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+ </view>
+ </view>
+ </scroll-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="revise" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">淇敼</view>
+ <view class="popup-item">
+ <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-right">
+ <input type="text" v-model="matnr" disabled="true"
+ 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"><input type="text" v-model="batch"></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;">
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+ </view>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="reviseClose">鍙栨秷</view>
+ <view class="btn-right" @click="reviseConfirm()">淇敼</view>
+ </view>
+ </view>
+ </uni-popup>
+ </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: '',
+ token: '',
+ barcode: '',
+ stationCode: '',
+ stationCodeFocus: true,
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ floorList: [1,3],
+ floor: "",
+ devNo: [],
+ staList:[],
+ sta:''
+ }
+ },
+ onLoad() {
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ methods: {
+ stationCodeInput() {
+ },
+ pushDevNo() {
+ var devNo = {"devNo":this.stationCode}
+ if (this.dataList.length == 0) {
+ this.dataList.push(devNo)
+ return
+ }
+ var flag = false
+ for(var i = 0; i < this.dataList.length; i++ ) {
+ if (this.dataList[i].devNo == devNo.devNo) {
+ this.messageText = "绔欑偣閲嶅"
+ this.messageToggle('warn')
+ return
+ } else {
+ flag = true
+ }
+ }
+ if(flag) {
+ this.dataList.push(devNo)
+ }
+
+ },
+ stationCodeFocuss() {
+ let that = this;
+ this.stationCode = ''
+ that.stationCodeFocus = false;
+ setTimeout(() => {
+ that.stationCodeFocus = true;
+ }, 100);
+ },
+ getChecked() {
+ var checkedList = []
+ for(var i = 0; i < this.dataList.length; i++) {
+ var t = !this.dataList[i].checked
+ if (this.dataList[i].checked) {
+ checkedList.push(this.dataList[i])
+ }
+ }
+ this.dataList = checkedList
+ },
+ set(e) {
+ var ck = this.dataList[e].checked
+ this.dataList[e].checked = ck ? false:true
+ },
+ getFloor() {
+ let that = this
+ if (this.floor == '') {
+ return
+ }
+ uni.request({
+ url: that.baseUrl + '/agvMobile/getBasDevp/auth',
+ data: {
+ floor: that.floor
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ for(var i = 0; i < res.data.length; i++) {
+ if (res.data[i].locSts === 'F') {
+ // res.data[i]["color"] = "red"
+ that.dataList.push(res.data[i])
+ }
+ }
+ }
+ });
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ if (len != 8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.barcodeFocuss()
+ return;
+ }
+ 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);
+ },
+ // 鎼滅储鐗╂枡
+ findMat() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/mat/auth',
+ data: {
+ matnr: that.matnr
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ that.matData = result.data
+ that.matnr = ''
+ that.matData['batch'] = ''
+ uni.navigateTo({
+ url: "../mat/matSelected",
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ success: function(res) {
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
+ },
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ events: {
+ matList: function(data) {
+ that.checkMat(data.data)
+ that.focuss()
+ },
+ },
+ });
+ } else if (res.code == 403) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ });
+
+ },
+ 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) {
+ var len = this.dataList.length
+ 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.batch == this.dataList[j].batch) {
+ sameItem = true
+ }
+ }
+ // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
+ if (mat.batch != this.dataList[i].batch) {
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ if (sameItem) {
+ add = false
+ } else {
+ add = true
+ }
+
+ } else {
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ this.dataList[i].anfme += mat.anfme
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
+ }
+ }
+ if (add) {
+ this.dataList.unshift(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() {
+ let that = this;
+ if (that.stationCode === '') {
+ this.messageText = "璇锋壂鎻忔殏瀛樹綅鏉＄爜"
+ this.messageToggle('error')
+ return;
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/agv/unbind',
+ data: JSON.stringify({
+ site: that.stationCode,
+
+ }),
+ 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.stationCode = ''
+ this.floor = ''
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.staList = []
+ this.sta = ''
+ this.stationCode = ''
+ this.floor = ''
+ this.barcodeFocuss()
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+
+ .bg-red {
+ background-color: #e54d42;
+ color: #ffffff;
+ }
+ .bg-white {
+ background-color: #ffffff;
+ color: #666666;
+ }
+ .list:first-child {
+ margin-top: 360rpx;
+ }
+ .aside {
+ width: 100rpx;
+ /* background-color: #303133; */
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .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: 20vw;
+ font-size: 18px;
+ color: #303133;
+ }
+
+ .item-right {
+ margin-left: auto;
+ margin-right: 20rpx;
+ }
+
+ .mat-list-title {
+ display: flex;
+ align-items: center;
+ height: 30rpx;
+ 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 30px 0px rgba(0, 0, 0, 0.5);
+ }
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ced8db4..1470972 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -47,11 +47,18 @@
},
{
title: '鍛煎彨Agv',
- name: 'changePallet',
+ name: 'AGVStart',
color: 'green',
cuIcon: 'order',
url: '/AGV/AGVStart'
},
+ {
+ title: 'Agv鍌ㄤ綅瑙ｇ粦',
+ name: 'AGVUnbind',
+ color: 'orange',
+ cuIcon: 'order',
+ url: '/AGV/AGVUnbind'
+ },
// {
// title: '缁勬墭涓婃灦',
// name: 'putOn',
diff --git a/pages/order/orderDetlList.vue b/pages/order/orderDetlList.vue
index ccc4a24..91e66f3 100644
--- a/pages/order/orderDetlList.vue
+++ b/pages/order/orderDetlList.vue
@@ -1,6 +1,6 @@
<template>
<view>
- <view class="card" v-for="item in menuList" @click="chose(item)">
+ <view class="card" v-show="item.enableQty >0" v-for="item in menuList" @click="chose(item)">
<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
<view class="tag-item">鐗╂枡鐮侊細 {{item.matnr}}</view>
<view class="tag-item">鐗╂枡鍚嶇О锛� {{item.maktx}}</view>
diff --git a/pages/order/orderList.vue b/pages/order/orderList.vue
index 0f7b99a..264da1d 100644
--- a/pages/order/orderList.vue
+++ b/pages/order/orderList.vue
@@ -14,6 +14,7 @@
<view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
<view class="tag-item">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
<view class="tag-item">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
+ <view class="tag-item">浠撳簱锛� {{item.itemName}}</view>
</view>
</view>
<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
diff --git a/pages/order/orderPakin2.vue b/pages/order/orderPakin2.vue
index 5b9ed4d..fa138ab 100644
--- a/pages/order/orderPakin2.vue
+++ b/pages/order/orderPakin2.vue
@@ -207,7 +207,7 @@
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
var len = this.barcode.length
- if (len != 8) {
+ if (len >= 9 && len <=8) {
uni.showToast({
title: '鎵樼洏鐮佹湁璇閲嶈瘯',
icon: "none",
diff --git a/pages/pakin/leftovers.vue b/pages/pakin/leftovers.vue
index 4744ca8..5d51539 100644
--- a/pages/pakin/leftovers.vue
+++ b/pages/pakin/leftovers.vue
@@ -191,7 +191,7 @@
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
var len = this.barcode.length
- if (len != 8) {
+ if (len >= 9 && len <=8) {
uni.showToast({
title: '鎵樼洏鐮佹湁璇閲嶈瘯',
icon: "none",
@@ -208,15 +208,7 @@
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
var len = this.barcode2.length
- if (len != 8) {
- uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
+
// this.selectPakinDetlList()
// this.focuss()
}, 200)
diff --git a/pages/pakin/mergeStore.vue b/pages/pakin/mergeStore.vue
new file mode 100644
index 0000000..edb9e4c
--- /dev/null
+++ b/pages/pakin/mergeStore.vue
@@ -0,0 +1,611 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">Bom鍙�:</view>
+ <view style="flex: 1;">
+ <input type="text" placeholder=" --" disabled="true" v-model="orderNo" :focus="orderNoFocus">
+ </view>
+ <view style="height:100%;line-height:2;width:40rpx;margin-right: 20rpx;">
+ <!-- <uni-icons type="clear" color="#c1c1c1" @click="clearOrderNo()"></uni-icons> -->
+ </view>
+ </view>
+ <view class="item">
+ <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="matnr" :focus="matFocus" @input="checkBom()">
+ <view class="item-right">
+ <button></button>
+ <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
+ <uni-icons type="right" color="#c1c1c1"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view class="mat-list-title">
+ 鍟嗗搧鍒楄〃
+ </view>
+ <scroll-view>
+ <view class="list" v-for="(item,i) in dataList" :key="i">
+ <view class="list-left">
+ <view class="list-left-item">
+ <view class="desc">No锛�</view>
+ <view class="left-item">{{i + 1}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">缂栫爜锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鍝佸悕锛�</view>
+ <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="left-item">
+ <uni-tag :text="item.batch" 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="left-item">鏁伴噺锛歿{item.anfme}}</view>
+ </view>
+ <view class="list-left-item">
+ </view>
+ </view>
+ <view class="list-right">
+ <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+ <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+ </view>
+ </view>
+ </scroll-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="revise" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">淇敼</view>
+ <view class="popup-item">
+ <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-right">
+ <input type="text" v-model="matnr" disabled="true"
+ 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"><input type="text" v-model="batch"></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;">
+ <uni-number-box :value="count" :step='1' :max="maxAn" color="#747474" @change="changeValue" />
+ </view>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="reviseClose">鍙栨秷</view>
+ <view class="btn-right" @click="reviseConfirm()">淇敼</view>
+ </view>
+ </view>
+ </uni-popup>
+ </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: '',
+ 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,
+ enterCount: 0,
+ maxAnfme: 0,
+ maxAn: 0
+ }
+ },
+ onLoad() {
+
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ 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() {
+ let _this = this
+ uni.request({
+ url: _this.baseUrl + '/mobile/check/mergeStore/barcode',
+ data: {barcode: _this.barcode},
+ header: { 'token':uni.getStorageSync('token') },
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.focuss()
+ _this.orderNo = res.data
+ uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: "none", position: 'top' })
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ _this.barcodeFocuss()
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ }
+ }
+ })
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ 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);
+ },
+ // 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
+ checkBom() {
+ let _this = this
+ uni.request({
+ url: _this.baseUrl + '/mobile/comb/checkBom',
+ data: JSON.stringify({
+ bomCode: _this.orderNo,
+ matnr: _this.matnr
+ }),
+ method: 'POST',
+ header: { 'token': uni.getStorageSync('token') },
+ success(res) {
+ // console.log(res);
+ res = res.data
+ if (res.code === 200) {
+ if (res.data) {
+ _this.maxAnfme = res.data.zpalletAnfme
+ _this.findMat()
+ } else {
+ _this.findMat()
+ }
+ } else if (res.code == 403) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ _this.matnr = ''
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ })
+ },
+ // 鎼滅储鐗╂枡
+ findMat() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/mat/auth',
+ data: {
+ matnr: that.matnr
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ that.matData = result.data
+ that.matnr = ''
+ that.matData['batch'] = ''
+ if (that.maxAnfme > 0) {
+ that.matData['maxNum'] = that.maxAnfme
+ } else if (that.maxAnfme == 0){
+ that.matData['maxNum'] = 0
+ }
+ uni.navigateTo({
+ url: "../mat/matSelected",
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ success: function(res) {
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
+ },
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ events: {
+ matList: function(data) {
+ console.log(data);
+ that.checkMat(data.data)
+ that.focuss()
+ },
+ },
+ });
+ } else if (result.code == 403) {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ });
+
+ },
+ 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) {
+ var len = this.dataList.length
+ 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.batch == this.dataList[j].batch) {
+ sameItem = true
+ }
+ }
+ // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
+ if (mat.batch != this.dataList[i].batch) {
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ if (sameItem) {
+ add = false
+ } else {
+ add = true
+ }
+
+ } else {
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ this.dataList[i].anfme += mat.anfme
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
+ }
+ }
+ if (add) {
+ // if (this.maxAnfme) {
+ // mat['maxAnfme'] = this.maxAnfme
+ // mat.anfme = this.maxAnfme
+
+ // }
+ this.dataList.unshift(mat)
+ }
+ this.maxAnfme = ''
+ },
+ // 淇敼鎵瑰彿
+ 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.maxAn = this.dataList[i].maxNum
+ 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.vibrateShort();
+ let that = this;
+ if (that.orderNo === '') {
+ this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.barcode === '') {
+ this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.dataList.length === 0) {
+ this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+ this.messageToggle('error')
+ return;
+ }
+ for (var i = 0; i < that.dataList.length; i++) {
+ if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+ this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+ this.messageToggle('error')
+ return;
+ }
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/merge/comb/auth',
+ data: JSON.stringify({
+ bomCode: that.orderNo,
+ barcode: that.barcode,
+ combMats: that.dataList
+ }),
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.resst();
+ that.messageText = "缁勬墭鎴愬姛"
+ that.messageToggle('success')
+ const innerAudioContext = uni.createInnerAudioContext();
+ innerAudioContext.src = '/static/music/pakinOk.mp3';
+ innerAudioContext.play()
+ } 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.orderNo = ''
+ this.dataList = []
+ this.barcode = ''
+ let that = this;
+ that.orderNoFocus = false;
+ setTimeout(() => {
+ that.orderNo = '';
+ that.orderNoFocus = true;
+ }, 100);
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 140rpx;
+ background-color: #FFF;
+ z-index: 10;
+ }
+
+ .item {
+ display: flex;
+ align-items: center;
+ height: 70rpx;
+ 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: 20vw;
+ 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: 210rpx;
+ 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/pakin/pakin.vue b/pages/pakin/pakin.vue
index 47071fd..5173e24 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -193,7 +193,7 @@
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
var len = this.barcode.length
- if (len != 8) {
+ if (len >= 9 && len <=8) {
uni.showToast({
title: '鎵樼洏鐮佹湁璇閲嶈瘯',
icon: "none",
--
Gitblit v1.9.1