diff --git a/api/request2.js b/api/request2.js
index ec1504c5..04a61954 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1128,7 +1128,7 @@ export function cancleTakeInventoryMoveJob(id) {
*/
export function inventoryMoveSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+ url: baseApi + "/wms/inventorymove-job-main/execute",
method: "put",
data: params,
});
diff --git a/common/basic.js b/common/basic.js
index f3507b2a..cf6d9492 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -640,6 +640,7 @@ export function getPackingNumberAndBatch(managementList, itemCode, packingNumber
packingNumber: "",
batch: ""
}
+ debugger
var manageType = queryManageModel(managementList, itemCode)
if (manageType == "BY_QUANTITY") {
diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue
index d285e4de..4d48354c 100644
--- a/mycomponents/balance/balance.vue
+++ b/mycomponents/balance/balance.vue
@@ -108,7 +108,6 @@
)
},
isDevlement(){
-
return getApp().globalData.isDevelopment;
}
}
diff --git a/pages/inventoryMove/coms/comInventoryJobCard.vue b/pages/inventoryMove/coms/comInventoryJobCard.vue
index 81e61e52..98946e3d 100644
--- a/pages/inventoryMove/coms/comInventoryJobCard.vue
+++ b/pages/inventoryMove/coms/comInventoryJobCard.vue
@@ -3,19 +3,7 @@
- 物品代码 : {{dataContent.itemCode}}
-
-
-
-
-
- 来源库位 : {{dataContent.fromLocationCode}}
-
-
-
-
-
- 目标库位 : {{dataContent.toLocationCode}}
+ 申请单号 : {{dataContent.requestNumber}}
diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue
index 5b753044..ec3bc81b 100644
--- a/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -1,5 +1,14 @@
+
@@ -63,7 +72,7 @@
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
-
+ import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
@@ -75,7 +84,8 @@
requiredLocation,
comMessage,
winScanPackAndLocation,
- detailInfoPopup
+ detailInfoPopup,
+ jobTop
},
data() {
return {
@@ -256,11 +266,11 @@
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
- ']不一致,是否继续上架?', res => {
+ ']不一致,是否继续转移?', res => {
if (res) {
itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
- .qty) ? Number(result.balance.qty) : Number(result.label.qty);
+ itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -272,8 +282,8 @@
});
} else {
itemDetail.scaned = true;
- itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
- .qty) ? Number(result.balance.qty) : Number(result.label.qty);
+ itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -324,21 +334,35 @@
title: "提交中....",
mask: true
});
-
+ this.managementList = [];
+ //查询管理模式
+ // this.detailSource.forEach(item => {
+ // item.subList.forEach(detail => {
+ // if (detail.scaned) {
+ // getManagementPrecisions(item.itemCode,detail.toLocationCode,res=>{
+ // if (res.success) {
+ // this.managementList = this.managementList.concat(res.list)
+
+ // }
+ // })
+ // }
+ // })
+ // })
+
var params = this.setParams();
console.log("提交" + JSON.stringify(params))
- // inventoryMoveSubmit(params).then(res => {
- // uni.hideLoading()
- // if (res.data) {
- // this.showCommitSuccessMessage("提交成功
生成库存转移记录" + res.data)
- // } else {
- // this.showErrorMessage("提交失败[" + res.msg + "]")
- // }
- // }).catch(error => {
- // uni.hideLoading()
- // this.showErrorMessage(error)
- // })
+ inventoryMoveSubmit(params).then(res => {
+ uni.hideLoading()
+ if (res.data) {
+ this.showCommitSuccessMessage("提交成功
生成库存转移记录
" + res.data)
+ } else {
+ this.showErrorMessage("提交失败[" + res.msg + "]")
+ }
+ }).catch(error => {
+ uni.hideLoading()
+ this.showErrorMessage(error)
+ })
},
setParams() {
@@ -348,6 +372,13 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
+ // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+ // detail.packingNumber, detail.batch);
+ detail.toPackingNumber = detail.packingNumber;
+ detail.toBatch = detail.batch;
+ detail.toContainerNumber = '';
+
+ detail.toLocationCode = detail.toLocationCode;
subList.push(detail)
}
})
@@ -419,6 +450,7 @@
navigateBack(1)
})
},
+
}
}
diff --git a/static/config.json b/static/config.json
index ca9215a5..d9759fe0 100644
--- a/static/config.json
+++ b/static/config.json
@@ -35,7 +35,7 @@
"isDevelopment": {
"name": "isDevelopment",
"value": true,
- "desc": "是否是开发模式,true是开模式,false不是开发模式"
+ "desc": "是否是开发模式,true是开发模式,false不是开发模式"
}