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

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.72",
-    "versionCode" : 72,
+    "versionName" : "1.0.73",
+    "versionCode" : 73,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/package/coms/comScanPackagePack.vue

@@ -242,7 +242,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 							let record = batch.Records.find(r => r.packingNumber == packingCode);
 							if (record == undefined) {
 								//如果有推荐箱码
-								if (batch.Recommends.length > 0) {
+								if (batch.Recommends != undefined &&batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
 										that.addRecord(batch, label, balance, packageInfo)

src/pages/package/job/overPackageJobDetail.vue

@@ -235,6 +235,8 @@
 							that.detailSource = getDataSource(that.detailSource, that.subList)
 							if (this.scanMessage) {
 								this.openScanPopupSimulate(this.scanMessage);
+							}else {
+								this.openScanDetailPopup()
 							}
 							// this.$nextTick(() => {
 							// 	if (uni.getStorageSync('overPackageJobDetailPointParams')) {