From 4a414161a8e5377b624a02b4d831797c1f66fba6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 4 Sep 2024 15:53:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=9A=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=87=E7=AD=BE2024/7/1=2014:18:25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/job/overPackageJobDetail.vue      |   1 +
 .../package/record/overPackageRecord.vue      |   1 +
 src/pages/point/index.vue                     | 189 ++++++++++--------
 .../record/directRepleinshRecord.vue          |   5 +-
 4 files changed, 113 insertions(+), 83 deletions(-)

diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 4764736b..e31716e2 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -241,6 +241,7 @@ const submitJob = () => {
             supplierCode: item.supplierCode, // 供应商
             qty: item.qty, // 数量
             printTimes: getCurrDateTime(), // 打印时间
+            productionLineCode: item.productionLineCode, // 生产线
             barcodeString: item.barcodeString, // 标签信息
             barcodeBase64: ''
           })
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index ed1f0064..6b501166 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -310,6 +310,7 @@ const submitJob = () => {
           supplierCode: item.supplierCode, // 供应商
           qty: item.qty, // 数量
           printTimes: getCurrDateTime(), // 打印时间
+          productionLineCode: item.productionLineCode, // 生产线
           barcodeString: item.barcodeString, // 标签信息
           barcodeBase64: ''
         })
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 0f7858d5..cbb1bc09 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -19,39 +19,43 @@
 					<view class="label">包装号</view>
 					<view class="value">{{ item.packageCode }}</view>
 				</view>
+				<view class="left-item" v-if="item.productionLineCode&&item.productionLineCode.length>0">
+					<view class="label">生产线</view>
+					<view class="value">{{item.productionLineCode}}</view>
+				</view>
+				<view class="left-item" v-if="!(item.productionLineCode&&item.productionLineCode.length>0)">
+					<view class="label">父包装号</view>
+					<view class="value">{{item.parentNumber}}</view>
+				</view>
+				<view class="left-item" v-if="!(item.productionLineCode&&item.productionLineCode.length>0)">
+					<view class="label">ASN</view>
+					<view class="value">{{item.asnNumber}}</view>
+				</view>
 				<view class="left-item">
-									<view class="label">父包装号</view>
-									<view class="value">{{item.parentNumber}}</view>
-								</view>
-								<view class="left-item">
-									<view class="label">ASN</view>
-									<view class="value">{{item.asnNumber}}</view>
-								</view>
-								<view class="left-item">
-									<view class="label">数量</view>
-									<view class="value bold-font">{{item.qty}}</view>
-								</view>
+					<view class="label">数量</view>
+					<view class="value bold-font">{{item.qty}}</view>
+				</view>
 			</view>
 			<view class="right">
 				<view class="image">
 					<l-qrcode ref="qrcodeRef" :value="item.barcodeString" size="300rpx"></l-qrcode>
 				</view>
 				<view class="left-item">
-									<view class="label">批次</view>
-									<view class="value">{{item.batch}}</view>
-								</view>
-								<view class="left-item">
-									<view class="label">物料类型</view>
-									<view class="value">{{item.itemType}}</view>
-								</view>
-								<view class="left-item">
-									<view class="label">供应商</view>
-									<view class="value">{{item.supplierCode}}</view>
-								</view>
-								<view class="left-item">
-									<view class="label">打印时间</view>
-									<view class="value">{{item.printTimes}}</view>
-								</view>
+					<view class="label">批次</view>
+					<view class="value">{{item.batch}}</view>
+				</view>
+				<view class="left-item">
+					<view class="label">物料类型</view>
+					<view class="value">{{item.itemType}}</view>
+				</view>
+				<view class="left-item" v-if="!(item.productionLineCode&&item.productionLineCode.length>0)">
+					<view class="label">供应商</view>
+					<view class="value">{{item.supplierCode}}</view>
+				</view>
+				<view class="left-item">
+					<view class="label">打印时间</view>
+					<view class="value">{{item.printTimes}}</view>
+				</view>
 			</view>
 		</view>
 		<view class="" style="position: fixed; width: 100%; bottom: 0rpx; left: 0px">
@@ -74,7 +78,7 @@
 	const data = ref([])
 	const newHtmlContent = ref('') // 打印传入的html
 	const isLoadFinish = ref(false)
