Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

.env.development

@@ -1,11 +1,11 @@
-VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
+VITE_BASE_URL=http://172.22.32.9:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
+VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
 VITE_isDevelopment=true
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
+VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'

src/pages/productPutaway/job/productPutawayJob.vue

@@ -221,7 +221,8 @@
 
 			openJobDetail(item, scanMessage = '') {
 				uni.navigateTo({
-					url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item.type + '&scanMessage=' + this.scanMessage +'&title='+this.title
+					url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item
+						.type + '&scanMessage=' + this.scanMessage + '&title=' + this.title
 				});
 				this.scanMessage = ""
 			},
@@ -338,10 +339,16 @@
 			getScanResult(result) {
 				try {
 					this.scanMessage = ""
-					var filters = [{
+					var filters = [
+						// {
+						// 	column: "packingNumber",
+						// 	action: "==",
+						// 	value: result.label.packingNumber
+						// },
+						{
 							column: "packingNumber",
-							action: "==",
+							action: "in",
-							value: result.label.packingNumber
+							value: result.package.number + "," + result.package.parentNumber
 						},
 						{
 							column: "batch",

src/pages/productReceipt/job/ccProductReceiptJob.vue

@@ -211,7 +211,8 @@
 
 			openJobDetail(item, scanMessage = '') {
 				uni.navigateTo({
-					url: './ccProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' +
+					url: './ccProductReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+						'&scanMessage=' +
 						scanMessage + '&title=' + this.title
 				});
 				this.scanMessage = ""
@@ -349,10 +350,16 @@
 			getScanResult(result) {
 				try {
 					this.scanMessage = ""
-					var filters = [{
+					var filters = [
+						// {
+						// 	column: "packingNumber",
+						// 	action: "==",
+						// 	value: result.label.packingNumber
+						// },
+						{
 							column: "packingNumber",
-							action: "==",
+							action: "in",
-							value: result.label.packingNumber
+							value: result.package.number + "," + result.package.parentNumber
 						},
 						{
 							column: "batch",

src/pages/productReceipt/job/productReceiptJob.vue

@@ -212,15 +212,18 @@
 			openJobDetail(item, scanMessage = '') {
 				if (this.type == 'predict') {
 					uni.navigateTo({
-						url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
+						url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+							'&scanMessage=' + scanMessage + '&title=' + this.title
 					});
 				} else if (this.type == 'assemble') {
 					uni.navigateTo({
-						url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
+						url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+							'&scanMessage=' + scanMessage + '&title=' + this.title
 					});
 				} else {
 					uni.navigateTo({
-						url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
+						url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+							'&scanMessage=' + scanMessage + '&title=' + this.title
 					});
 				}
 				this.scanMessage = ""
@@ -352,8 +355,8 @@
 					this.scanMessage = ""
 					var filters = [{
 							column: "packingNumber",
-							action: "==",
+							action: "in",
-							value: result.label.packingNumber
+							value: result.package.number + "," + result.package.parentNumber
 						},
 						{
 							column: "batch",

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -392,8 +392,8 @@
 					} else {
 						filters = [{
 							column: "packingNumber",
-								action: "==",
+							action: "in",
-								value: result.label.packingNumber
+							value: result.package.number + "," + result.package.parentNumber
 						},
 							{
 								column: "batch",

src/pages/putaway/job/putawayDetail.vue

@@ -482,6 +482,7 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
+						return;
 						putawayJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {

src/pages/putaway/job/putawayJob.vue

@@ -56,7 +56,9 @@
 	import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue'
 	import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
 	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
-import { Exception } from 'sass';
+	import {
+		Exception
+	} from 'sass';
 
 	export default {
 		name: 'Putaway',
@@ -318,12 +320,12 @@ import { Exception } from 'sass';
 			selectItem(item) {
 				this.$refs.scanPopup.closeScanPopup();
 				uni.navigateTo({
-					url: './putawayDetail?id='
+					url: './putawayDetail?id=' +
-					 + item.masterId 
+						item.masterId +
-					 + '&status=' + item.status
+						'&status=' + item.status +
-					 +'&scaned='+item.packingNumber
+						'&scaned=' + item.packingNumber +
-					 + '&title='+this.title
+						'&title=' + this.title +
-					 +"&scanMessage="+this.scanMessage
+						"&scanMessage=" + this.scanMessage
 				});
 				this.scanMessage = ""
 			},
@@ -332,13 +334,13 @@ import { Exception } from 'sass';
 					this.scanMessage = ""
 					var filters = [{
 							column: "packingNumber",
-							action: "==",
+							action: "in",
-							value: result.label.packingNumber
+							value: result.package.number + "," + result.package.parentNumber
 						},
 						{
 							column: "batch",
 							action: "==",
-							value: result.label.batch
+							value: result.package.batch
 						},
 						// {
 						// 	column: "qty",
@@ -348,12 +350,12 @@ import { Exception } from 'sass';
 						{
 							column: "itemCode",
 							action: "==",
-							value: result.label.itemCode
+							value: result.package.itemCode
 						},
 						{
 							column: "status",
 							action: "in",
-							value: '1,2,3',
+							value: '1,2',
 						},
 						// {
 						// 	column: "accept_user_id",
@@ -393,10 +395,12 @@ import { Exception } from 'sass';
 									if (list[0].acceptUserId == this.$store.state.user.id) {
 										this.selectItem(list[0])
 									} else {
-										 this.showMessage("该任务已经被["+list[0].acceptUserName+"]承接"+"<br>任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
+										this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "<br>任务号[" +
+											list[0].number + "]扫描[" + result.scanMessage + "]")
 									}
 								} else if (list[0].status == 3) {
-									  this.showMessage("该任务已经完成<br>承接人["+list[0].acceptUserName+"]<br>任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
+									this.showMessage("该任务已经完成<br>承接人[" + list[0].acceptUserName + "]<br>任务号[" +
+										list[0].number + "]扫描[" + result.scanMessage + "]")
 								}
 							} else {
 								this.showMessage("查询到多条任务<br>" + "扫描[" + result.scanMessage + "]")