翻包打印 2024/6/15 14:17:06没改完

src/pages/package/job/overPackageJobDetail.vue

@@ -230,13 +230,17 @@ const submitJob = () => {
         const list = []
         res.data.forEach((item) => {
           list.push({
-            itemNumber: item.itemCode, // 物品代码
+            itemCode: item.itemCode, // 物品代码
             itemName: item.itemName, // 物品名称
-            referenceOrderRow: item.poLine, // 订单行
+            packName: item.packName, // 包装名称
-            referenceOrderCode: item.poNumber, // 订单号
-            supplierCode: item.supplierCode, // 供应商
             packageCode: item.number, // 包装号
-            amount: item.qty, // 数量
+            batch: item.batch, // 批次
+            parentNumber: item.parentNumber, // 父包装号
+            itemType: item.itemType, // 物料类型
+            asnNumber: item.asnNumber, // ASN
+            supplierCode: item.supplierCode, // 供应商
+            qty: item.qty, // 数量
+            printTimes: getCurrDateTime(), // 打印时间
             barcodeString: item.barcodeString, // 标签信息
             barcodeBase64: ''
           })

src/pages/pointProductReceipt/index.vue

@@ -12,8 +12,8 @@
 					<view class="value" id="name2">{{item.itemName}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">物料描述</view>
+					<view class="label">包装名称</view>
-					<view class="value">{{item.itemDesc1}}</view>
+					<view class="value">{{item.packName}}</view>
 				</view>
 				<view class="left-item">
 					<view class="label">包装号</view>
@@ -37,8 +37,8 @@
 					<view class="value">{{item.batch}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">班次</view>
+					<view class="label">物料类型</view>
-					<view class="value">{{item.shiftCode}}</view>
+					<view class="value">{{item.itemType}}</view>
 				</view>
 				<view class="left-item">
 					<view class="label">打印时间</view>
@@ -116,20 +116,20 @@
 												<div class="value" id="name2">${item.itemName}</div>
 											</div>
 											<view class="left-item">
-												<view class="label">物料描述</view>
+												<view class="label">包装名称</view>
-												<view class="value">{{item.itemDesc1}}</view>
+												<view class="value">${item.packName}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">包装号</view>
-												<view class="value">{{item.relateNumber}}</view>
+												<view class="value">${item.relateNumber}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">生产线</view>
-												<view class="value">{{item.productionLineCode}}</view>
+												<view class="value">${item.productionLineCode}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">数量</view>
-												<view class="value">{{item.qty}}</view>
+												<view class="value">${item.qty}</view>
 											</view>
 										</div>
 										<div class="right">
@@ -138,15 +138,15 @@
 											</div>
 											<view class="left-item">
 												<view class="label">批次</view>
-												<view class="value">{{item.batch}}</view>
+												<view class="value">${item.batch}</view>
 											</view>
 											<view class="left-item">
-												<view class="label">班次</view>
+												<view class="label">物料类型</view>
-												<view class="value">{{item.shiftCode}}</view>
+												<view class="value">${item.itemType}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">打印时间</view>
-												<view class="value">{{item.printTimes}}</view>
+												<view class="value">${item.printTimes}</view>
 											</view>
 										</div>
 									</div>`

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -157,7 +157,10 @@ const getDetail = () => {
         detailSource.value = getDataSource(subList.value)
         detailSource.value.forEach((r) => {
           r.subList.forEach((s) => {
-            if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) s.scaned = true
+            if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) {
+              s.scaned = true
+              s.handleQty = s.qty
+            }
           })
         })
         toLocationAreaTypeList.value = getLocationTypeArray(jobContent.value.toAreaTypes)

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -67,9 +67,9 @@ import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 import { Decimal } from 'decimal.js' // 引入
 import { getManagementPrecisions } from '@/common/balance.js'
+import { getCurrDateTime, goHome, navigateBack, getPackingNumberAndBatch, getSwitchInfoByCode } from '@/common/basic.js'
 
 import { getProductReceiptJobDetail, takeProductReceiptJob, cancleTakeProductReceiptJob, productReceiptJobsubmit, getPrintProductReceiptList, getBalanceToPackage, batchPrintingLable } from '@/api/request2.js'
-import { goHome, navigateBack, getPackingNumberAndBatch, getSwitchInfoByCode } from '@/common/basic.js'
 
 import { getDirectoryItemArray, getInventoryStatusName } from '@/common/directory.js'
 
@@ -324,7 +324,7 @@ const print = () => {
           productionLineCode: item.productionLineCode || '', // 生产线
           shiftCode: item.shiftCode || '', // 班次
           qty: item.qty || '', // 数量
-          printTimes: item.printTimes || '' // 打印时间
+          printTimes: getCurrDateTime() // 打印时间
         })
       })
       uni.navigateTo({