-	const qrcodeRef  =ref()
+	const qrcodeRef = ref()
 	// #ifdef APP
 	// 打印
 	const printImage = () => {
@@ -114,59 +118,80 @@
 				readFile(htmlFileUrl, (htmlContent) => {
 					newHtmlContent.value = htmlContent
 					data.value.forEach((item) => {
-						str += `<div class="box" style="page-break-before:always;"><br />
-										<div class="left">
-											<div class="left-item">
-												<div class="label">物品代码</div>
-												<div class="value bold-font" id="name1">${item.itemCode}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">物品名称</div>
-												<div class="value" id="name2">${item.itemName}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">包装名称</div>
-												<div class="value">${item.packName}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">包装号</div>
-												<div class="value">${item.packageCode}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">父包装号</div>
-												<div class="value">${item.parentNumber}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">ASN</div>
-												<div class="value">${item.asnNumber}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">数量</div>
-												<div class="value bold-font">${item.qty}</div>
-											</div>
-										</div>
-										<div class="right">
-											<div class="image">
-												<img id='image1' src="${item.barcodeBase64}" alt="" />
-											</div>
-											<div class="left-item">
-												<div class="label">批次</div>
-												<div class="value">${item.batch}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">物料类型</div>
-												<div class="value">${item.itemType}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">供应商</div>
-												<div class="value">${item.supplierCode}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">打印时间</div>
-												<div class="value">${item.printTimes}</div>
-											</div>
-										</div>
-									</div>`
+						str += `
+							<div class="box" style="page-break-before:always;"><br />
+								<div class="left">
+									<div class="left-item">
+										<div class="label">物品代码</div>
+										<div class="value bold-font" id="name1">${item.itemCode}</div>
+									</div>
+									<div class="left-item">
+										<div class="label">物品名称</div>
+										<div class="value" id="name2">${item.itemName}</div>
+									</div>
+									<div class="left-item">
+										<div class="label">包装名称</div>
+										<div class="value">${item.packName}</div>
+									</div>
+									<div class="left-item">
+										<div class="label">包装号</div>
+										<div class="value">${item.packageCode}</div>
+									</div>
+						`
+						if (item.productionLineCode && item.productionLineCode.length > 0) {
+							str += `
+								<div class="left-item">
+									<div class="label">生产线</div>
+										<div class="value">${item.productionLineCode}</div>
+									</div>
+							`
+						} else {
+							str += `
+								<div class="left-item">
+									<div class="label">父包装号</div>
+									<div class="value">${item.parentNumber}</div>
+								</div>
+								<div class="left-item">
+									<div class="label">ASN</div>
+									<div class="value">${item.asnNumber}</div>
+								</div>
+							`
+						}
+						str += `
+								<div class="left-item">
+									<div class="label">数量</div>
+									<div class="value bold-font">${item.qty}</div>
+								</div>
+							</div>
+							<div class="right">
+								<div class="image">
+									<img id='image1' src="${item.barcodeBase64}" alt="" />
+								</div>
+								<div class="left-item">
+									<div class="label">批次</div>
+									<div class="value">${item.batch}</div>
+								</div>
+								<div class="left-item">
+									<div class="label">物料类型</div>
+									<div class="value">${item.itemType}</div>
+								</div>
+							`
+						if (!(item.productionLineCode && item.productionLineCode.length > 0)) {
+							str += `
+								<div class="left-item">
+									<div class="label">供应商</div>
+									<div class="value">${item.supplierCode}</div>
+								</div>
+							`
+						}
+						str += `
+								<div class="left-item">
+									<div class="label">打印时间</div>
+									<div class="value">${item.printTimes}</div>
+								</div>
+							</div>
+						</div>
+						`
 					})
 					newHtmlContent.value = newHtmlContent.value.replace('mainBody', str) // 替换物品代码
 				})
@@ -258,10 +283,12 @@
 	.left-item {
 		display: flex;
 	}
-	.bold-font{
+
+	.bold-font {
 		font-weight: bold;
 		font-size: 28rpx;
 	}
+
 	.label {
 		border-bottom: 1px solid #b1b1b1;
 		border-right: 1px solid #b1b1b1;
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index 1ad312d3..46eb59ae 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -96,6 +96,7 @@ onLoad((option) => {
   getBusinessType(businessTypeCode.value, (res) => {
     if (res.success) {
       businessType.value = res.businessType
+      res.fromLocationAreaTypeList.push('INSPECT', 'SUPPER')
       fromLocationAreaTypeList.value = res.fromLocationAreaTypeList
       toLocationAreaTypeList.value = res.toLocationAreaTypeList
       showFromLocationPopup()
@@ -257,7 +258,7 @@ const afterGetBalance = (result) => {
     calcHandleQty(detailSource.value)
   } else {
     const detail = item.subList.find((r) => {
-      if (r.packingNumber == balance.packingNumber && r.batch == balance.batch && r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
+      if (r.packingNumber == pack.packingNumber && r.batch == balance.batch && r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
         return r
       }
     })
@@ -272,7 +273,7 @@ const afterGetBalance = (result) => {
       item.subList.push(newDetail)
       calcHandleQty(detailSource.value)
     } else if (detail.scaned == true) {
-      showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)
+      showErrorMessage(`箱码[${detail.packingNumber}]批次[${balance.batch}]已经在列表中`)
     }
   }
 }