From de398f47dd12b3890c9ee545422da78e82b60fa9 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 08 十二月 2025 09:22:06 +0800
Subject: [PATCH] 修改PDA出入库中出现undefined问题，修改job中因为上游调用频率过快导致job死掉，修改前端报警信息使用不同颜色
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs | 5
新建文件夹/WMS/src/extension/outbound/outboundOrder.js | 2
新建文件夹/PDA/pages/stash/inboundorder.vue | 500 ++++---
新建文件夹/WMS/src/extension/Alarm/MessageInfo.js | 90 +
新建文件夹/WMS/src/views/Alarm/MessageInfo_Hty.vue | 30
新建文件夹/WMS/src/views/stock/stockInfo.vue | 3
新建文件夹/PDA/pages/stash/CheckFinish.vue | 247 ++-
新建文件夹/WMS/src/extension/stock/Dt_Inventory_Batch.js | 2
新建文件夹/PDA/pages/stash/outboundorderDetail.vue | 172 +-
新建文件夹/PDA/pages/stash/CheckoutorderDetail.vue | 165 +-
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs | 3
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 76 -
新建文件夹/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs | 10
新建文件夹/PDA/pages/stash/raworderboxing.vue | 1463 +++++++++++++---------
新建文件夹/PDA/pages/stash/outFinish.vue | 960 ++++++++------
15 files changed, 2,120 insertions(+), 1,608 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckFinish.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckFinish.vue"
index bdc9c63..5d6593e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckFinish.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckFinish.vue"
@@ -16,12 +16,18 @@
</uni-forms-item>
<uni-forms-item :label="order_qty">
</uni-forms-item>
+ <uni-forms-item label="寰呮壂鐗╂枡缂栫爜:">
+ <uni-easyinput type="text" placeholder="璇锋壂鎻忕墿鏂欑紪鐮�" ref='materialInput'
+ :focus="step === 1" v-model="materialCode"
+ @confirm="materialCodeInput"
+ @blur="materialCodeInput" />
+ </uni-forms-item>
<uni-forms-item label="搴撲綅缂栧彿:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓簱浣嶇紪鍙�" ref='midInput' :focus="!focus"
+ <uni-easyinput type="text" placeholder="璇锋壂鎻忓簱浣嶇紪鍙�" ref='midInput' :focus="step === 2"
v-model="barcode" @confirm="barcodeInput" />
</uni-forms-item>
<uni-forms-item label="瀹炵洏鏁伴噺:">
- <uni-easyinput type="text" placeholder="璇疯緭鍏ュ疄鐩樻暟閲�" ref='midInput' :focus="focus"
+ <uni-easyinput type="text" placeholder="璇疯緭鍏ュ疄鐩樻暟閲�" ref='midInput' :focus="step === 3"
v-model="materSn" @confirm="snInput" />
</uni-forms-item>
@@ -37,7 +43,7 @@
<view style="display: flex;justify-content: space-around;margin-top: 2%;">
<!-- <button @click="reset" type="default" size="default"
style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button> -->
- <button @click="submit" type="primary" size="default" style="width: 200rpx;">鐩樼偣瀹屾垚</button>
+ <button @click="submit" type="primary" size="default" style="width: 250rpx;">鐩樼偣瀹屾垚</button>
</view>
</uni-forms-item>
</uni-forms>
@@ -167,7 +173,10 @@
Testcheck: false,
pkmaterSn: "",
pkmatInfos: [],
- addressdisabled: false
+ addressdisabled: false,
+ materialCode: "", // 鏂板锛氭壂鎻忕殑鐗╂枡缂栫爜
+ materialCodeValid: false, // 鏂板锛氱墿鏂欑紪鐮侀獙璇佺姸鎬�
+ step: 1, // 鏂板锛�1-鐗╂枡缂栫爜锛�2-搴撲綅缂栧彿锛�3-鍏ュ簱鏁伴噺
}
},
onShow() {},
@@ -185,9 +194,60 @@
this.order_qty="璐﹂潰鏁伴噺锛�"+res.stockQuantity;
this.order_Inqty="鐗╂枡鍚嶇О锛�"+res.materielName;
this.goods_no="鐗╂枡缂栧彿锛�"+res.materielCode;
+ this.materielCode = res.materielCode; // 璁剧疆鐢ㄤ簬楠岃瘉鐨勭墿鏂欑紪鐮�
+
// this.getData();
},
methods: {
+ // 鐗╂枡缂栫爜楠岃瘉
+materialCodeInput() {
+ console.log("materialCodeInput 琚Е鍙�");
+ console.log("杈撳叆鍊�:", this.materialCode);
+ this.$nextTick(() => {
+ if (this.materialCode.trim() !== "") {
+ const scannedCode = this.materialCode.trim();
+ const expectedCode = this.materielCode;
+
+ console.log("鎵弿缂栫爜:", scannedCode);
+ console.log("鏈熸湜缂栫爜锛坢aterielCode锛�:", expectedCode);
+
+ if (scannedCode === expectedCode) {
+ this.materialCodeValid = true;
+ console.log("鉁� 鐗╂枡缂栫爜楠岃瘉鎴愬姛");
+
+ // 楠岃瘉鎴愬姛鍚庝笉娓呯┖鍊硷紝鐩存帴鍒囨崲鍒颁笅涓�姝�
+ this.step = 2;
+ this.$refs.uToast.show({
+ title: "鐗╂枡缂栫爜楠岃瘉鎴愬姛",
+ type: "success"
+ });
+ // 浣跨敤 $nextTick 纭繚鐒︾偣鍒囨崲鍦� DOM 鏇存柊鍚庢墽琛�
+ this.$nextTick(() => {
+ // 璁╁簱浣嶇紪鍙疯緭鍏ユ鑾峰緱鐒︾偣
+ this.$refs.midInput.focus();
+ });
+ } else {
+ this.materialCodeValid = false;
+ console.log("鉂� 鐗╂枡缂栫爜楠岃瘉澶辫触");
+
+ this.$refs.uToast.show({
+ title: `鐗╂枡缂栫爜涓嶅尮閰峘,
+ type: "error"
+ });
+
+ // 楠岃瘉澶辫触鏃舵竻绌哄�煎苟淇濇寔鐒︾偣鍦ㄧ墿鏂欑紪鐮佽緭鍏ユ
+ setTimeout(() => {
+ this.materialCode = "";
+ this.step = 1;
+ // 纭繚鐒︾偣鍥炲埌鐗╂枡缂栫爜杈撳叆妗�
+ this.$nextTick(() => {
+ this.$refs.materialInput.focus();
+ });
+ }, 500);
+ }
+ }
+ });
+},
// voiceSpeech(src) {
// innerAudioContext.src = src; // '../../static/success.mp3';
// innerAudioContext.play();
@@ -234,19 +294,23 @@
}
},
barcodeInput() {
- this.$nextTick(function(x) {
+ this.$nextTick(() => {
if (this.barcode.length > 0) {
- // if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
- this.focus = true;
- // } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
- // type: "error"
- // })
- // }
+ this.step = 3; // 鍒囨崲鍒板叆搴撴暟閲�
+ this.$refs.uToast.show({
+ title: "搴撲綅缂栧彿鎵弿鎴愬姛",
+ type: "success"
+ });
+ // 娣诲姞寤舵椂纭繚鎵爜瀹屾垚
+ setTimeout(() => {
+ this.$nextTick(() => {
+ this.$refs.midInput.focus();
+ });
+ }, 100);
}
})
},
+
snInput() {
this.$nextTick(() => {
if (this.materSn != "") {
@@ -501,74 +565,97 @@
// }
// })
// }
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忚揣浣嶇紪鍙�",
- type: 'error'
- })
- return;
- }
- if (this.materSn.length == 0) {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ疄鐩樻暟閲�",
- type: 'error'
- })
- return;
- }
+ submit() {
+ if (!this.materialCodeValid) {
+ this.$refs.uToast.show({
+ title: "璇峰厛鎵弿骞堕獙璇佺墿鏂欑紪鐮�",
+ type: 'error'
+ });
+ return;
+ }
+ if (this.barcode == "") {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忚揣浣嶇紪鍙�",
+ type: 'error'
+ })
+ return;
+ }
+ if (this.materSn.length == 0) {
+ this.$refs.uToast.show({
+ title: "璇疯緭鍏ュ疄鐩樻暟閲�",
+ type: 'error'
+ })
+ return;
+ }
- // 鏂板浜屾纭閫昏緫
- uni.showModal({
- title: '纭鐩樼偣',
- content: '鎮ㄧ‘瀹氳鎻愪氦鐩樼偣淇℃伅鍚楋紵',
- success: (res) => {
- if (res.confirm) {
- // 鐢ㄦ埛鐐瑰嚮纭畾锛屾墽琛屽師鏈夌殑鎻愪氦閫昏緫
- this.$u.post('/api/DeliveryOrder/CheckFinish', {
- MainData: {
- "locationCode": this.barcode,
- "taskId": this.taskId,
- "qty": this.materSn,
- },
- }).then(res => {
- this.Testcheck = false;
- if (res.status) {
- this.$refs.uToast.show({
- title: "鐩樼偣鎴愬姛",
- type: "success"
- })
- this.barcode = "";
-
- // 鍏抽敭淇敼锛氫娇鐢� getCurrentPages 鑾峰彇鍓嶄竴涓〉闈㈠苟鐩存帴璋冪敤鍏舵柟娉�
- const pages = getCurrentPages();
- const prevPage = pages[pages.length - 2]; // 鑾峰彇涓婁竴涓〉闈㈠疄渚�
- console.log('鍓嶄竴涓〉闈�:', prevPage);
-
- if (prevPage && prevPage.refreshData) {
- // 鐩存帴璋冪敤涓婁竴涓〉闈㈢殑鍒锋柊鏂规硶
- prevPage.refreshData();
- console.log('宸茶皟鐢ㄥ墠涓�涓〉闈㈢殑鐩樼偣鍒锋柊鏂规硶');
- }
-
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 300);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鍋氫换浣曟搷浣�
- }
- }
- });
-}
-
+ // 鏂板浜屾纭閫昏緫
+ uni.showModal({
+ title: '纭鐩樼偣',
+ content: '鎮ㄧ‘瀹氳鎻愪氦鐩樼偣淇℃伅鍚楋紵',
+ success: (res) => {
+ if (res.confirm) {
+ // 鏄剧ず鍔犺浇涓�
+ uni.showLoading({
+ title: '鎻愪氦涓�...',
+ mask: true
+ });
+
+ this.$u.post('/api/DeliveryOrder/CheckFinish', {
+ MainData: {
+ "locationCode": this.barcode,
+ "taskId": this.taskId,
+ "qty": this.materSn,
+ },
+ }).then(res => {
+ uni.hideLoading();
+
+ this.Testcheck = false;
+ if (res.status) {
+ this.$refs.uToast.show({
+ title: "鐩樼偣鎴愬姛",
+ type: "success"
+ })
+
+ // 鎵嬪姩娓呯┖鎵�鏈夎緭鍏ユ暟鎹�
+ this.materialCode = "";
+ this.materialCodeValid = false;
+ this.barcode = "";
+ this.materSn = "";
+ this.step = 1; // 閲嶇疆姝ラ鍒扮涓�姝�
+
+ // 璁剧疆鐩樼偣涓撶敤鐨勫埛鏂版爣璁�
+ uni.setStorageSync('needRefreshCheck', true);
+
+ // 寤惰繜杩斿洖锛岃B椤甸潰鍒锋柊鏁版嵁
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 500);
+
+ // 浣跨敤 $nextTick 纭繚鐒︾偣璁剧疆鍦� DOM 鏇存柊鍚庢墽琛�
+ this.$nextTick(() => {
+ // 纭繚鐗╂枡缂栫爜杈撳叆妗嗚幏寰楃劍鐐�
+ this.$refs.materialInput.focus();
+ });
+
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error"
+ })
+ }
+ }).catch(err => {
+ uni.hideLoading();
+ this.$refs.uToast.show({
+ title: "璇锋眰澶辫触锛岃閲嶈瘯",
+ type: "error"
+ });
+ });
+ }
+ }
+ });
+ }
}
}
</script>
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
index 993fad8..53f556f 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/CheckoutorderDetail.vue"
@@ -53,7 +53,9 @@
pageNo: 1,
scrollTop: 0,
checkTask: false,
- warehouseId: ""
+ warehouseId: "",
+ hasDataLoaded: false, // 鏁版嵁鏄惁宸插姞杞借繃
+ shouldRefreshFromC: false, // 浠嶤椤甸潰杩斿洖鏃堕渶瑕佸埛鏂扮殑鏍囧織
}
},
// 娣诲姞杩欎釜鐢熷懡鍛ㄦ湡
@@ -64,7 +66,9 @@
onLoad(res) {
this.warehouseId = res.warehouseId;
this.orderNo = res.orderNo;
- this.allReceivingOrders = res.detail;
+ if(res.detail&&res.detail.length>0){
+ this.allReceivingOrders = res.detail;
+ }
this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
// this.getData();
},
@@ -76,26 +80,35 @@
}
},
onShow() {
- // this.checkTask = uni.getStorageSync('checkTask');
- // if (this.checkTask) {
- // uni.removeStorageSync('checkTask');
- this.pageNo = 1;
- this.allReceivingOrders = [];
- // 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
- this.getData();
- // }
+ // 妫�鏌ユ槸鍚﹂渶瑕佸埛鏂�
+ const needRefresh = uni.getStorageSync('needRefreshCheck');
+ if (needRefresh) {
+ uni.removeStorageSync('needRefreshCheck');
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
+ this.getData();
+ return;
+ }
+
+ // 濡傛灉杩樻病鏈夊姞杞借繃鏁版嵁锛屽姞杞芥暟鎹�
+ if (!this.hasDataLoaded) {
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
+ this.getData();
+ this.hasDataLoaded = true;
+ }
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
},
methods: {
- // 娣诲姞鍒锋柊鏂规硶渚涘叾浠栭〉闈㈣皟鐢�
- refreshData() {
- console.log('鏀跺埌鐩樼偣鍒锋柊璇锋眰');
- this.pageNo = 1;
- this.allReceivingOrders = [];
- this.getData();
- },
+ // // 娣诲姞鍒锋柊鏂规硶渚涘叾浠栭〉闈㈣皟鐢�
+ // refreshData() {
+ // console.log('鏀跺埌鐩樼偣鍒锋柊璇锋眰');
+ // this.pageNo = 1;
+ // this.allReceivingOrders = [];
+ // this.getData();
+ // },
search(res) {
this.pageNo = 1;
this.getData();
@@ -103,66 +116,64 @@
groupClick() {
},
-
-
- getData() {
- var postData = {
- MainData: {
- warehouseId: this.warehouseId,
- locationCode: this.searchValue,
- orderNo: this.orderNo,
- pageNo: this.pageNo,
- isCheck: true,
- },
- }
-
- // 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
- if (this.pageNo === 1 || this.searchValue !== '') {
- this.allReceivingOrders = [];
- this.status = "more";
- }
-
- this.$u.post('/api/DeliveryOrder/CheckOutTasks', postData).then((res) => {
- if (res.status) {
- if (res.data && res.data.length > 0) {
- // 杩藉姞鏁版嵁鑰屼笉鏄浛鎹�
- this.allReceivingOrders = [...this.allReceivingOrders, ...res.data];
-
- // 濡傛灉杩斿洖鐨勬暟鎹皯浜�5鏉★紝璇存槑娌℃湁鏇村鏁版嵁浜�
- if (res.data.length < 5) {
- this.status = 'noMore';
- } else {
- this.status = 'more';
- }
-
- // 鎺у埗鍔犺浇鎻愮ず鏄剧ず
- this.loadVisible = this.allReceivingOrders.length > 0;
-
- } else {
- // 娌℃湁鏁版嵁
- this.status = 'noMore';
- this.loadVisible = this.allReceivingOrders.length > 0;
-
- // 濡傛灉鏄涓�椤典笖娌℃湁鏁版嵁锛屾樉绀虹┖鐘舵��
- if (this.pageNo === 1) {
- this.allReceivingOrders = [];
- }
-
- // 鐩樼偣瀹屾垚鎻愮ず閫昏緫
- if (this.allReceivingOrders.length < 1) {
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 300);
- }
- }
- }
- }).catch(err => {
- console.error('璇锋眰澶辫触:', err);
- this.status = 'noMore';
- })
-}
+ getData() {
+ var postData = {
+ MainData: {
+ warehouseId: this.warehouseId,
+ locationCode: this.searchValue,
+ orderNo: this.orderNo,
+ pageNo: this.pageNo,
+ isCheck: true,
+ },
+ }
+
+ // 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
+ if (this.pageNo === 1 || this.searchValue !== '') {
+ this.allReceivingOrders = [];
+ this.status = "more";
+ }
+
+ this.$u.post('/api/DeliveryOrder/CheckOutTasks', postData).then((res) => {
+ if (res.status) {
+ if (res.data && res.data.length > 0) {
+ // 杩藉姞鏁版嵁鑰屼笉鏄浛鎹�
+ this.allReceivingOrders = [...this.allReceivingOrders, ...res.data];
+
+ // 濡傛灉杩斿洖鐨勬暟鎹皯浜�5鏉★紝璇存槑娌℃湁鏇村鏁版嵁浜�
+ if (res.data.length < 5) {
+ this.status = 'noMore';
+ } else {
+ this.status = 'more';
+ }
+
+ // 鎺у埗鍔犺浇鎻愮ず鏄剧ず
+ this.loadVisible = this.allReceivingOrders.length > 0;
+
+ } else {
+ // 娌℃湁鏁版嵁
+ this.status = 'noMore';
+ this.loadVisible = this.allReceivingOrders.length > 0;
+
+ // 濡傛灉鏄涓�椤典笖娌℃湁鏁版嵁锛屾樉绀虹┖鐘舵��
+ if (this.pageNo === 1) {
+ this.allReceivingOrders = [];
+ }
+
+ // 鐩存帴杩斿洖A椤甸潰锛屼笉闇�瑕佹彁绀�
+ if (this.allReceivingOrders.length === 0 && this.pageNo === 1) {
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1 // 杩斿洖A椤甸潰
+ });
+ }, 300);
+ }
+ }
+ }
+ }).catch(err => {
+ console.error('璇锋眰澶辫触:', err);
+ this.status = 'noMore';
+ })
+ }
}
}
</script>
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
index 3734c0d..61edcd2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
@@ -1,237 +1,305 @@
<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.order_no)" link :to="page+item.order_no"
- v-for="item in allReceivingOrders" :key="item.order_no">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view
- style="line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
- 鍏ュ簱鍗曞彿 {{item.order_no}}
- </view>
- <view
- style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
- 渚涘簲鍟嗗悕绉� {{item.supplier_name}}
- </view>
- <view
- style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
- 鍒涘缓鏃ユ湡 {{item.createDate}}
- </view>
- <view style="margin-top: 10rpx;display: flex;align-items: center; ">
- <view
- style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 238rpx;height: 40rpx;font-size: 22rpx;background-color:rgba(22,127,247,0.18);color: #1F63FF;">
- 璁㈠崟鐘舵�� {{item.odrderStatus}}
- </view>
- <view
- style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
- 鎬婚噺 {{item.SumQty}}
- </view>
- <view
- style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
- 宸插叆 {{item.OverQty}}
- </view>
- </view>
- </uni-group>
- </template>
- </uni-list-item>
+ <view>
+ <u-sticky>
+ <view style="background-color: #ffffff">
+ <uni-search-bar
+ @confirm="search"
+ v-model="searchValue"
+ ></uni-search-bar>
+ </view>
+ </u-sticky>
+ <uni-list :border="true">
+ <uni-list-item
+ direction="column"
+ clickable
+ @click="groupClick(item.order_no)"
+ link
+ :to="page + item.order_no"
+ v-for="item in allReceivingOrders"
+ :key="item.order_no"
+ >
+ <template v-slot:body>
+ <uni-group margin-top="20">
+ <view
+ style="
+ line-height: 17px;
+ color: #596671;
+ font-size: 14px;
+ text-align: center;
+ display: flex;
+ justify-content: space-between;
+ "
+ >
+ 鍏ュ簱鍗曞彿 {{ item.order_no }}
+ </view>
+ <view
+ style="
+ margin-top: 10rpx;
+ line-height: 17px;
+ color: #596671;
+ font-size: 14px;
+ text-align: center;
+ display: flex;
+ justify-content: space-between;
+ "
+ >
+ 渚涘簲鍟嗗悕绉� {{ item.supplier_name }}
+ </view>
+ <view
+ style="
+ margin-top: 10rpx;
+ line-height: 17px;
+ color: #596671;
+ font-size: 14px;
+ text-align: center;
+ display: flex;
+ justify-content: space-between;
+ "
+ >
+ 鍒涘缓鏃ユ湡 {{ item.createDate }}
+ </view>
+ <view style="margin-top: 10rpx; display: flex; align-items: center">
+ <view
+ style="
+ text-align: center;
+ line-height: 40rpx;
+ border-radius: 8rpx;
+ width: 238rpx;
+ height: 40rpx;
+ font-size: 22rpx;
+ background-color: rgba(22, 127, 247, 0.18);
+ color: #1f63ff;
+ "
+ >
+ 璁㈠崟鐘舵�� {{ item.odrderStatus }}
+ </view>
+ <view
+ style="
+ text-align: center;
+ line-height: 40rpx;
+ border-radius: 8rpx;
+ width: 158rpx;
+ height: 40rpx;
+ font-size: 22rpx;
+ color: #f56c6c;
+ "
+ >
+ 鎬婚噺 {{ item.SumQty }}
+ </view>
+ <view
+ style="
+ text-align: center;
+ line-height: 40rpx;
+ border-radius: 8rpx;
+ width: 158rpx;
+ height: 40rpx;
+ font-size: 22rpx;
+ color: #f56c6c;
+ "
+ >
+ 宸插叆 {{ item.OverQty }}
+ </view>
+ </view>
+ </uni-group>
+ </template>
+ </uni-list-item>
+ </uni-list>
+ <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
+ <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
+ </view>
</template>
<script>
- import {
- InboundOrderStatus
- } from '../../common/config.js'
- export default {
- data() {
- return {
- page: "/pages/stash/inboundorderDetail?",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0,
- warehouseId: "",
- isLoaded: false
- }
- },
- onLoad(res) {
- this.warehouseId = res.warehouseId;
- this.page = this.page + "warehouseId=" + this.warehouseId + "&orderNo=";
- this.getData();
- },
- onReachBottom() {
- if (this.status === 'more') {
- this.pageNo += 1;
- this.getData();
- this.isLoaded = true;
- }
- },
- onShow() {
- this.isLoaded = uni.getStorageSync('isLoaded');
- if (this.isLoaded) {
- uni.removeStorageSync('isLoaded');
- this.pageNo = 1;
- this.allReceivingOrders = [];
- // 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
- this.getData();
- }
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- methods: {
- search(res) {
- this.pageNo = 1;
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- warehouseId: this.warehouseId,
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
-
- // 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
- if (this.pageNo === 1 || this.searchValue !== '') {
- this.allReceivingOrders = [];
- this.status = "more";
- }
-
- this.$u.post('/api/CabinOrder/GetCabinOrders', postData).then((res) => {
- if (res.status) {
- if (res.data && res.data.length > 0) {
- const newData = res.data.map(i => ({
- ...i,
- InboundOrderStatus: i.odrderStatus.label,
- SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
- OverQty: i.details.map(item => item.order_Inqty).reduce((prev, next) => prev + next, 0)
- }));
-
- // 鍏抽敭淇敼锛氳拷鍔犳暟鎹�屼笉鏄浛鎹�
- this.allReceivingOrders = [...this.allReceivingOrders, ...newData];
-
- // 濡傛灉杩斿洖鐨勬暟鎹皯浜�5鏉★紝璇存槑娌℃湁鏇村鏁版嵁浜�
- if (res.data.length < 5) {
- this.status = 'noMore';
- } else {
- this.status = 'more';
- }
-
- // 鎺у埗鍔犺浇鎻愮ず鏄剧ず
- this.loadVisible = this.allReceivingOrders.length > 0;
-
- } else {
- // 娌℃湁鏁版嵁
- this.status = 'noMore';
- this.loadVisible = this.allReceivingOrders.length > 0;
-
- // 濡傛灉鏄涓�椤典笖娌℃湁鏁版嵁锛屾樉绀虹┖鐘舵��
- if (this.pageNo === 1) {
- this.allReceivingOrders = [];
- }
- }
+import { InboundOrderStatus } from "../../common/config.js";
+export default {
+ data() {
+ return {
+ page: "/pages/stash/inboundorderDetail?",
+ loadVisible: false,
+ searchValue: "",
+ status: "more",
+ allReceivingOrders: [],
+ pageNo: 1,
+ scrollTop: 0,
+ warehouseId: "",
+ isLoaded: false,
+ };
+ },
+ onLoad(res) {
+ this.warehouseId = res.warehouseId;
+ this.page = this.page + "warehouseId=" + this.warehouseId + "&orderNo=";
+ this.getData();
+ },
+ onReachBottom() {
+ if (this.status === "more") {
+ this.pageNo += 1;
+ this.getData();
+ this.isLoaded = true;
}
- }).catch(err => {
- console.error('璇锋眰澶辫触:', err);
- this.status = 'noMore';
- })
-}
- }
- }
+ },
+ onShow() {
+ this.isLoaded = uni.getStorageSync("isLoaded");
+ if (this.isLoaded) {
+ uni.removeStorageSync("isLoaded");
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
+ // 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+ this.getData();
+ }
+ },
+ onPageScroll(e) {
+ this.scrollTop = e.scrollTop;
+ },
+ methods: {
+ search(res) {
+ this.pageNo = 1;
+ this.getData();
+ },
+ groupClick() {},
+ getData() {
+ var postData = {
+ MainData: {
+ warehouseId: this.warehouseId,
+ orderNo: this.searchValue,
+ pageNo: this.pageNo,
+ },
+ };
+
+ // 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
+ if (this.pageNo === 1 || this.searchValue !== "") {
+ this.allReceivingOrders = [];
+ this.status = "more";
+ }
+
+ this.$u
+ .post("/api/CabinOrder/GetCabinOrders", postData)
+ .then((res) => {
+ if (res.status) {
+ if (res.data && res.data.length > 0) {
+ const newData = res.data.map((i) => ({
+ ...i,
+ InboundOrderStatus: i.odrderStatus.label,
+ SumQty: i.details
+ .map((item) => item.order_qty)
+ .reduce((prev, next) => prev + next, 0),
+ OverQty: i.details
+ .map((item) => item.order_Inqty)
+ .reduce((prev, next) => prev + next, 0),
+ }));
+
+ // 鍏抽敭淇敼锛氳拷鍔犳暟鎹�屼笉鏄浛鎹�
+ this.allReceivingOrders = [
+ ...this.allReceivingOrders,
+ ...newData,
+ ];
+
+ // 濡傛灉杩斿洖鐨勬暟鎹皯浜�5鏉★紝璇存槑娌℃湁鏇村鏁版嵁浜�
+ if (res.data.length < 5) {
+ this.status = "noMore";
+ } else {
+ this.status = "more";
+ }
+
+ // 鎺у埗鍔犺浇鎻愮ず鏄剧ず
+ this.loadVisible = this.allReceivingOrders.length > 0;
+ } else {
+ // 娌℃湁鏁版嵁
+ this.status = "noMore";
+ this.loadVisible = this.allReceivingOrders.length > 0;
+
+ // 濡傛灉鏄涓�椤典笖娌℃湁鏁版嵁锛屾樉绀虹┖鐘舵��
+ if (this.pageNo === 1) {
+ this.allReceivingOrders = [];
+ }
+ }
+ }
+ })
+ .catch((err) => {
+ console.error("璇锋眰澶辫触:", err);
+ this.status = "noMore";
+ });
+ },
+ },
+};
</script>
<style lang="scss">
- @import '@/common/uni-ui.scss';
+@import "@/common/uni-ui.scss";
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
+page {
+ display: flex;
+ flex-direction: column;
+ box-sizing: border-box;
+ background-color: #efeff4;
+ min-height: 100%;
+ height: auto;
+}
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
+.tips {
+ color: #67c23a;
+ font-size: 14px;
+ line-height: 40px;
+ text-align: center;
+ background-color: #f0f9eb;
+ height: 0;
+ opacity: 0;
+ transform: translateY(-100%);
+ transition: all 0.3s;
+}
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
+.tips-ani {
+ transform: translateY(0);
+ height: 40px;
+ opacity: 1;
+}
- .content {
- width: 100%;
- display: flex;
- }
+.content {
+ width: 100%;
+ display: flex;
+}
- .list-picture {
- width: 100%;
- height: 145px;
- }
+.list-picture {
+ width: 100%;
+ height: 145px;
+}
- .thumb-image {
- width: 100%;
- height: 100%;
- }
+.thumb-image {
+ width: 100%;
+ height: 100%;
+}
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
+.ellipsis {
+ display: flex;
+ overflow: hidden;
+}
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
+.uni-ellipsis-1 {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
+.uni-ellipsis-2 {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+}
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
+.customcss {
+ display: flex;
+ position: fixed;
+ width: 100%;
+ top: 10px;
+ text-align: center;
+ z-index: 999;
+ left: 30px;
+ height: 20%;
+}
- .footer {
- padding-top: 50%;
- }
+.footer {
+ padding-top: 50%;
+}
</style>
\ No newline at end of file
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outFinish.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outFinish.vue"
index 7a4b864..f80184f 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outFinish.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outFinish.vue"
@@ -16,8 +16,14 @@
</uni-forms-item>
<uni-forms-item :label="order_qty">
</uni-forms-item>
+ <uni-forms-item label="寰呮壂鐗╂枡缂栫爜:">
+ <uni-easyinput type="text" placeholder="璇锋壂鎻忕墿鏂欑紪鐮�" ref='materialInput'
+ :focus="step === 1" v-model="materialCode"
+ @confirm="materialCodeInput"
+ @blur="materialCodeInput" />
+ </uni-forms-item>
<uni-forms-item label="搴撲綅缂栧彿:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓簱浣嶇紪鍙�" ref='midInput' :focus="!focus"
+ <uni-easyinput type="text" placeholder="璇锋壂鎻忓簱浣嶇紪鍙�" ref='midInput' :focus="focus"
v-model="barcode" @confirm="barcodeInput" />
</uni-forms-item>
<!-- <uni-forms-item label="鍑哄簱鏁伴噺:">
@@ -37,7 +43,7 @@
<view style="display: flex;justify-content: space-around;margin-top: 2%;">
<!-- <button @click="reset" type="default" size="default"
style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button> -->
- <button @click="submit" type="primary" size="default" style="width: 200rpx;">纭鍑哄簱</button>
+ <button @click="submit" type="primary" size="default" style="width: 250rpx;">纭鍑哄簱</button>
</view>
</uni-forms-item>
</uni-forms>
@@ -126,449 +132,541 @@
</template>
<script>
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['鍑哄簱'], //, '瑙ｇ洏''缁勭洏', , '鍗曟嵁淇℃伅'
- current: 0,
- taskId:"",
- matTotal: [],
- matInfos: [],
- orderNo: "",
- batchNo:"",
- orderqty:"",
- Inqty:"",
- goods_no:"",
- batch_num:"",
- order_qty:"",
- order_Inqty:"",
- label: "",
- orderInfo: [],
- focus: false,
- pkfocus: false,
- barcode: "",
- materSn: "",
- Initiallife: 1000,
- sns: [],
- pksns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true,
- value: "",
- matInfo: [],
- value2: "",
- matTotals: [],
- warehouseId: "",
- Test: false,
- Testlabel: "",
- Testplaceholder: "",
- Testcheck: false,
- pkmaterSn: "",
- pkmatInfos: [],
- addressdisabled: false
- }
- },
- onShow() {},
- onLoad(res) {
- this.focus = false;
- this.addressFocus = false;
- this.orderNo = res.orderNo;
- this.taskId=res.taskId;
- this.Inqty=res.order_Inqty;
- this.orderqty=res.order_qty;
- this.batchNo=res.batchNo;
- this.warehouseId = res.warehouseId;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.batch_num="鎵规鍙凤細"+res.batchNo;
- this.order_qty="鍑哄簱鏁伴噺锛�"+res.stockQuantity;
- this.order_Inqty="鐗╂枡鍚嶇О锛�"+res.materielName;
- this.goods_no="鐗╂枡缂栧彿锛�"+res.materielCode;
- // this.getData();
- },
- methods: {
- // voiceSpeech(src) {
- // innerAudioContext.src = src; // '../../static/success.mp3';
- // innerAudioContext.play();
- // },
- updateFocus() {
- debugger
- this.$nextTick(() => {
- this.materSn = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- barcodeFocus() {
- debugger
- this.barcode = '';
- if (this.focus) {
- this.focus = false;
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/InboundOrderDetail/GetInboundOrderDetails', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 2) {
- this.getData();
- }
- }
- },
- barcodeInput() {
- this.$nextTick(function(x) {
- if (this.barcode.length > 0) {
- // if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
- this.focus = true;
- // } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
- // type: "error"
- // })
- // }
- }
- })
- },
- snInput() {
- this.$nextTick(() => {
- if (this.materSn != "") {
- this.focus = false;
- var matSn = this.materSn;
- if (this.warehouseId == 11) {
- matSn = matSn.replace(/,SC.*/, '');
- }
- //鏌ヨmatSn鏄惁瀛樺湪瀛楃
- if(matSn.indexOf("POHA")>0){
- this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
- this.Testcheck = false;
- if (res.status) {
- this.sns.push(res.data.serialNumber);
-
- this.matInfos.push(res.data);
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- return;
- }
- // setTimeout(() => {
- // this.voiceSpeech('../../static/success.mp3');
- // }, 100);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- }
- })
- }
- setTimeout(() => {
- this.materSn = "";
- }, 100);
- }
- })
- },
- pksnInput() {
- this.$nextTick(() => {
- if (this.pkmaterSn != "") {
-
- var matSn = this.pkmaterSn;
-
- if(matSn.indexOf("POHA")>0){
- this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
- if (res.status) {
- this.pksns.push(res.data.serialNumber);
- this.pkmatInfos.push(res.data);
- if (!res.status) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- return;
- }
- // setTimeout(() => {
- // this.voiceSpeech('../../static/success.mp3');
- // }, 100);
- return;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- }
- })
- }
- setTimeout(() => {
- this.pkmaterSn = "";
- }, 100);
- }
- })
- },
- inbound() {
- if (this.inboundBarcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: "error"
- })
- return;
- }
- if (this.address == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address,
- "warehouseId": this.warehouseId
- }
- }
- this.$u.post('/api/Task/RequestInboundTask', postData).then(res => {
- if (res.status) {
- this.inboundBarcode = "";
- if (this.warehouseId != 5) this.address = "";
- setTimeout(() => {
- this.addressFocus = false;
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- })
- }, 200);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- deleteList(res) {
- this.matInfos.splice(res, 1);
- this.sns.splice(res, 1);
- },
- pkdeleteList(res) {
- this.pkmatInfos.splice(res, 1);
- this.pksns.splice(res, 1);
- },
- reset() {
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.materSn = "";
- if (this.warehouseId = !6) {
- this.Initiallife = 0;
- }
- },
- resetInPk() {
- this.pkmaterSn = "";
- this.pkfocus = false;
- this.pkmatInfos = [];
- this.pksns = [];
- },
- pksubmit() {
- if (this.pkmatInfos.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- this.$u.post('/api/DeliveryOrder/FeedbackOut?warehouseId=' + this.warehouseId + "&orderNo=" + this.orderNo, this
- .pksns).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- })
- this.pkfocus = false;
- this.pkmatInfos = [];
- this.pksns = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
+const innerAudioContext = uni.createInnerAudioContext();
+export default {
+ data() {
+ return {
+ items: ["鍑哄簱"], //, '瑙ｇ洏''缁勭洏', , '鍗曟嵁淇℃伅'
+ current: 0,
+ taskId: "",
+ matTotal: [],
+ matInfos: [],
+ orderNo: "",
+ batchNo: "",
+ orderqty: "",
+ Inqty: "",
+ goods_no: "",
+ batch_num: "",
+ order_qty: "",
+ order_Inqty: "",
+ label: "",
+ orderInfo: [],
+ focus: false,
+ pkfocus: false,
+ barcode: "",
+ materSn: "",
+ Initiallife: 1000,
+ sns: [],
+ pksns: [],
+ addressFocus: false,
+ inboundBarcode: "",
+ address: "",
+ check: true,
+ value: "",
+ matInfo: [],
+ value2: "",
+ matTotals: [],
+ warehouseId: "",
+ Test: false,
+ Testlabel: "",
+ Testplaceholder: "",
+ Testcheck: false,
+ pkmaterSn: "",
+ pkmatInfos: [],
+ addressdisabled: false,
+ materialCode: "", // 鏂板锛氭壂鎻忕殑鐗╂枡缂栫爜
+ materialCodeValid: false, // 鏂板锛氱墿鏂欑紪鐮侀獙璇佺姸鎬�
+ step: 1, // 鏂板锛�1-鐗╂枡缂栫爜锛�2-搴撲綅缂栧彿锛�
+ };
+ },
+ onShow() {},
+ onLoad(res) {
+ this.focus = false;
+ this.addressFocus = false;
+ this.orderNo = res.orderNo;
+ this.taskId = res.taskId;
+ this.Inqty = res.order_Inqty;
+ this.orderqty = res.order_qty;
+ this.batchNo = res.batchNo;
+ this.warehouseId = res.warehouseId;
+ this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
+ this.batch_num = "鎵规鍙凤細" + res.batchNo;
+ this.order_qty = "鍑哄簱鏁伴噺锛�" + res.stockQuantity;
+ this.order_Inqty = "鐗╂枡鍚嶇О锛�" + res.materielName;
+ this.goods_no = "鐗╂枡缂栧彿锛�" + res.materielCode;
+ this.materielCode = res.materielCode; // 璁剧疆鐢ㄤ簬楠岃瘉鐨勭墿鏂欑紪鐮�
+ // this.getData();
+ },
+ methods: {
+ // voiceSpeech(src) {
+ // innerAudioContext.src = src; // '../../static/success.mp3';
+ // innerAudioContext.play();
+ // },
-
-// submit() {
-// if (this.barcode == "") {
-// this.$refs.uToast.show({
-// title: "璇锋壂鎻忚揣浣嶇紪鍙�",
-// type: 'error'
-// })
-// return;
-// }
-
-// this.$u.post('/api/DeliveryOrder/OutFinish', {
-// MainData: {
-// "locationCode": this.barcode,
-// "taskId": this.taskId,
-// },
-// }).then(res => {
-// if (res.status) {
-// this.$refs.uToast.show({
-// title: "鍑哄簱鎴愬姛",
-// type: "success"
-// })
-// this.barcode = "";
-
-// // 鍏抽敭淇敼锛氫娇鐢� getCurrentPages 鑾峰彇鍓嶄竴涓〉闈㈠苟鐩存帴璋冪敤鍏舵柟娉�
-// const pages = getCurrentPages();
-// const prevPage = pages[pages.length - 2]; // 鑾峰彇涓婁竴涓〉闈㈠疄渚�
-
-// if (prevPage && prevPage.refreshData) {
-// // 鐩存帴璋冪敤涓婁竴涓〉闈㈢殑鍒锋柊鏂规硶
-// prevPage.refreshData();
-// }
-
-// setTimeout(() => {
-// uni.navigateBack({
-// delta: 1
-// });
-// }, 300);
-// } else {
-// this.$refs.uToast.show({
-// title: res.message,
-// type: "error"
-// })
-// }
-// })
-// }
+ // 鐗╂枡缂栫爜楠岃瘉
+ materialCodeInput() {
+ console.log("materialCodeInput 琚Е鍙�");
+ console.log("杈撳叆鍊�:", this.materialCode);
+ this.$nextTick(() => {
+ if (this.materialCode.trim() !== "") {
+ const scannedCode = this.materialCode.trim();
+ const expectedCode = this.materielCode;
+ console.log("鎵弿缂栫爜:", scannedCode);
+ console.log("鏈熸湜缂栫爜锛坢aterielCode锛�:", expectedCode);
+ if (scannedCode === expectedCode) {
+ this.materialCodeValid = true;
+ console.log("鉁� 鐗╂枡缂栫爜楠岃瘉鎴愬姛");
-submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忚揣浣嶇紪鍙�",
- type: 'error'
- })
- return;
- }
+ this.step = 2;
+ this.$refs.uToast.show({
+ title: "鐗╂枡缂栫爜楠岃瘉鎴愬姛",
+ type: "success",
+ });
+ this.$nextTick(() => {
+ this.$refs.midInput.focus();
+ });
+ } else {
+ this.materialCodeValid = false;
+ console.log("鉂� 鐗╂枡缂栫爜楠岃瘉澶辫触");
- // 鏂板浜屾纭閫昏緫
- uni.showModal({
- title: '纭鍑哄簱',
- content: '鎮ㄧ‘瀹氳鎻愪氦鍑哄簱淇℃伅鍚楋紵',
- success: (res) => {
- if (res.confirm) {
- // 鐢ㄦ埛鐐瑰嚮纭畾锛屾墽琛屽師鏈夌殑鎻愪氦閫昏緫
- this.$u.post('/api/DeliveryOrder/OutFinish', {
- MainData: {
- "locationCode": this.barcode,
- "taskId": this.taskId,
- },
- }).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- })
- this.barcode = "";
-
- // 鍏抽敭淇敼锛氫娇鐢� getCurrentPages 鑾峰彇鍓嶄竴涓〉闈㈠苟鐩存帴璋冪敤鍏舵柟娉�
- const pages = getCurrentPages();
- const prevPage = pages[pages.length - 2]; // 鑾峰彇涓婁竴涓〉闈㈠疄渚�
-
- if (prevPage && prevPage.refreshData) {
- // 鐩存帴璋冪敤涓婁竴涓〉闈㈢殑鍒锋柊鏂规硶
- prevPage.refreshData();
- }
-
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 300);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鍋氫换浣曟搷浣�
- }
+ this.$refs.uToast.show({
+ title: `鐗╂枡缂栫爜涓嶅尮閰峘,
+ type: "error",
+ });
+
+ setTimeout(() => {
+ this.materialCode = "";
+ this.step = 1;
+ this.$nextTick(() => {
+ this.$refs.materialInput.focus();
+ });
+ }, 500);
+ }
}
- });
-}
+ });
+ },
+ updateFocus() {
+ debugger;
+ this.$nextTick(() => {
+ this.materSn = "";
+ if (!this.focus) {
+ this.focus = true;
+ }
+ });
+ },
+ barcodeFocus() {
+ debugger;
+ this.barcode = "";
+ if (this.focus) {
+ this.focus = false;
+ }
+ },
+ getData() {
+ var postData = {
+ MainData: {
+ orderNo: this.orderNo,
+ },
+ };
+ this.$u
+ .post("/api/InboundOrderDetail/GetInboundOrderDetails", postData)
+ .then((res) => {
+ if (res.status) {
+ this.orderInfo = res.data;
+ if (this.orderInfo.length > 3) {
+ this.loadVisible = true;
+ }
+ }
+ });
+ },
+ onClickItem(e) {
+ this.focus = false;
+ this.addressFocus = false;
+ if (this.current !== e.currentIndex) {
+ this.current = e.currentIndex;
+ if (this.current == 2) {
+ this.getData();
+ }
+ }
+ },
+ // barcodeInput() {
+ // this.$nextTick(function (x) {
+ // if (this.barcode.length > 0) {
+ // // if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
+ // this.focus = true;
+ // // } else {
+ // // this.$refs.uToast.show({
+ // // title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
+ // // type: "error"
+ // // })
+ // // }
+ // }
+ // });
+ // },
+ barcodeInput() {
+ this.$nextTick(() => {
+ if (this.barcode.length > 0) {
+ this.$refs.uToast.show({
+ title: "搴撲綅缂栧彿鎵弿鎴愬姛",
+ type: "success",
+ });
+ setTimeout(() => {
+ this.$nextTick(() => {
+ this.$refs.midInput.focus();
+ });
+ }, 100);
+ }
+ });
+ },
+ snInput() {
+ this.$nextTick(() => {
+ if (this.materSn != "") {
+ this.focus = false;
+ var matSn = this.materSn;
+ if (this.warehouseId == 11) {
+ matSn = matSn.replace(/,SC.*/, "");
+ }
+ //鏌ヨmatSn鏄惁瀛樺湪瀛楃
+ if (matSn.indexOf("POHA") > 0) {
+ this.$u
+ .post("/api/MaterielInfo/CodeAnalysis?serNum=" + matSn, {})
+ .then((res) => {
+ this.Testcheck = false;
+ if (res.status) {
+ this.sns.push(res.data.serialNumber);
- }
- }
+ this.matInfos.push(res.data);
+ if (res.message) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ return;
+ }
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/success.mp3');
+ // }, 100);
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ }
+ });
+ }
+ setTimeout(() => {
+ this.materSn = "";
+ }, 100);
+ }
+ });
+ },
+ pksnInput() {
+ this.$nextTick(() => {
+ if (this.pkmaterSn != "") {
+ var matSn = this.pkmaterSn;
+
+ if (matSn.indexOf("POHA") > 0) {
+ this.$u
+ .post("/api/MaterielInfo/CodeAnalysis?serNum=" + matSn, {})
+ .then((res) => {
+ if (res.status) {
+ this.pksns.push(res.data.serialNumber);
+ this.pkmatInfos.push(res.data);
+ if (!res.status) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ return;
+ }
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/success.mp3');
+ // }, 100);
+ return;
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ }
+ });
+ }
+ setTimeout(() => {
+ this.pkmaterSn = "";
+ }, 100);
+ }
+ });
+ },
+ inbound() {
+ if (this.inboundBarcode == "") {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忔墭鐩樻潯鐮�",
+ type: "error",
+ });
+ return;
+ }
+ if (this.address == "") {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忓湴鍧�鏉＄爜",
+ type: "error",
+ });
+ return;
+ }
+ var postData = {
+ MainData: {
+ barcode: this.inboundBarcode,
+ startPoint: this.address,
+ warehouseId: this.warehouseId,
+ },
+ };
+ this.$u
+ .post("/api/Task/RequestInboundTask", postData)
+ .then((res) => {
+ if (res.status) {
+ this.inboundBarcode = "";
+ if (this.warehouseId != 5) this.address = "";
+ setTimeout(() => {
+ this.addressFocus = false;
+ this.$refs.uToast.show({
+ title: "鎴愬姛",
+ type: "success",
+ });
+ }, 200);
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ }
+ })
+ .catch((err) => {
+ this.$refs.uToast.show({
+ title: err.message,
+ type: "error",
+ });
+ });
+ },
+ inputChangebarcode() {
+ this.addressFocus = false;
+ this.$nextTick(function (x) {
+ if (this.inboundBarcode != "") {
+ this.addressFocus = true;
+ }
+ });
+ },
+ deleteList(res) {
+ this.matInfos.splice(res, 1);
+ this.sns.splice(res, 1);
+ },
+ pkdeleteList(res) {
+ this.pkmatInfos.splice(res, 1);
+ this.pksns.splice(res, 1);
+ },
+ reset() {
+ this.barcode = "";
+ this.matInfos = [];
+ this.sns = [];
+ this.materSn = "";
+ if ((this.warehouseId = !6)) {
+ this.Initiallife = 0;
+ }
+ },
+ resetInPk() {
+ this.pkmaterSn = "";
+ this.pkfocus = false;
+ this.pkmatInfos = [];
+ this.pksns = [];
+ },
+ pksubmit() {
+ if (this.pkmatInfos.length == 0) {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忓唴绠辨爣绛�",
+ type: "error",
+ });
+ return;
+ }
+ this.$u
+ .post(
+ "/api/DeliveryOrder/FeedbackOut?warehouseId=" +
+ this.warehouseId +
+ "&orderNo=" +
+ this.orderNo,
+ this.pksns
+ )
+ .then((res) => {
+ if (res.status) {
+ this.$refs.uToast.show({
+ title: "鍑哄簱鎴愬姛",
+ type: "success",
+ });
+ this.pkfocus = false;
+ this.pkmatInfos = [];
+ this.pksns = [];
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ }
+ });
+ },
+
+ // submit() {
+ // if (this.barcode == "") {
+ // this.$refs.uToast.show({
+ // title: "璇锋壂鎻忚揣浣嶇紪鍙�",
+ // type: 'error'
+ // })
+ // return;
+ // }
+
+ // this.$u.post('/api/DeliveryOrder/OutFinish', {
+ // MainData: {
+ // "locationCode": this.barcode,
+ // "taskId": this.taskId,
+ // },
+ // }).then(res => {
+ // if (res.status) {
+ // this.$refs.uToast.show({
+ // title: "鍑哄簱鎴愬姛",
+ // type: "success"
+ // })
+ // this.barcode = "";
+
+ // // 鍏抽敭淇敼锛氫娇鐢� getCurrentPages 鑾峰彇鍓嶄竴涓〉闈㈠苟鐩存帴璋冪敤鍏舵柟娉�
+ // const pages = getCurrentPages();
+ // const prevPage = pages[pages.length - 2]; // 鑾峰彇涓婁竴涓〉闈㈠疄渚�
+
+ // if (prevPage && prevPage.refreshData) {
+ // // 鐩存帴璋冪敤涓婁竴涓〉闈㈢殑鍒锋柊鏂规硶
+ // prevPage.refreshData();
+ // }
+
+ // setTimeout(() => {
+ // uni.navigateBack({
+ // delta: 1
+ // });
+ // }, 300);
+ // } else {
+ // this.$refs.uToast.show({
+ // title: res.message,
+ // type: "error"
+ // })
+ // }
+ // })
+ // }
+ submit() {
+ if (!this.materialCodeValid) {
+ this.$refs.uToast.show({
+ title: "璇峰厛鎵弿骞堕獙璇佺墿鏂欑紪鐮�",
+ type: "error",
+ });
+ return;
+ }
+ if (this.barcode == "") {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忚揣浣嶇紪鍙�",
+ type: "error",
+ });
+ return;
+ }
+
+ // 鏂板浜屾纭閫昏緫
+ uni.showModal({
+ title: "纭鍑哄簱",
+ content: "鎮ㄧ‘瀹氳鎻愪氦鍑哄簱淇℃伅鍚楋紵",
+ success: (res) => {
+ if (res.confirm) {
+ // 鏄剧ず鍔犺浇涓�
+ uni.showLoading({
+ title: '鎻愪氦涓�...',
+ mask: true
+ });
+
+ this.$u.post("/api/DeliveryOrder/OutFinish", {
+ MainData: {
+ locationCode: this.barcode,
+ taskId: this.taskId,
+ },
+ }).then((res) => {
+ uni.hideLoading();
+
+ if (res.status) {
+ this.$refs.uToast.show({
+ title: "鍑哄簱鎴愬姛",
+ type: "success",
+ });
+
+ // 娓呯┖杈撳叆妗�
+ this.barcode = "";
+ this.materialCode = "";
+ this.materialCodeValid = false;
+
+ // 璁剧疆鍒锋柊鏍囪
+ uni.setStorageSync('needRefreshOutbound', true);
+
+ // 寤惰繜杩斿洖
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 500);
+
+ } else {
+ this.$refs.uToast.show({
+ title: res.message || "鍑哄簱澶辫触",
+ type: "error",
+ });
+ }
+ }).catch(err => {
+ uni.hideLoading();
+ this.$refs.uToast.show({
+ title: "璇锋眰澶辫触锛岃閲嶈瘯",
+ type: "error",
+ });
+ });
+ }
+ },
+ });
+ }
+ },
+};
</script>
<style lang="scss">
- @import '@/common/uni-ui.scss';
+@import "@/common/uni-ui.scss";
- .content {
- display: flex;
- height: 150px;
- }
+.content {
+ display: flex;
+ height: 150px;
+}
- .content-text {
- font-size: 14px;
- color: #666;
- }
+.content-text {
+ font-size: 14px;
+ color: #666;
+}
- .itemstyle {
- margin-top: 30px;
- margin-left: 5%;
- }
+.itemstyle {
+ margin-top: 30px;
+ margin-left: 5%;
+}
- .headerstyle {
- width: 90%;
- }
+.headerstyle {
+ width: 90%;
+}
</style>
\ No newline at end of file
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
index 7888976..db54b65 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
@@ -46,15 +46,31 @@
pageNo: 1,
scrollTop: 0,
outTask: false,
- warehouseId: ""
+ warehouseId: "",
+ hasDataLoaded: false, // 鏁版嵁鏄惁宸插姞杞借繃
+ shouldRefreshFromC: false, // 鍏抽敭锛氫粠C椤甸潰杩斿洖鏃堕渶瑕佸埛鏂扮殑鏍囧織
}
},
onLoad(res) {
- this.warehouseId = res.warehouseId;
- this.orderNo = res.orderNo;
+ // 鐩戝惉鏉ヨ嚜C椤甸潰鐨勫埛鏂颁簨浠�
+ const eventChannel = this.getOpenerEventChannel();
+ if (eventChannel) {
+ eventChannel.on('refreshData', (data) => {
+ if (data.refresh) {
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
+ this.getData();
+ }
+ });
+ }
+
+ // 淇濆瓨浼犲叆鐨勫垵濮嬫暟鎹�
+ if (res.detail && res.detail.length > 0) {
this.allReceivingOrders = res.detail;
- this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
- // this.getData();
+ }
+ this.warehouseId = res.warehouseId;
+ this.orderNo = res.orderNo;
+ this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
},
onReachBottom() {
// 鍙湁鍦ㄨ繕鏈夋洿澶氭暟鎹椂鎵嶅姞杞戒笅涓�椤�
@@ -71,26 +87,35 @@
onShow() {
- // this.outTask = uni.getStorageSync('outTask');
- // if (this.outTask) {
- // uni.removeStorageSync('outTask');
+ // 妫�鏌ユ槸鍚﹂渶瑕佸埛鏂�
+ const needRefresh = uni.getStorageSync('needRefreshOutbound');
+ if (needRefresh) {
+ uni.removeStorageSync('needRefreshOutbound');
this.pageNo = 1;
this.allReceivingOrders = [];
- // 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
this.getData();
- // }
- },
+ return;
+ }
+
+ // 濡傛灉杩樻病鏈夊姞杞借繃鏁版嵁锛屽姞杞芥暟鎹�
+ if (!this.hasDataLoaded) {
+ this.pageNo = 1;
+ this.allReceivingOrders = [];
+ this.getData();
+ this.hasDataLoaded = true;
+ }
+ },
onPageScroll(e) {
this.scrollTop = e.scrollTop;
},
methods: {
// 娣诲姞鍒锋柊鏂规硶渚涘叾浠栭〉闈㈣皟鐢�
- refreshData() {
- console.log('鏀跺埌鍒锋柊璇锋眰');
- this.pageNo = 1;
- this.allReceivingOrders = [];
- this.getData();
- },
+ // refreshData() {
+ // console.log('鏀跺埌鍒锋柊璇锋眰');
+ // this.pageNo = 1;
+ // this.allReceivingOrders = [];
+ // this.getData();
+ // },
search(res) {
this.pageNo = 1;
this.getData();
@@ -138,64 +163,61 @@
// }
// })
// }
-getData() {
- var postData = {
- MainData: {
- warehouseId: this.warehouseId,
- locationCode: this.searchValue,
- orderNo: this.orderNo,
- pageNo: this.pageNo,
- isCheck: false,
- },
- }
-
- // 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
- if (this.pageNo === 1 || this.searchValue !== '') {
- this.allReceivingOrders = [];
- this.status = "more";
- }
-
- this.$u.post('/api/DeliveryOrder/CheckOutTasks', postData).then((res) => {
- if (res.status) {
- if (res.data && res.data.length > 0) {
- // 杩藉姞鏁版嵁鑰屼笉鏄浛鎹�
- this.allReceivingOrders = [...this.allReceivingOrders, ...res.data];
-
- // 濡傛灉杩斿洖鐨勬暟鎹皯浜�5鏉★紝璇存槑娌℃湁鏇村鏁版嵁浜�
- if (res.data.length < 5) {
- this.status = 'noMore';
- } else {
- this.status = 'more';
- }
-
- // 鎺у埗鍔犺浇鎻愮ず鏄剧ず
- this.loadVisible = this.allReceivingOrders.length > 0;
-
- } else {
- // 娌℃湁鏁版嵁
- this.status = 'noMore';
- this.loadVisible = this.allReceivingOrders.length > 0;
-
- // 濡傛灉鏄涓�椤典笖娌℃湁鏁版嵁锛屾樉绀虹┖鐘舵��
- if (this.pageNo === 1) {
- this.allReceivingOrders = [];
- }
-
- // 鍑哄簱瀹屾垚鎻愮ず閫昏緫
- if (this.allReceivingOrders.length < 1) {
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 300);
- }
- }
- }
- }).catch(err => {
- console.error('璇锋眰澶辫触:', err);
- this.status = 'noMore';
- })
-}
+ getData() {
+ var postData = {
+ MainData: {
+ warehouseId: this.warehouseId,
+ locationCode: this.searchValue,
+ orderNo: this.orderNo,
+ pageNo: this.pageNo,
+ isCheck: false,
+ },
+ }
+
+ // 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
+ if (this.pageNo === 1 || this.searchValue !== '') {
+ this.allReceivingOrders = [];
+ this.status = "more";
+ }
+
+ this.$u.post('/api/DeliveryOrder/CheckOutTasks', postData).then((res) => {
+ if (res.status) {
+ if (res.data && res.data.length > 0) {
+ // 杩藉姞鏁版嵁
+ this.allReceivingOrders = [...this.allReceivingOrders, ...res.data];
+
+ // 鍒嗛〉閫昏緫
+ if (res.data.length < 5) {
+ this.status = 'noMore';
+ } else {
+ this.status = 'more';
+ }
+
+ this.loadVisible = this.allReceivingOrders.length > 0;
+
+ } else {
+ this.status = 'noMore';
+ this.loadVisible = this.allReceivingOrders.length > 0;
+
+ if (this.pageNo === 1) {
+ this.allReceivingOrders = [];
+ }
+
+ // 鐩存帴杩斿洖A椤甸潰锛屼笉闇�瑕佹彁绀�
+ if (this.allReceivingOrders.length === 0 && this.pageNo === 1) {
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1 // 杩斿洖A椤甸潰
+ });
+ }, 300); // 绋嶅井寤惰繜涓�涓嬶紝璁╃敤鎴风湅鍒�"娌℃湁鏁版嵁"鐨勭姸鎬�
+ }
+ }
+ }
+ }).catch(err => {
+ console.error('璇锋眰澶辫触:', err);
+ this.status = 'noMore';
+ })
+ }
}
}
</script>
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
index 5f5d5e2..7b118bd 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
@@ -1,642 +1,869 @@
<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item :label="label">
- </uni-forms-item>
- <uni-forms-item :label="goods_no">
- </uni-forms-item>
- <uni-forms-item :label="batch_num">
- </uni-forms-item>
- <uni-forms-item :label="order_qty">
- </uni-forms-item>
- <uni-forms-item :label="order_Inqty">
- </uni-forms-item>
- <uni-forms-item label="搴撲綅缂栧彿:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓簱浣嶇紪鍙�" ref='midInput' :focus="!focus"
- v-model="barcode" @confirm="barcodeInput" />
- </uni-forms-item>
- <uni-forms-item label="鍏ュ簱鏁伴噺:">
- <uni-easyinput type="text" placeholder="璇疯緭鍏ュ叆搴撴暟閲�" ref='midInput' :focus="focus"
- v-model="materSn" @confirm="snInput" />
- </uni-forms-item>
+ <view>
+ <uni-segmented-control
+ :current="current"
+ :values="items"
+ @clickItem="onClickItem"
+ >
+ </uni-segmented-control>
+ <view class="content">
+ <view v-if="current === 0" class="headerstyle">
+ <view class="itemstyle">
+ <uni-forms label-width="180">
+ <uni-forms-item :label="label"> </uni-forms-item>
+ <uni-forms-item :label="goods_no"> </uni-forms-item>
+ <uni-forms-item :label="batch_num"> </uni-forms-item>
+ <uni-forms-item :label="order_qty"> </uni-forms-item>
+ <uni-forms-item :label="order_Inqty"> </uni-forms-item>
+ <uni-forms-item label="寰呮壂鐗╂枡缂栫爜:">
+ <uni-easyinput
+ type="text"
+ placeholder="璇锋壂鎻忕墿鏂欑紪鐮�"
+ ref="materialInput"
+ :focus="step === 1"
+ v-model="materialCode"
+ @confirm="materialCodeInput"
+ @blur="materialCodeInput"
+ />
+ </uni-forms-item>
+ <uni-forms-item label="搴撲綅缂栧彿:">
+ <uni-easyinput
+ type="text"
+ placeholder="璇锋壂鎻忓簱浣嶇紪鍙�"
+ ref="midInput"
+ :focus="step === 2"
+ v-model="barcode"
+ @confirm="barcodeInput"
+ />
+ </uni-forms-item>
+ <uni-forms-item label="鍏ュ簱鏁伴噺:">
+ <uni-easyinput
+ type="text"
+ placeholder="璇疯緭鍏ュ叆搴撴暟閲�"
+ ref="midInput"
+ :focus="step === 3"
+ v-model="materSn"
+ @confirm="snInput"
+ />
+ </uni-forms-item>
- <uni-forms-item :label="Testlabel" v-if="Test">
- <uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
- v-model="Initiallife" />
- </uni-forms-item>
-
- <!-- <uni-forms-item>
+ <uni-forms-item :label="Testlabel" v-if="Test">
+ <uni-easyinput
+ type="text"
+ :placeholder="Testplaceholder"
+ ref="midInput"
+ v-model="Initiallife"
+ />
+ </uni-forms-item>
+ <!-- <uni-forms-item>
<checkbox checked="check">鏄惁婊＄洏</checkbox>
</uni-forms-item> -->
- <uni-forms-item>
- <view style="display: flex;justify-content: space-around;margin-top: 2%;">
- <!-- <button @click="reset" type="default" size="default"
+ <uni-forms-item>
+ <view
+ style="
+ display: flex;
+ justify-content: space-around;
+ margin-top: 2%;
+ "
+ >
+ <!-- <button @click="reset" type="default" size="default"
style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button> -->
- <button @click="submit" type="primary" size="default"
- style="width: 200rpx;">纭鍏ュ簱</button>
- </view>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @confirm="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
- placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput' :focus="addressFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
- <view>鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
- <view>鐗╂枡瑙勬牸锛歿{item.materielSpec}}</view>
- <!-- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view> -->
- <view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity+item.unit}}</view>
- <view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item label="鍐呯鏍囩:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="!pkfocus"
- v-model="pkmaterSn" @confirm="pksnInput" />
- </uni-forms-item>
+ <button
+ @click="submit"
+ type="primary"
+ size="default"
+ style="width: 250rpx"
+ >
+ 纭鍏ュ簱
+ </button>
+ </view>
+ </uni-forms-item>
+ </uni-forms>
+ </view>
+ </view>
+ <view v-if="current === 1" class="headerstyle">
+ <view class="itemstyle">
+ <uni-forms label-width="120">
+ <uni-forms-item label="鎵樼洏鏉＄爜">
+ <uni-easyinput
+ type="text"
+ :focus="!addressFocus"
+ v-model="inboundBarcode"
+ placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
+ ref="midInput"
+ @confirm="inputChangebarcode"
+ />
+ </uni-forms-item>
+ <uni-forms-item label="鍦板潃鏉＄爜">
+ <uni-easyinput
+ type="text"
+ v-model="address"
+ :disabled="addressdisabled"
+ placeholder="璇锋壂鎻忓湴鍧�鏉＄爜"
+ ref="midInput"
+ :focus="addressFocus"
+ />
+ </uni-forms-item>
+ <uni-forms-item>
+ <button
+ @click="inbound"
+ type="primary"
+ size="default"
+ style="margin-top: 2%"
+ >
+ 鍏ュ簱纭
+ </button>
+ </uni-forms-item>
+ </uni-forms>
+ </view>
+ </view>
+ <view v-if="current === 2" class="headerstyle">
+ <view class="itemstyle">
+ <uni-list :border="true">
+ <uni-list-item
+ direction="column"
+ v-for="(item, index) in orderInfo"
+ :key="index"
+ >
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <view class="uni-content">
+ <view style="font-size: 18px">鍗曟嵁鍙凤細{{ orderNo }}</view>
+ <view style="font-size: 18px"
+ >鐗╂枡缂栫爜锛歿{ item.materielCode }}</view
+ >
+ <view>鐗╂枡鍚嶇О锛歿{ item.materielName }}</view>
+ <view>鐗╂枡瑙勬牸锛歿{ item.materielSpec }}</view>
+ <view style="font-size: 18px"
+ >鐗╂枡鍚嶇О锛歿{ item.matName }}</view
+ >
+ <view style="font-size: 18px"
+ >鏁伴噺锛歿{ item.orderQuantity + item.unit }}</view
+ >
+ <view style="font-size: 18px"
+ >缁勭洏鏁伴噺锛歿{ item.receiptQuantity }}</view
+ >
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ </uni-list>
+ </view>
+ </view>
+ <view v-if="current === 3" class="headerstyle">
+ <view class="itemstyle">
+ <uni-forms label-width="180">
+ <uni-forms-item label="鍐呯鏍囩:">
+ <uni-easyinput
+ type="text"
+ placeholder="璇锋壂鎻忓唴绠辨爣绛�"
+ ref="midInput"
+ :focus="!pkfocus"
+ v-model="pkmaterSn"
+ @confirm="pksnInput"
+ />
+ </uni-forms-item>
- <uni-forms-item>
- <view style="display: flex;justify-content: space-around;margin-top: 2%;">
- <button @click="resetInPk" type="default" size="default"
- style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button>
- <button @click="pksubmit" type="primary" size="default"
- style="margin-top: 2%;">鍏ュ钩搴�</button>
- </view>
- </uni-forms-item>
-
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-for="(item,index) in pkmatInfos" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="pkdeleteList(index)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
- <view class="uni-note">鎵规鍙凤細{{item.lotNo}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
- <view class="uni-note">鏈夋晥鏈燂細{{item.effectiveDate}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
+ <uni-forms-item>
+ <view
+ style="
+ display: flex;
+ justify-content: space-around;
+ margin-top: 2%;
+ "
+ >
+ <button
+ @click="resetInPk"
+ type="default"
+ size="default"
+ style="
+ width: 160rpx;
+ border: 1rpx solid #007aff;
+ color: #007aff;
+ "
+ >
+ 閲嶇疆
+ </button>
+ <button
+ @click="pksubmit"
+ type="primary"
+ size="default"
+ style="margin-top: 2%"
+ >
+ 鍏ュ钩搴�
+ </button>
+ </view>
+ </uni-forms-item>
+ </uni-forms>
+ <uni-list>
+ <uni-list-item
+ direction="column"
+ v-for="(item, index) in pkmatInfos"
+ :key="index"
+ >
+ <template v-slot:body>
+ <view class="uni-list-box">
+ <uni-icons
+ type="trash"
+ size="22"
+ style="position: absolute; right: 5%"
+ @click="pkdeleteList(index)"
+ >
+ </uni-icons>
+ <view class="uni-content">
+ <view class="uni-title-sub uni-ellipsis-2"
+ >閲囪喘鍗曞彿锛歿{ item.purchaseOrderNo }}</view
+ >
+ <view class="uni-note"
+ >鐗╂枡缂栫爜锛歿{ item.materielCode }}</view
+ >
+ <view class="uni-note">鎵规鍙凤細{{ item.lotNo }}</view>
+ <view class="uni-note">鏁伴噺锛歿{ item.quantity }}</view>
+ <view class="uni-note"
+ >鐢熶骇鏃ユ湡锛歿{ item.productionDate }}</view
+ >
+ <view class="uni-note"
+ >鏈夋晥鏈燂細{{ item.effectiveDate }}</view
+ >
+ </view>
+ </view>
+ </template>
+ </uni-list-item>
+ </uni-list>
+ </view>
+ </view>
+ </view>
+ <u-toast ref="uToast" />
+ </view>
</template>
<script>
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['鍏ュ簱'], //, '瑙ｇ洏''缁勭洏', , '鍗曟嵁淇℃伅'
- current: 0,
- matTotal: [],
- matInfos: [],
- orderNo: "",
- batchNo: "",
- materielCode: "",
- orderqty: 0,
- Inqty: 0,
- goods_no: "",
- batch_num: "",
- order_qty: "",
- order_Inqty: "",
- label: "",
- orderInfo: [],
- focus: false,
- pkfocus: false,
- barcode: "",
- materSn: "",
- Initiallife: 1000,
- sns: [],
- pksns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true,
- value: "",
- matInfo: [],
- value2: "",
- matTotals: [],
- id: "",
- warehouseId: "",
- Test: false,
- Testlabel: "",
- Testplaceholder: "",
- Testcheck: false,
- pkmaterSn: "",
- pkmatInfos: [],
- addressdisabled: false
- }
- },
- onShow() {},
- onLoad(res) {
- this.focus = false;
- this.id = res.id;
- this.addressFocus = false;
- this.orderNo = res.orderNo;
- this.Inqty = res.order_Inqty;
- this.orderqty = res.order_qty;
- this.batchNo = res.batchNo;
- this.materielCode = res.goods_no;
- this.warehouseId = res.warehouseId;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.batch_num = "鎵规鍙凤細" + res.batchNo;
- this.order_qty = "鍗曟嵁鏁伴噺锛�" + res.order_qty;
- this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
- this.goods_no = "鐗╂枡缂栧彿锛�" + res.goods_no;
- // this.getData();
- },
- methods: {
- // voiceSpeech(src) {
- // innerAudioContext.src = src; // '../../static/success.mp3';
- // innerAudioContext.play();
- // },
- updateFocus() {
- debugger
- this.$nextTick(() => {
- this.materSn = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- barcodeFocus() {
- debugger
- this.barcode = '';
- if (this.focus) {
- this.focus = false;
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/InboundOrderDetail/GetInboundOrderDetails', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 2) {
- this.getData();
- }
- }
- },
- barcodeInput() {
- this.$nextTick(function(x) {
- if (this.barcode.length > 0) {
- // if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
- this.focus = true;
- // } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
- // type: "error"
- // })
- // }
- }
- })
- },
- snInput() {
- this.$nextTick(() => {
- if (this.materSn != "") {
- this.focus = false;
- var matSn = this.materSn;
- if (this.warehouseId == 11) {
- matSn = matSn.replace(/,SC.*/, '');
- }
- //鏌ヨmatSn鏄惁瀛樺湪瀛楃
- if (matSn.indexOf("POHA") > 0) {
- this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
- this.Testcheck = false;
- if (res.status) {
- this.sns.push(res.data.serialNumber);
+const innerAudioContext = uni.createInnerAudioContext();
+export default {
+ data() {
+ return {
+ items: ["鍏ュ簱"], //, '瑙ｇ洏''缁勭洏', , '鍗曟嵁淇℃伅'
+ current: 0,
+ matTotal: [],
+ matInfos: [],
+ orderNo: "",
+ batchNo: "",
+ materielCode: "",
+ orderqty: 0,
+ Inqty: 0,
+ goods_no: "",
+ batch_num: "",
+ order_qty: "",
+ order_Inqty: "",
+ label: "",
+ orderInfo: [],
+ focus: false,
+ pkfocus: false,
+ barcode: "",
+ materSn: "",
+ Initiallife: 1000,
+ sns: [],
+ pksns: [],
+ addressFocus: false,
+ inboundBarcode: "",
+ address: "",
+ check: true,
+ value: "",
+ matInfo: [],
+ value2: "",
+ matTotals: [],
+ id: "",
+ warehouseId: "",
+ Test: false,
+ Testlabel: "",
+ Testplaceholder: "",
+ Testcheck: false,
+ pkmaterSn: "",
+ pkmatInfos: [],
+ addressdisabled: false,
+ materialCode: "", // 鏂板锛氭壂鎻忕殑鐗╂枡缂栫爜
+ materialCodeValid: false, // 鏂板锛氱墿鏂欑紪鐮侀獙璇佺姸鎬�
+ step: 1, // 鏂板锛�1-鐗╂枡缂栫爜锛�2-搴撲綅缂栧彿锛�3-鍏ュ簱鏁伴噺
+ };
+ },
+ onShow() {},
+ onLoad(res) {
+ this.step = 1; // 鍒濆姝ラ锛氱墿鏂欑紪鐮�
+ this.focus = false;
- this.matInfos.push(res.data);
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- return;
- }
- // setTimeout(() => {
- // this.voiceSpeech('../../static/success.mp3');
- // }, 100);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- }
- })
- }
- setTimeout(() => {
- this.materSn = "";
- }, 100);
- }
- })
- },
- pksnInput() {
- this.$nextTick(() => {
- if (this.pkmaterSn != "") {
+ this.id = res.id;
+ this.addressFocus = false;
+ this.orderNo = res.orderNo;
+ this.Inqty = res.order_Inqty;
+ this.orderqty = res.order_qty;
+ this.batchNo = res.batchNo;
+ this.materielCode = res.goods_no;
+ this.warehouseId = res.warehouseId;
+ this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
+ this.batch_num = "鎵规鍙凤細" + res.batchNo;
+ this.order_qty = "鍗曟嵁鏁伴噺锛�" + res.order_qty;
+ this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
+ this.goods_no = "鐗╂枡缂栧彿锛�" + res.goods_no;
+ // this.getData();
+ },
+ methods: {
+ // voiceSpeech(src) {
+ // innerAudioContext.src = src; // '../../static/success.mp3';
+ // innerAudioContext.play();
+ // },
- var matSn = this.pkmaterSn;
+ // 鐗╂枡缂栫爜楠岃瘉
+ materialCodeInput() {
+ console.log("materialCodeInput 琚Е鍙�");
+ console.log("杈撳叆鍊�:", this.materialCode);
+ this.$nextTick(() => {
+ if (this.materialCode.trim() !== "") {
+ const scannedCode = this.materialCode.trim();
+ const expectedCode = this.materielCode;
- if (matSn.indexOf("POHA") > 0) {
- this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
- if (res.status) {
- this.pksns.push(res.data.serialNumber);
- this.pkmatInfos.push(res.data);
- if (!res.status) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- return;
- }
- // setTimeout(() => {
- // this.voiceSpeech('../../static/success.mp3');
- // }, 100);
- return;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- }
- })
- }
- setTimeout(() => {
- this.pkmaterSn = "";
- }, 100);
- }
- })
- },
- inbound() {
- if (this.inboundBarcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: "error"
- })
- return;
- }
- if (this.address == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address,
- "warehouseId": this.warehouseId
- }
- }
- this.$u.post('/api/Task/RequestInboundTask', postData).then(res => {
- if (res.status) {
- this.inboundBarcode = "";
- if (this.warehouseId != 5) this.address = "";
- setTimeout(() => {
- this.addressFocus = false;
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- })
- }, 200);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- deleteList(res) {
- this.matInfos.splice(res, 1);
- this.sns.splice(res, 1);
- },
- pkdeleteList(res) {
- this.pkmatInfos.splice(res, 1);
- this.pksns.splice(res, 1);
- },
- reset() {
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.materSn = "";
- if (this.warehouseId = !6) {
- this.Initiallife = 0;
- }
- },
- resetInPk() {
- this.pkmaterSn = "";
- this.pkfocus = false;
- this.pkmatInfos = [];
- this.pksns = [];
- },
- pksubmit() {
- if (this.pkmatInfos.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId + "&orderNo=" + this.orderNo, this
- .pksns).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍏ュ簱鎴愬姛",
- type: "success"
- })
- this.pkfocus = false;
- this.pkmatInfos = [];
- this.pksns = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- // submit() {
- // if (this.barcode == "") {
- // this.$refs.uToast.show({
- // title: "璇锋壂鎻忚揣浣嶇紪鍙�",
- // type: 'error'
- // })
- // return;
- // }
- // if (this.materSn.length == 0) {
- // this.$refs.uToast.show({
- // title: "璇疯緭鍏ュ叆搴撴暟閲�",
- // type: 'error'
- // })
- // return;
- // }
- // uni.showLoading({
- // title: '鎻愪氦涓�...'
- // });
- // this.$u.post('/api/CabinOrder/FeedbackIn', {
- // MainData: {
- // "LocationCode": this.barcode,
- // "id":this.id,
- // "warehouseCode": this.warehouseId,
- // "orderNo": this.orderNo,
- // "materielCode": this.materielCode,
- // "Inqty": this.materSn,
- // "batchNo": this.batchNo,
- // },
- // DelKeys: this.sns
- // }).then(res => {
- // uni.hideLoading();
- // this.Testcheck = false;
- // if (res.status) {
- // this.$refs.uToast.show({
- // title: "鍏ュ簱鎴愬姛",
- // type: "success"
- // })
- // this.Inqty = parseInt(res.message);
- // this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
- // this.barcode = "";
- // this.materSn = "";
- // if (this.Inqty == this.orderqty) {
- // uni.setStorageSync('isIn', true);
- // this.handleInboundComplete();
- // }
- // } else {
- // this.$refs.uToast.show({
- // title: res.message,
- // type: "error"
- // })
- // }
- // }).catch(err => {
- // uni.hideLoading();
- // this.$refs.uToast.show({
- // title: "缃戠粶閿欒锛岃閲嶈瘯",
- // type: "error"
- // })
- // })
- // },
- // 鏂板鏂规硶澶勭悊鍏ュ簱瀹屾垚閫昏緫
-
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忚揣浣嶇紪鍙�",
- type: 'error'
- })
- return;
- }
- if (this.materSn.length == 0) {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ叆搴撴暟閲�",
- type: 'error'
- })
- return;
- }
+ console.log("鎵弿缂栫爜:", scannedCode);
+ console.log("鏈熸湜缂栫爜锛坢aterielCode锛�:", expectedCode);
- // 鏂板浜屾纭閫昏緫
- uni.showModal({
- title: '纭鍏ュ簱',
- content: '鎮ㄧ‘瀹氳鎻愪氦鍏ュ簱淇℃伅鍚楋紵',
- success: (res) => {
- if (res.confirm) {
- // 鐢ㄦ埛鐐瑰嚮纭畾锛屾墽琛屽師鏈夌殑鎻愪氦閫昏緫
- uni.showLoading({
- title: '鎻愪氦涓�...'
- });
- this.$u.post('/api/CabinOrder/FeedbackIn', {
- MainData: {
- "LocationCode": this.barcode,
- "id": this.id,
- "warehouseCode": this.warehouseId,
- "orderNo": this.orderNo,
- "materielCode": this.materielCode,
- "Inqty": this.materSn,
- "batchNo": this.batchNo,
- },
- DelKeys: this.sns
- }).then(res => {
- uni.hideLoading();
- this.Testcheck = false;
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍏ュ簱鎴愬姛",
- type: "success"
- })
- this.Inqty = parseInt(res.message);
- this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
- this.barcode = "";
- this.materSn = "";
- if (this.Inqty == this.orderqty) {
- uni.setStorageSync('isIn', true);
- this.handleInboundComplete();
- }
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- uni.hideLoading();
- this.$refs.uToast.show({
- title: "缃戠粶閿欒锛岃閲嶈瘯",
- type: "error"
- })
- })
- } else {
- // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鍋氫换浣曟搷浣�
- }
+ if (scannedCode === expectedCode) {
+ this.materialCodeValid = true;
+ console.log("鉁� 鐗╂枡缂栫爜楠岃瘉鎴愬姛");
+
+ // 楠岃瘉鎴愬姛鍚庝笉娓呯┖鍊硷紝鐩存帴鍒囨崲鍒颁笅涓�姝�
+ this.step = 2;
+ this.$refs.uToast.show({
+ title: "鐗╂枡缂栫爜楠岃瘉鎴愬姛",
+ type: "success",
+ });
+ // 浣跨敤 $nextTick 纭繚鐒︾偣鍒囨崲鍦� DOM 鏇存柊鍚庢墽琛�
+ this.$nextTick(() => {
+ // 璁╁簱浣嶇紪鍙疯緭鍏ユ鑾峰緱鐒︾偣
+ this.$refs.midInput.focus();
+ });
+ } else {
+ this.materialCodeValid = false;
+ console.log("鉂� 鐗╂枡缂栫爜楠岃瘉澶辫触");
+
+ this.$refs.uToast.show({
+ title: `鐗╂枡缂栫爜涓嶅尮閰峘,
+ type: "error",
+ });
+
+ // 楠岃瘉澶辫触鏃舵竻绌哄�煎苟淇濇寔鐒︾偣鍦ㄧ墿鏂欑紪鐮佽緭鍏ユ
+ setTimeout(() => {
+ this.materialCode = "";
+ this.step = 1;
+ // 纭繚鐒︾偣鍥炲埌鐗╂枡缂栫爜杈撳叆妗�
+ this.$nextTick(() => {
+ this.$refs.materialInput.focus();
+ });
+ }, 500);
+ }
}
- });
-},
+ });
+ },
- handleInboundComplete() {
- // 鏄剧ず瀹屾垚鎻愮ず
- // uni.showModal({
- // title: '鎻愮ず',
- // content: '鍏ュ簱宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
- // success: (res) => {
- // if (res.confirm) {
- // // 鐢ㄦ埛鐐瑰嚮纭畾
- // setTimeout(() => {
- // // uni.redirectTo({
- // // url: '/pages/stash/inboundorder?warehouseId='+this.warehouseId // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
- // // });
- // uni.navigateBack({
- // delta: 2
- // });
- // }, 500);
- // } else {
- // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
- // // 鎴栬�呮墽琛屽叾浠栨搷浣�
- // }
- // }
- // });
+ updateFocus() {
+ debugger;
+ this.$nextTick(() => {
+ this.materSn = "";
+ if (!this.focus) {
+ this.focus = true;
+ }
+ });
+ },
+ barcodeFocus() {
+ debugger;
+ this.barcode = "";
+ if (this.focus) {
+ this.focus = false;
+ }
+ },
+ getData() {
+ var postData = {
+ MainData: {
+ orderNo: this.orderNo,
+ },
+ };
+ this.$u
+ .post("/api/InboundOrderDetail/GetInboundOrderDetails", postData)
+ .then((res) => {
+ if (res.status) {
+ this.orderInfo = res.data;
+ if (this.orderInfo.length > 3) {
+ this.loadVisible = true;
+ }
+ }
+ });
+ },
+ onClickItem(e) {
+ this.focus = false;
+ this.addressFocus = false;
+ if (this.current !== e.currentIndex) {
+ this.current = e.currentIndex;
+ if (this.current == 2) {
+ this.getData();
+ }
+ }
+ },
- // 鎴栬�呯洿鎺ヨ烦杞紙涓嶈闂敤鎴凤級
- setTimeout(() => {
- // 鏂瑰紡2锛氳烦杞埌鎸囧畾椤甸潰
- // uni.redirectTo({
- // url: '/pages/order/list' // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
- // });
- // 鏂瑰紡3锛氳烦杞埌棣栭〉
- // uni.switchTab({
- // url: '/pages/index/index'
- // });
- // 鏂瑰紡1锛氫娇鐢╱ni.navigateBack杩斿洖涓婁竴椤�
- uni.navigateBack({
- delta: 1
- });
- }, 600);
- }
- }
- }
+ // barcodeInput() {
+ // this.$nextTick(function(x) {
+ // if (this.barcode.length > 0) {
+ // // 鎵弿搴撲綅缂栧彿鍚庯紝鑷姩鍒囨崲鍒板叆搴撴暟閲忚緭鍏ユ锛堟楠�3锛�
+ // setTimeout(() => {
+ // this.step = 3; // 鍒囨崲鍒板叆搴撴暟閲�
+ // this.$refs.uToast.show({
+ // title: "搴撲綅缂栧彿鎵弿鎴愬姛",
+ // type: "success"
+ // });
+ // }, 100);
+ // }
+ // })
+ // },
+ barcodeInput() {
+ this.$nextTick(() => {
+ if (this.barcode.length > 0) {
+ this.step = 3; // 鍒囨崲鍒板叆搴撴暟閲�
+ this.$refs.uToast.show({
+ title: "搴撲綅缂栧彿鎵弿鎴愬姛",
+ type: "success",
+ });
+ // 娣诲姞寤舵椂纭繚鎵爜瀹屾垚
+ setTimeout(() => {
+ this.$nextTick(() => {
+ this.$refs.midInput.focus();
+ });
+ }, 100);
+ }
+ });
+ },
+
+ snInput() {
+ this.$nextTick(() => {
+ if (this.materSn != "") {
+ this.focus = false;
+ var matSn = this.materSn;
+ if (this.warehouseId == 11) {
+ matSn = matSn.replace(/,SC.*/, "");
+ }
+ //鏌ヨmatSn鏄惁瀛樺湪瀛楃
+ if (matSn.indexOf("POHA") > 0) {
+ this.$u
+ .post("/api/MaterielInfo/CodeAnalysis?serNum=" + matSn, {})
+ .then((res) => {
+ this.Testcheck = false;
+ if (res.status) {
+ this.sns.push(res.data.serialNumber);
+
+ this.matInfos.push(res.data);
+ if (res.message) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ return;
+ }
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/success.mp3');
+ // }, 100);
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ }
+ });
+ }
+ setTimeout(() => {
+ this.materSn = "";
+ }, 100);
+ }
+ });
+ },
+ pksnInput() {
+ this.$nextTick(() => {
+ if (this.pkmaterSn != "") {
+ var matSn = this.pkmaterSn;
+
+ if (matSn.indexOf("POHA") > 0) {
+ this.$u
+ .post("/api/MaterielInfo/CodeAnalysis?serNum=" + matSn, {})
+ .then((res) => {
+ if (res.status) {
+ this.pksns.push(res.data.serialNumber);
+ this.pkmatInfos.push(res.data);
+ if (!res.status) {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ return;
+ }
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/success.mp3');
+ // }, 100);
+ return;
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
+ }
+ });
+ }
+ setTimeout(() => {
+ this.pkmaterSn = "";
+ }, 100);
+ }
+ });
+ },
+ inbound() {
+ if (this.inboundBarcode == "") {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忔墭鐩樻潯鐮�",
+ type: "error",
+ });
+ return;
+ }
+ if (this.address == "") {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忓湴鍧�鏉＄爜",
+ type: "error",
+ });
+ return;
+ }
+ var postData = {
+ MainData: {
+ barcode: this.inboundBarcode,
+ startPoint: this.address,
+ warehouseId: this.warehouseId,
+ },
+ };
+ this.$u
+ .post("/api/Task/RequestInboundTask", postData)
+ .then((res) => {
+ if (res.status) {
+ this.inboundBarcode = "";
+ if (this.warehouseId != 5) this.address = "";
+ setTimeout(() => {
+ this.addressFocus = false;
+ this.$refs.uToast.show({
+ title: "鎴愬姛",
+ type: "success",
+ });
+ }, 200);
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ }
+ })
+ .catch((err) => {
+ this.$refs.uToast.show({
+ title: err.message,
+ type: "error",
+ });
+ });
+ },
+ inputChangebarcode() {
+ this.addressFocus = false;
+ this.$nextTick(function (x) {
+ if (this.inboundBarcode != "") {
+ this.addressFocus = true;
+ }
+ });
+ },
+ deleteList(res) {
+ this.matInfos.splice(res, 1);
+ this.sns.splice(res, 1);
+ },
+ pkdeleteList(res) {
+ this.pkmatInfos.splice(res, 1);
+ this.pksns.splice(res, 1);
+ },
+ reset() {
+ //閲嶇疆鐗╂枡缂栫爜鐩稿叧鐘舵��
+ this.materialCode = "";
+ this.materialCodeValid = false;
+ this.materialFocus = false;
+
+ this.barcode = "";
+ this.matInfos = [];
+ this.sns = [];
+ this.materSn = "";
+ if ((this.warehouseId = !6)) {
+ this.Initiallife = 0;
+ }
+ },
+ resetInPk() {
+ this.pkmaterSn = "";
+ this.pkfocus = false;
+ this.pkmatInfos = [];
+ this.pksns = [];
+ },
+ pksubmit() {
+ if (this.pkmatInfos.length == 0) {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忓唴绠辨爣绛�",
+ type: "error",
+ });
+ return;
+ }
+ this.$u
+ .post(
+ "/api/InboundOrder/InPinKu?warehouseId=" +
+ this.warehouseId +
+ "&orderNo=" +
+ this.orderNo,
+ this.pksns
+ )
+ .then((res) => {
+ if (res.status) {
+ this.$refs.uToast.show({
+ title: "鍏ュ簱鎴愬姛",
+ type: "success",
+ });
+ this.pkfocus = false;
+ this.pkmatInfos = [];
+ this.pksns = [];
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ }
+ });
+ },
+ // submit() {
+ // if (this.barcode == "") {
+ // this.$refs.uToast.show({
+ // title: "璇锋壂鎻忚揣浣嶇紪鍙�",
+ // type: 'error'
+ // })
+ // return;
+ // }
+ // if (this.materSn.length == 0) {
+ // this.$refs.uToast.show({
+ // title: "璇疯緭鍏ュ叆搴撴暟閲�",
+ // type: 'error'
+ // })
+ // return;
+ // }
+ // uni.showLoading({
+ // title: '鎻愪氦涓�...'
+ // });
+ // this.$u.post('/api/CabinOrder/FeedbackIn', {
+ // MainData: {
+ // "LocationCode": this.barcode,
+ // "id":this.id,
+ // "warehouseCode": this.warehouseId,
+ // "orderNo": this.orderNo,
+ // "materielCode": this.materielCode,
+ // "Inqty": this.materSn,
+ // "batchNo": this.batchNo,
+ // },
+ // DelKeys: this.sns
+ // }).then(res => {
+ // uni.hideLoading();
+ // this.Testcheck = false;
+ // if (res.status) {
+ // this.$refs.uToast.show({
+ // title: "鍏ュ簱鎴愬姛",
+ // type: "success"
+ // })
+ // this.Inqty = parseInt(res.message);
+ // this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
+ // this.barcode = "";
+ // this.materSn = "";
+ // if (this.Inqty == this.orderqty) {
+ // uni.setStorageSync('isIn', true);
+ // this.handleInboundComplete();
+ // }
+ // } else {
+ // this.$refs.uToast.show({
+ // title: res.message,
+ // type: "error"
+ // })
+ // }
+ // }).catch(err => {
+ // uni.hideLoading();
+ // this.$refs.uToast.show({
+ // title: "缃戠粶閿欒锛岃閲嶈瘯",
+ // type: "error"
+ // })
+ // })
+ // },
+ // 鏂板鏂规硶澶勭悊鍏ュ簱瀹屾垚閫昏緫
+
+ submit() {
+ // 鍏堥獙璇佺墿鏂欑紪鐮�
+ if (!this.materialCodeValid) {
+ this.$refs.uToast.show({
+ title: "璇峰厛鎵弿骞堕獙璇佺墿鏂欑紪鐮�",
+ type: "error",
+ });
+ return;
+ }
+ if (this.barcode == "") {
+ this.$refs.uToast.show({
+ title: "璇锋壂鎻忚揣浣嶇紪鍙�",
+ type: "error",
+ });
+ return;
+ }
+ if (this.materSn.length == 0) {
+ this.$refs.uToast.show({
+ title: "璇疯緭鍏ュ叆搴撴暟閲�",
+ type: "error",
+ });
+ return;
+ }
+
+ // 鏂板浜屾纭閫昏緫
+ uni.showModal({
+ title: "纭鍏ュ簱",
+ content: "鎮ㄧ‘瀹氳鎻愪氦鍏ュ簱淇℃伅鍚楋紵",
+ success: (res) => {
+ if (res.confirm) {
+ // 鐢ㄦ埛鐐瑰嚮纭畾锛屾墽琛屽師鏈夌殑鎻愪氦閫昏緫
+ uni.showLoading({
+ title: "鎻愪氦涓�...",
+ });
+ this.$u
+ .post("/api/CabinOrder/FeedbackIn", {
+ MainData: {
+ LocationCode: this.barcode,
+ id: this.id,
+ warehouseCode: this.warehouseId,
+ orderNo: this.orderNo,
+ materielCode: this.materielCode,
+ Inqty: this.materSn,
+ batchNo: this.batchNo,
+ },
+ DelKeys: this.sns,
+ })
+ .then((res) => {
+ uni.hideLoading();
+ this.Testcheck = false;
+ if (res.status) {
+ this.$refs.uToast.show({
+ title: "鍏ュ簱鎴愬姛",
+ type: "success",
+ });
+ this.Inqty = parseInt(res.message);
+ this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
+ // 鎵嬪姩娓呯┖鎵�鏈夎緭鍏ユ暟鎹�
+ this.materialCode = "";
+ this.materialCodeValid = false;
+ this.barcode = "";
+ this.materSn = "";
+ this.step = 1; // 閲嶇疆姝ラ鍒扮涓�姝�
+
+ // 浣跨敤 $nextTick 纭繚鐒︾偣璁剧疆鍦� DOM 鏇存柊鍚庢墽琛�
+ this.$nextTick(() => {
+ // 纭繚鐗╂枡缂栫爜杈撳叆妗嗚幏寰楃劍鐐�
+ this.$refs.materialInput.focus();
+ });
+ if (this.Inqty == this.orderqty) {
+ uni.setStorageSync("isIn", true);
+ this.handleInboundComplete();
+ }
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: "error",
+ });
+ }
+ })
+ .catch((err) => {
+ uni.hideLoading();
+ this.$refs.uToast.show({
+ title: "缃戠粶閿欒锛岃閲嶈瘯",
+ type: "error",
+ });
+ });
+ } else {
+ // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鍋氫换浣曟搷浣�
+ }
+ },
+ });
+ },
+
+ handleInboundComplete() {
+ // 鏄剧ず瀹屾垚鎻愮ず
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: '鍏ュ簱宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
+ // success: (res) => {
+ // if (res.confirm) {
+ // // 鐢ㄦ埛鐐瑰嚮纭畾
+ // setTimeout(() => {
+ // // uni.redirectTo({
+ // // url: '/pages/stash/inboundorder?warehouseId='+this.warehouseId // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
+ // // });
+ // uni.navigateBack({
+ // delta: 2
+ // });
+ // }, 500);
+ // } else {
+ // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ // }
+ // }
+ // });
+
+ // 鎴栬�呯洿鎺ヨ烦杞紙涓嶈闂敤鎴凤級
+ setTimeout(() => {
+ // 鏂瑰紡2锛氳烦杞埌鎸囧畾椤甸潰
+ // uni.redirectTo({
+ // url: '/pages/order/list' // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
+ // });
+ // 鏂瑰紡3锛氳烦杞埌棣栭〉
+ // uni.switchTab({
+ // url: '/pages/index/index'
+ // });
+ // 鏂瑰紡1锛氫娇鐢╱ni.navigateBack杩斿洖涓婁竴椤�
+ uni.navigateBack({
+ delta: 1,
+ });
+ }, 600);
+ },
+ },
+};
</script>
<style lang="scss">
- @import '@/common/uni-ui.scss';
+@import "@/common/uni-ui.scss";
- .content {
- display: flex;
- height: 150px;
- }
+.content {
+ display: flex;
+ height: 150px;
+}
- .content-text {
- font-size: 14px;
- color: #666;
- }
+.content-text {
+ font-size: 14px;
+ color: #666;
+}
- .itemstyle {
- margin-top: 30px;
- margin-left: 5%;
- }
+.itemstyle {
+ margin-top: 30px;
+ margin-left: 5%;
+}
- .headerstyle {
- width: 90%;
- }
+.headerstyle {
+ width: 90%;
+}
</style>
\ No newline at end of file
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
index 7d10b1e..49659cd 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/Inventory_BatchServices.cs.cs"
@@ -416,13 +416,21 @@
+ /// <summary>
+ /// 搴撳瓨杩囨湡棰勮
+ /// </summary>
+ /// <returns></returns>
public WebResponseContent GetExpiredAndlow()
{
WebResponseContent content = new WebResponseContent();
try
{
DateTime dateTime = DateTime.Now.AddDays(30).Date;
- List<Dt_Inventory_Batch> inventory_Batches = BaseDal.QueryData(x => x.ValidityPeriod < dateTime);
+ DateTime dateTime60 = DateTime.Now.AddDays(60).Date;
+ DateTime dateTime180 = DateTime.Now.AddDays(180).Date;
+
+
+ List<Dt_Inventory_Batch> inventory_Batches = BaseDal.QueryData(x => x.ValidityPeriod < dateTime || x.ValidityPeriod<dateTime60 || x.ValidityPeriod < dateTime180).ToList();
foreach (var item in inventory_Batches)
{
var day = (item.ValidityPeriod - DateTime.Now).Days;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs"
index 11985c4..a459b95 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/ClassLibrary2/MaterielInfoService.cs"
@@ -57,8 +57,7 @@
// 鍙嶅簭鍒楀寲
var response = JsonConvert.DeserializeObject<UpstreamResponse<MedicationsInfo>>(result);
-
- if (response == null || response.resultCode != "0")
+ if (response == null || response.resultCode != "0"||response.data==null)
{
// 璋冪敤寮傚父鎺ュ彛
//SendErrorToUpstream(5, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
index 4b58f33..ef33573 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
@@ -532,81 +532,7 @@
}
- /// <summary>
- /// 鏇存柊鍏ュ簱鍗曡缁�
- /// </summary>
- /// <param name="batchNo">鎵规鍙�</param>
- /// <param name="productCode">鐗╂枡鍚嶇紪鐮�/param>
- public void UpdateInboundOrderDetailStatus(string orderNo, string batchNo, string productCode)
- {
- try
- {
- //鏌ヨ璇︽儏
- var detail = BaseDal.Db.Queryable<Dt_CabinOrderDetail>()
- .First(x => x.Goods_no == productCode && x.Batch_num == batchNo && x.OrderDetailStatus == "寮�濮�" && x.Status == 1);
- //鏌ユ壘鍒板悗鏍规嵁鐗╂枡鐘舵�侊紙OrderDetailStatus==寮�濮嬶級 璇ョ姸鎬丼tatus=1淇敼璇ユ潯璇︽儏鐨凮rderDetailStatus==宸插畬鎴�
- detail.OrderDetailStatus = "宸插畬鎴�";
- BaseDal.Db.Updateable(detail).ExecuteCommand();
- }
- catch (Exception ex)
- {
-
- throw;
- }
-
- }
-
- /// <summary>
- /// //鏌ユ壘鍒板悗鏍规嵁鐗╂枡鐘舵�侊紙OrderDetailStatus==寮�濮嬶級 璇ョ姸鎬丼tatus=1淇敼璇ユ潯璇︽儏鐨凮rderDetailStatus==宸插畬鎴�
- /// </summary>
- /// <param name="batchNo"></param>
- /// <param name="productCode"></param>
- public void UpdateOutboundOrderDetailStatus(string batchNo, string productCode)
- {
- try
- {
- //鏌ヨ璇︽儏
- var detail = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
- .First(x => x.Goods_no == productCode && x.Batch_num == batchNo && x.OotDetailStatus == "寮�濮�" && x.Status == 1);
- detail.OotDetailStatus = "宸插畬鎴�";
- BaseDal.Db.Updateable(detail).ExecuteCommand();
- }
- catch (Exception ex)
- {
-
- throw;
- }
-
-
- }
-
-
- /// <summary>
- /// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨
- /// </summary>
- public void SendErrorToUpstream(int type, string code, string message, string remark)
- {
- try
- {
- var url = "http://192.168.1.100:80/GYZ2/95fck/exceptionLog";
-
- var requestData = new
- {
- type = type.ToString(),
- code = code,
- message = message,
- remark = remark
- };
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- // 鍙互鍙嶅簭鍒楀寲妫�鏌� resultCode 鏄惁涓�0
- }
- catch (Exception e)
- {
- // 杩欓噷涓嶈鍐嶆姏寮傚父浜嗭紝閬垮厤姝诲惊鐜�
- Console.WriteLine("寮傚父鎺ュ彛鎺ㄩ�佸け璐ワ細" + e.Message);
- }
- }
+
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs"
index b080530..cde13bd 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs"
@@ -298,15 +298,14 @@
WebResponseContent content = new WebResponseContent();
try
{
- //var url = "http://192.168.1.100:80/GYZ2/95fck/outOrder";
- var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ var url = "http://192.168.1.100:80/GYZ2/95fck/outOrder";
string GetOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
if (string.IsNullOrEmpty(SearchOutOrderDate)) SearchOutOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var requestData = new { searchDate = SearchOutOrderDate };
var result = HttpHelper.Post(url, requestData.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
-
if (response == null || response.data == null) return content;
+ if (response.resultCode != "0") return content;
if (response.data.Count < 1)
{
SearchOutOrderDate = GetOutOrderDate;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/Alarm/MessageInfo.js" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/Alarm/MessageInfo.js"
index bc81bf3..274dbf8 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/Alarm/MessageInfo.js"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/Alarm/MessageInfo.js"
@@ -22,7 +22,97 @@
x.type = 'primary';
}
});
+ // 鍦� onInit 涓洿鎺ヤ慨鏀瑰垪閰嶇疆
+ this.fixColumnFormatter();
+ },
+ // 鐩存帴淇敼鍒楅厤缃�
+ fixColumnFormatter() {
+ // 寤惰繜鎵ц锛岀‘淇濆垪宸插姞杞�
+ this.$nextTick(() => {
+ setTimeout(() => {
+ const col = this.columns?.find(c => c.field === 'messageGroupBy');
+ if (col) {
+ // 瀹屽叏鏇挎崲 formatter
+ col.formatter = (row) => {
+ const value = row.messageGroupBy;
+ const text = this.getTextByValue(value);
+
+ if (value === 1) {
+ // 搴撳瓨杩囨湡棰勮 - 鏍规嵁澶╂暟鍒嗕笁绉嶉鑹�
+ const info = row.messageInfo || '';
+ const days = this.extractDays(info);
+
+ // 璁剧疆鏍峰紡
+ let style = '';
+ if (days !== null) {
+ if (days < 0) {
+ // 宸茶繃鏈� - 绾㈣壊
+ style = 'background-color:#fff0f0;color:#f56c6c;border:1px solid #f56c6c33;';
+ } else if (days <= 30) {
+ // 1涓湀鍐呰繃鏈� - 绾㈣壊
+ style = 'background-color:#fff0f0;color:#f56c6c;border:1px solid #f56c6c33;';
+ } else if (days <= 120) {
+ // 澶т簬30澶╀笖灏忎簬绛変簬120澶� - 姗欒壊
+ style = 'background-color:#fdf6ec;color:#e6a23c;border:1px solid #e6a23c33;';
+ } else {
+ // 澶т簬120澶� - 缁胯壊
+ style = 'background-color:#f0f9eb;color:#67c23a;border:1px solid #67c23a33;';
+ }
+ } else {
+ // 榛樿鏍峰紡
+ style = 'background-color:#f5f5f5;color:#909399;border:1px solid #dcdfe6;';
+ }
+
+ return `<span style="${style} padding:3px 10px;border-radius:12px;font-weight:600;font-size:12px;display:inline-block;line-height:1;">${text}</span>`;
+ }
+
+ // 鍏朵粬鍒嗙粍 - 淇濇寔鍘熸湁鐨勬牱寮�
+ return this.getOtherGroupStyle(value, text);
+ };
+
+ console.log('鍒楁牸寮忓寲鍑芥暟宸茶缃�');
+ }
+ }, 200);
+ });
+ },
+ // 鍏朵粬鍒嗙粍鐨勬牱寮�
+ getOtherGroupStyle(value, text) {
+ const styleMap = {
+ 0: 'background-color:#e8f4ff;color:#0088ff;border:1px solid #0088ff33;', // 璁惧鎶ヨ - 浜摑鑹�
+ 2: 'background-color:#fff2e8;color:#ff8800;border:1px solid #ff880033;', // 浣庡簱瀛橀璀� - 浜鑹�
+ 3: 'background-color:#ffe8e8;color:#ff4444;border:1px solid #ff444433;', // 鐗╂枡寰呯淮鎶ゆ姤璀� - 浜孩鑹�
+ 4: 'background-color:#f0e8ff;color:#8844ff;border:1px solid #8844ff33;', // 鍏ュ簱鍗曟姤璀� - 绱壊
+ 5: 'background-color:#e8fffb;color:#00aa88;border:1px solid #00aa8833;', // 鍑哄簱鍗曟姤璀� - 闈掕壊
+ 6: 'background-color:#fff8e8;color:#ffaa00;border:1px solid #ffaa0033;', // 涓嶦RP鍚屾鎶ヨ - 閲戣壊
+ };
+
+ const style = styleMap[value] || 'background-color:#f5f5f5;color:#909399;border:1px solid #dcdfe6;';
+
+ return `<span style="${style} padding:3px 10px;border-radius:12px;font-weight:600;font-size:12px;display:inline-block;line-height:1;">${text}</span>`;
+ },
+
+ getTextByValue(value) {
+ const map = {
+ 0: '璁惧鎶ヨ',
+ 1: '搴撳瓨杩囨湡棰勮',
+ 2: '浣庡簱瀛橀璀�',
+ 3: '鐗╂枡寰呯淮鎶ゆ姤璀�',
+ 4: '鍏ュ簱鍗曟姤璀�',
+ 5: '鍑哄簱鍗曟姤璀�',
+ 6: '涓嶦RP鍚屾鎶ヨ'
+ };
+ return map[value] || `鍒嗙粍${value}`;
+ },
+
+ extractDays(info) {
+ if (!info) return null;
+ const match1 = info.match(/杩樻湁(\d+)澶╄繃鏈�/);
+ const match2 = info.match(/宸茶繃鏈�(\d+)澶�/);
+
+ if (match1) return parseInt(match1[1]);
+ if (match2) return -parseInt(match2[1]);
+ return null;
},
onInited() {
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js"
index bede761..20cb478 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/outbound/outboundOrder.js"
@@ -87,7 +87,7 @@
//(3)this.editFormFields.瀛楁='xxx';
//濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
//鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
- this.editFormOptions.forEach((editForm) => {
+ this.editFormOptions.forEach((editForm) => {//鍏ㄩ儴璁剧疆涓哄彧璇�
editForm.forEach((x) => {
x.readonly = true
})
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/stock/Dt_Inventory_Batch.js" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/stock/Dt_Inventory_Batch.js"
index 0cb768c..a43545b 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/stock/Dt_Inventory_Batch.js"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/stock/Dt_Inventory_Batch.js"
@@ -112,7 +112,7 @@
// this.editFormFields.availableQuantity = 1;
this.editFormOptions.forEach((editForm) => {
editForm.forEach((x) => {
- if (x.field == "availableQuantity") {
+ if (x.field == "availableQuantity") {//闄や簡璇ュ瓧娈靛彲浠ョ紪杈戝叾浠栫殑閮借缃负鍙
} else {
x.readonly = true
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/MessageInfo_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/MessageInfo_Hty.vue"
index 96a23f7..0b60cab 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/MessageInfo_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/MessageInfo_Hty.vue"
@@ -56,16 +56,10 @@
const searchFormOptions = ref([
[
{
- title: "鍘熻〃涓婚敭",
- field: "sourceId",
- type: "number",
- span: 8,
- },
- {
title: "寮傚父淇℃伅鍒嗙粍",
field: "messageGroupBy",
type: "select",
- dataKey: "messageGroupBy",
+ dataKey: "MessageGroupByEnum",
data: [],
span: 8,
},
@@ -73,7 +67,7 @@
title: "鐘舵��",
field: "messageStatus",
type: "select",
- dataKey: "messageStatus",
+ dataKey: "MessageStatusEnum",
data: [],
span: 8,
},
@@ -86,28 +80,10 @@
span: 8,
},
{
- title: "鎿嶄綔绫诲瀷",
- field: "operateType",
- type: "select",
- dataKey: "operateType",
- data: [],
- span: 8,
- },
- {
title: "寮傚父淇℃伅",
field: "messageInfo",
type: "like",
span: 8,
- },
- ],
- [
- {
- title: "绉诲叆鍘嗗彶鏃堕棿",
- field: "insertTimeRange",
- type: "datetimeRange",
- span: 24,
- startField: "insertTimeStart",
- endField: "insertTimeEnd",
},
],
]);
@@ -154,7 +130,7 @@
type: "string",
width: 200,
align: "left",
- link: true,
+ // link: true,鍒楀唴瀹规樉绀轰负鍙偣鍑婚摼鎺ワ紝鐐瑰嚮鎵撳紑缂栬緫妗�
require: true,
},
{
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
index a63fd1c..9c4755a 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/stockInfo.vue"
@@ -54,8 +54,9 @@
title: "搴撴埧缂栧彿",
type: "string",
required: true,
- data: [],
+ data: [],
dataKey: "warehouseNuber",
+ // readonly : true,//涓嶅彲缂栬緫
},
{
field: "palletCode",
--
Gitblit v1.9.3