sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改返回列表

wms3.0_pda
lijuncheng 12 months ago
parent
e90c330c77
commit
7169af26b3
12 changed files with 77 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      api/request2.js
  2. 1
      common/basic.js
  3. 6
      pages/inspect/job/inspectDetail.vue
  4. 4
      pages/inspect/job/inspectResult.vue
  5. 16
      pages/productionReturn/coms/comReturnJobCard.vue
  6. 80
      pages/productionReturn/job/returnDetail.vue
  7. 17
      pages/purchaseReceipt/job/receiptDetail.vue
  8. 5
      pages/purchaseReturn/job/returnDetail.vue
  9. 7
      pages/purchaseReturn/record/returnRecord.vue
  10. 5
      pages/putaway/job/putawayDetail.vue
  11. 2
      static/config.json

6
api/request2.js
View File

@ -2234,7 +2234,7 @@ export function getProductionReturnJobDetail(id) {
*/ */
export function takeProductionReturnJob(id) { export function takeProductionReturnJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, url: baseApi + "/wms/productionreturn-job-main/accept?id=" + id,
method: "put", method: "put",
data: {}, data: {},
}); });
@ -2247,7 +2247,7 @@ export function takeProductionReturnJob(id) {
*/ */
export function cancleTakeProductionReturnJob(id) { export function cancleTakeProductionReturnJob(id) {
return request({ return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, url: baseApi + "/wms/productionreturn-job-main/abandon?id=" + id,
method: "put", method: "put",
data: {}, data: {},
}); });
@ -2260,7 +2260,7 @@ export function cancleTakeProductionReturnJob(id) {
*/ */
export function productionReturnJobSubmit(params) { export function productionReturnJobSubmit(params) {
return request({ return request({
url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit", url: baseApi + "/wms/productionreturn-job-main/execute",
method: "put", method: "put",
data: params, data: params,
}); });

1
common/basic.js
View File

@ -882,7 +882,6 @@ export function clearTirmAndWrap(content) {
export function navigateBack(backIndex) { export function navigateBack(backIndex) {
let canNavBack = getCurrentPages() let canNavBack = getCurrentPages()
console.log("返回",canNavBack.length )
if (canNavBack && canNavBack.length - 1 > backIndex) { if (canNavBack && canNavBack.length - 1 > backIndex) {
uni.navigateBack({ uni.navigateBack({
delta: backIndex delta: backIndex

6
pages/inspect/job/inspectDetail.vue
View File

@ -313,12 +313,8 @@
this.showErrorMessage(e.message); this.showErrorMessage(e.message);
} }
}, },
commit(){
this.showCommitSuccessMessage("提交成功")
},
commits() {
commit() {
this.scanCount = getScanCount(this.subList); this.scanCount = getScanCount(this.subList);
if (this.scanCount == 0) { if (this.scanCount == 0) {
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")

4
pages/inspect/job/inspectResult.vue
View File

@ -383,7 +383,7 @@
} else { } else {
//报废数大于0，进入详情 //报废数大于0，进入详情
//进入下一页面 //进入下一页面
uni.redirectTo({ uni.navigateTo({
url: './inspectDetail?id=' + this.id + url: './inspectDetail?id=' + this.id +
'&status=' + this.status + '&status=' + this.status +
'&failedQty=' + this.jobContent.failedQty + '&failedQty=' + this.jobContent.failedQty +
@ -420,7 +420,7 @@
//部分合格 //部分合格
} else if (this.nextAction == "PARTIAL_OK") { } else if (this.nextAction == "PARTIAL_OK") {
//进入下一页面 //进入下一页面
uni.redirectTo({ uni.navigateTo({
url: './inspectDetail?id=' + this.id + url: './inspectDetail?id=' + this.id +
'&status=' + this.status + '&status=' + this.status +
'&failedQty=' + this.jobContent.failedQty + '&failedQty=' + this.jobContent.failedQty +

16
pages/productionReturn/coms/comReturnJobCard.vue
View File

@ -9,15 +9,10 @@
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
物品代码 : {{dataContent.itemCode}} 业务类型 : {{getBusinessTypeName(dataContent.businessType)}}
</view> </view>
</view> </view>
<view class="task_text">
<view class="">
目标库位 : {{dataContent.toLocationCode}}
</view>
</view>
</view> </view>
</job-com-main-card> </job-com-main-card>
</template> </template>
@ -40,9 +35,18 @@
}, },
methods: { methods: {
getBusinessTypeName(value) {
var name = "";
if (value == 'ReturnToStore') {
name = "合格退料"
} else if (value == 'ReturnToHold') {
name = "隔离退料"
}
return name;
} }
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">

80
pages/productionReturn/job/returnDetail.vue
View File

@ -15,13 +15,13 @@
</view> </view>
<view class="page-footer"> <view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation==1" <requiredLocation title="目标库位" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> :isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -37,7 +37,6 @@
</template> </template>
<script> <script>
import { import {
getProductionReturnJobDetail, getProductionReturnJobDetail,
productionReturnJobSubmit, productionReturnJobSubmit,
@ -105,15 +104,14 @@
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
// //新建的任务自动接收 // //新建的任务自动接收
// if (option.status == "JOB_PENDING") { if (option.status == "1") {
// this.receive((callback => { this.receive((callback => {
// this.received = true; this.received = true;
// this.getDetail();
// }));
// } else {
// this.getDetail();
// }
this.getDetail(); this.getDetail();
}));
} else {
this.getDetail();
}
} }
}, },
//返回首页 //返回首页
@ -268,11 +266,11 @@
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
itemDetail.scaned = true; 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.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty =result.package.stdPackQty itemDetail.balance.stdPackQty = result.package.stdPackQty
itemDetail.balance.stdPackUnit =result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} else { } else {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
@ -280,11 +278,11 @@
}); });
} else { } else {
itemDetail.scaned = true; 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.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty =result.package.stdPackQty itemDetail.balance.stdPackQty = result.package.stdPackQty
itemDetail.balance.stdPackUnit =result.package.stdPackUnit itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty(); this.calcHandleQty();
} }
} }
@ -337,7 +335,7 @@
} }
}, },
async submitJob() { submitJob() {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: "提交中....",
mask: true mask: true
@ -356,21 +354,19 @@
if (res.success) { if (res.success) {
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams() var params = this.setParams()
console.log("提交参数",JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
// productionReturnJobSubmit(this.id, params).then(res => { productionReturnJobSubmit(params).then(res => {
// uni.hideLoading() uni.hideLoading()
// if (res.data) { if (res.data) {
// var hint = res.data.Number; this.showCommitSuccessMessage("提交成功<br>生成生产退料记录:" + res.data)
// this.showCommitSuccessMessage("提交成功" + hint) } else {
this.showErrorMessage("提交失败[" + res.msg + "]")
// } else { }
// this.showErrorMessage("提交失败[" + res.msg + "]") }).catch(error => {
// } uni.hideLoading()
// }).catch(error => { this.showErrorMessage(error)
// uni.hideLoading() })
// this.showErrorMessage(error)
// })
} else { } else {
uni.hideLoading(); uni.hideLoading();
this.showErrorMessage(res.message); this.showErrorMessage(res.message);
@ -387,20 +383,23 @@
if (detail.scaned) { if (detail.scaned) {
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch); detail.packingNumber, detail.batch);
detail.toPackingNumber =info.packingNumber; detail.toPackingNumber = detail.packingNumber;
detail.toBatch =info.batch; detail.toContainerNumber = detail.containerNumber;
detail.toBatch = detail.batch;
detail.toLocationCode = detail.toLocationCode;
subList.push(detail) subList.push(detail)
} }
}) })
}) })
this.jobContent.subList = subList this.jobContent.subList = subList
this.jobContent.creator =creator; this.jobContent.creator = creator;
return this.jobContent; return this.jobContent;
}, },
checkLocation() { checkLocation() {
var isPass = true; var isPass = true;
if (this.toLocationCode == ""||this.toLocationCode == null) { if (this.toLocationCode == "" || this.toLocationCode == null) {
this.showMessageHint('请扫描收货库位', callback => { this.showMessageHint('请扫描收货库位', callback => {
this.$refs.comScanLocation.showLocation(); this.$refs.comScanLocation.showLocation();
}) })
@ -463,13 +462,10 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
})
setTimeout(() => {
uni.navigateTo({ uni.navigateTo({
url: './returnJob' url: './returnJob'
}) })
}, 3000) })
}, },
} }
} }

