diff --git a/src/api/request2.js b/src/api/request2.js
index 8d95d217..9cecc192 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4149,3 +4149,14 @@ export function isCheckMesCode(code) {
data: {},
});
}
+
+/**
+ * 获取上架任务打印明细
+ * @param {*}
+ */
+export function getJimuPutawayJobDetail(ids) {
+ return request({
+ url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA?masterIds="+ids,
+ method: "get",
+ });
+}
diff --git a/src/hybrid/html/pointPutawayJob.html b/src/hybrid/html/pointPutawayJob.html
new file mode 100644
index 00000000..4b675aeb
--- /dev/null
+++ b/src/hybrid/html/pointPutawayJob.html
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+ mainBody
+
+
+
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 4915d014..ec171383 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2059,6 +2059,12 @@
"navigationBarTitleText": "打印",
"enablePullDownRefresh": false
}
+ },{
+ "path": "pages/pointPutawayJob/index",
+ "style": {
+ "navigationBarTitleText": "打印",
+ "enablePullDownRefresh": false
+ }
},
{
"path": "pages/print/index",
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
new file mode 100644
index 00000000..7147a978
--- /dev/null
+++ b/src/pages/pointPutawayJob/index.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+ 目标库位：{{data.toLocationCode}}
+
+
+ 任务编号：{{data.number}}
+
+
+ 创建人：{{data.creator||''}}
+
+
+ 创建时间：{{data.createTime}}
+
+
+
+
+ 物品代码
+ 物品描述
+ 批次
+ 包装号
+ 包装规格
+ 数量
+ 计量单位
+
+
+ {{cur.itemCode}}
+ {{cur.itemDesc1}}
+ {{cur.batch}}
+ {{cur.packingNumber}}
+ {{cur.packUnit}}
+ {{cur.packQty}}
+ {{cur.uom}}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 536141d0..0ee548a5 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -64,7 +64,8 @@
purchaseReceiptJobSubmit,
getPurchaseReceiptJobDetail,
takePurchaseReceiptJob,
- cancleTakePurchaseReceiptJob
+ cancleTakePurchaseReceiptJob,
+ getPutawayJobList
} from '@/api/request2.js';
import {
@@ -451,12 +452,53 @@
if (res.success) {
this.managementList = res.list;
var params = this.setParams()
- console.log("提交参数", JSON.stringify(params));
-
purchaseReceiptJobSubmit(params).then(res => {
- uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data)
+ // this.showCommitSuccessMessage("提交成功
生成采购收货记录
将跳转到打印页面
" + res.data)
+ uni.showLoading({
+ title: "提交成功,将跳转到打印页面",
+ mask: true
+ });
+ // 获取上架任务
+ let timerCount = 0
+ const timer1 = setInterval(async ()=>{
+ if(timerCount == 10){
+ clearInterval(timer1)
+ uni.showLoading({
+ title: "跳转打印页面失败",
+ mask: true
+ });
+ return;
+ }
+ await getPutawayJobList({
+ filters: [{
+ column: "purchaseReceiptRecordNumber",
+ action: "in",
+ value: res.data
+ }],
+ pageNo: 1,
+ pageSize: 1000,
+ }).then(res=>{
+ timerCount = timerCount + 1
+ console.log(11111)
+ if(res.data && res.data.list&&res.data.list.length){
+ uni.hideLoading()
+ clearInterval(timer1)
+ const dataParams = {
+ toLocationCode: res.data.list[0].toLocationCode,
+ number: res.data.list[0].number,
+ creator: res.data.list[0].creator,
+ createTime: res.data.list[0].createTime,
+ ids : res.data.list.map(item=>item.masterId).join(',')
+ }
+ console.log(dataParams)
+ uni.navigateTo({
+ url:'/pages/pointPutawayJob/index?data='+encodeURIComponent(JSON.stringify(dataParams))
+ })
+ }
+ })
+ },1000)
+
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -611,7 +653,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
- navigateBack(1)
+ // navigateBack(1)
})
},
}