bug 修复 2024/6/21 10:05:16

src/mycomponents/job/jobFilter.vue

@@ -17,7 +17,7 @@
       </view>
       <view v-if="isShowFromLocationCode" class="uni-flex space-between u-col-center" style="width: 100%; margin-top: 30rpx">
         <view class="" style="font-size: 32rpx"> 来源库位 </view>
-        <u-input style="margin-left: 20rpx" v-model="fromLocationCode" :border="true" placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
+        <u-input type="textarea" style="margin-left: 20rpx" v-model="fromLocationCode" :border="true" placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
       </view>
       <view class="">
         <view class="uni-flex u-row-center" style="margin-top: 30rpx" v-if="isShowAsn">

src/pages/issue/coms/comScanIssuePack.vue

@@ -430,10 +430,14 @@ const remove = (record, index) => {
 }
 
 const packGetFocus = () => {
-  comscan.value.getfocus()
+  if (comscan.value) {
+    comscan.value.getfocus()
+  }
 }
 const packLoseFocus = () => {
-  comscan.value.losefocus()
+  if (comscan.value) {
+    comscan.value.losefocus()
+  }
 }
 const showMessage = (message, callback) => {
   setTimeout((r) => {

src/pages/issue/job/issueJob.vue

@@ -340,7 +340,7 @@ const getScanResult = (result) => {
           if (list.length > 1) {
             jobListRef.value.openList(list)
           } else {
-            selectItem(list[0], scanMessage)
+            selectItem(list[0])
           }
         } else {
           showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务`)

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -332,7 +332,7 @@ const print = () => {
           printTimes: getCurrDateTime() // 打印时间
         })
       })
-      uni.navigateTo({
+      uni.redirectTo({
         url: `/pages/pointProductReceipt/index?points=${JSON.stringify(pointData)}`
       })
     })
@@ -360,7 +360,7 @@ const getH5BatchPrintingLable = (number) => {
       token: storage.getStorage(storage.constant.token),
       asn_number: resLable.data
     }
-    uni.navigateTo({
+    uni.redirectTo({
       url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
     })
   })

src/pages/productionReceipt/job/productionReceiptDetail.vue

@@ -351,33 +351,21 @@ const showMessageHint = (hint, callback) => {
 const submitJob = () => {
   proxy.$modal.loading('提交中....')
   const itemCodes = []
-  detailSource.value.forEach((item) => {
-    itemCodes.push(item.itemCode)
-  })
-
-  getManagementPrecisions(itemCodes, toLocationCode.value, (res) => {
-    if (res.success) {
-      managementList.value = res.list
-      const params = setParams()
-
-      productionReceiptJobSubmit(params)
-        .then((res) => {
-          uni.hideLoading()
-          if (res.data) {
-            showCommitSuccessMessage(`提交成功<br>生成发料接收记录<br>${res.data}`)
-          } else {
-            showErrorMessage(`提交失败[${res.msg}]`)
-          }
-        })
-        .catch((error) => {
-          uni.hideLoading()
-          showErrorMessage(error)
-        })
-    } else {
+  const params = setParams()
+  console.log('提交参数', JSON.stringify(params))
+  productionReceiptJobSubmit(params)
+    .then((res) => {
       uni.hideLoading()
-      showErrorMessage(res.message)
-    }
-  })
+      if (res.data) {
+        showCommitSuccessMessage(`提交成功<br>生成发料接收记录<br>${res.data}`)
+      } else {
+        showErrorMessage(`提交失败[${res.msg}]`)
+      }
+    })
+    .catch((error) => {
+      uni.hideLoading()
+      showErrorMessage(error)
+    })
 }
 const setParams = () => {
   const subList = []
@@ -386,9 +374,9 @@ const setParams = () => {
   detailSource.value.forEach((item) => {
     item.subList.forEach((detail) => {
       if (detail.scaned) {
-        const info = getPackingNumberAndBatch(managementList.value, detail.itemCode, detail.packingNumber, detail.batch)
-        detail.toPackingNumber = info.packingNumber
-        detail.toBatch = info.batch
+        // const info = getPackingNumberAndBatch(managementList.value, detail.itemCode, detail.packingNumber, detail.batch)
+        detail.toPackingNumber = detail.packingNumber
+        detail.toBatch = detail.batch
         detail.toContainerNumber = ''
         detail.toLocationCode = toLocationCode.value
         subList.push(detail)

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -275,6 +275,10 @@ const selectItem = (item) => {
 }
 
 const getScanResult = (result) => {
+  if (result.scanMessage.indexOf('ASN') > -1) {
+    showMessage('请扫描箱标签')
+    return
+  }
   try {
     let filters = []
     if (result.label.barType == 'BarCode') {