17
pages/purchaseReceipt/job/receiptDetail.vue
View File

@ -46,7 +46,8 @@
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
updateTitle, updateTitle,
compareAsc compareAsc,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -417,21 +418,9 @@
}, },
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//点关闭直接返回列表
uni.hideLoading();
},
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({ navigateBack(1)
url: './receiptJob'
})
}) })
}, },
} }

5
pages/purchaseReturn/job/returnDetail.vue
View File

@ -53,6 +53,7 @@
goHome, goHome,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getInventoryStatusName getInventoryStatusName
@ -419,9 +420,7 @@
showCommitSuccessMessage(number) { showCommitSuccessMessage(number) {
this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => { this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
uni.navigateTo({ navigateBack()
url: './returnJob'
})
}) })
} }
} }

7
pages/purchaseReturn/record/returnRecord.vue
View File

@ -44,7 +44,8 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle updateTitle,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -381,9 +382,7 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
if (this.fromType == "requestType") { if (this.fromType == "requestType") {
uni.navigateTo({ navigateBack(1)
url: '../request/issueRequest'
})
}else { }else {
//清空 //清空
this.subList = []; this.subList = [];

5
pages/putaway/job/putawayDetail.vue
View File

@ -54,6 +54,7 @@
goHome, goHome,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -499,9 +500,7 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({ navigateBack(1)
url: './putawayJob'
})
}) })
}, },
} }

2
static/config.json
View File

@ -18,7 +18,7 @@
"request_url": { "request_url": {
"name": "request_url", "name": "request_url",
"value": "http://dev.ccwin-in.com:25100/api/admin-api", "value": "http://192.168.0.230:12080/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api",
"chefang": "http://192.168.0.178:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api",

Write Preview
Loading…
Cancel
Save