Browse Source

修改调拨出库

wms3.0_pda
lijuncheng 12 months ago
parent
commit
42f69360b2
  1. 37
      api/request2.js
  2. 39
      pages.json
  3. 2
      pages/index/index.vue
  4. 2
      pages/login/index.vue
  5. 17
      pages/productionReturn/coms/comReturnRequestCreator.vue
  6. 6
      pages/transfer/coms/comTransferJobCard.vue
  7. 99
      pages/transfer/job/issueDetail.vue
  8. 4
      pages/transfer/job/issueJob.vue
  9. 44
      pages/transfer/job/receiptDetail.vue
  10. 4
      pages/transfer/job/receiptJob.vue
  11. 25
      pages/unPlanned/job/issueJobDetail.vue
  12. 8
      pages/unPlanned/request/issueRequestCreate.vue
  13. 8
      pages/unPlanned/request/receiptRequestCreate.vue
  14. 2
      static/config.json

37
api/request2.js

@ -1323,38 +1323,38 @@ export function getUnPlannedIssueJobDetail(id) {
}
/**
* 计划外出库 承接
* 计划外出库任务 承接
* @param {*} id
*
*/
export function takeUnPlannedIssueJob(id) {
return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
url: baseApi + "/wms/unplannedissue-job-main/accept?id=" + id,
method: "put",
data: {},
});
}
/**
* 计划外出库 放弃承接
* 计划外出库任务 放弃承接
* @param {*} id
*
*/
export function cancleTakeUnPlannedIssueJob(id) {
return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
url: baseApi + "/wms/unplannedissue-job-main/abandon?id=" + id,
method: "put",
data: {},
});
}
/**
* 计划外出库 提交
* 计划外出库任务 提交
* @param {*} params
*/
export function unPlannedIssueJobSubmit(params) {
return request({
url: baseApi + "/magic-api/pda/job/purchasereturn/jobSubmit",
url: baseApi + "/wms/unplannedissue-job-main/abandon",
method: "put",
data: params,
});
@ -1911,13 +1911,13 @@ export function getTransferReceiptJobDetail(id) {
/**
* 调拨入库 承接
* 调拨入库任务 承接
* @param {*} id
*
*/
export function takeTransferReceiptJob(id) {
return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
url: baseApi + "/wms/transferreceipt-job-main/accept?id=" + id,
method: "put",
data: {},
});
@ -1930,7 +1930,7 @@ export function takeTransferReceiptJob(id) {
*/
export function cancleTakeTransferReceiptJob(id) {
return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
url: baseApi + "/wms/transferreceipt-job-main/abandon?id=" + id,
method: "put",
data: {},
});
@ -1938,13 +1938,13 @@ export function cancleTakeTransferReceiptJob(id) {
/**
* 调拨入库 任务提交
* 调拨入库任务 提交
* @param {*} 任务id
*
*/
export function transferReceiptJobSubmit(params) {
return request({
url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit",
url: baseApi + "/wms/transferreceipt-job-main/execute",
method: "put",
data: params,
});
@ -1993,40 +1993,40 @@ export function getTransferIssueJobDetail(id) {
}
/**
* 调拨出库 承接
* 调拨出库任务 承接
* @param {*} id
*
*/
export function takeTransferIssueJob(id) {
return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
url: baseApi + "/wms/transferissue-job-main/accept?id=" + id,
method: "put",
data: {},
});
}
/**
* 调拨出库 放弃承接
* 调拨出库任务 放弃承接
* @param {*} id
*
*/
export function cancleTakeTransferIssueJob(id) {
return request({
url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
url: baseApi + "/wms/transferissue-job-main/abandon?id=" + id,
method: "put",
data: {},
});
}
/**
* 调拨出库 任务提交
* 调拨出库任务 提交
* @param {*} 任务id
*
*/
export function transferIssueJobSubmit(params) {
return request({
url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
method: "post",
url: baseApi + "/wms/transferissue-job-main/execute",
method: "put",
data: params,
});
}
@ -2295,6 +2295,7 @@ export function getProductionReturnRequestDetail(id) {
});
}
/**
* 生产退料申请 处理
* @param {*} id

39
pages.json

@ -944,7 +944,7 @@
{
"path": "pages/transfer/job/receiptJob",
"style": {
"navigationBarTitleText": "调拨接收任务",
"navigationBarTitleText": "调拨入库任务",
"enablePullDownRefresh": true,
"titleNView": {
// "autoBackButton": "true",
@ -970,7 +970,7 @@
{
"path": "pages/transfer/job/receiptDetail",
"style": {
"navigationBarTitleText": "调拨接收详情",
"navigationBarTitleText": "调拨入库详情",
"enablePullDownRefresh": false
}
@ -978,14 +978,14 @@
{
"path": "pages/transfer/record/receiptRecord",
"style": {
"navigationBarTitleText": "调拨接收记录",
"navigationBarTitleText": "调拨入库记录",
"enablePullDownRefresh": true
}
},
{
"path": "pages/transfer/job/issueJob",
"style": {
"navigationBarTitleText": "调拨发货任务",
"navigationBarTitleText": "调拨出库任务",
"enablePullDownRefresh": true,
"titleNView": {
"buttons": [{
@ -1009,14 +1009,14 @@
{
"path": "pages/transfer/record/deliverRecord",
"style": {
"navigationBarTitleText": "调拨出记录",
"navigationBarTitleText": "调拨出记录",
"enablePullDownRefresh": true
}
},
{
"path": "pages/transfer/job/issueDetail",
"style": {
"navigationBarTitleText": "调拨出详细",
"navigationBarTitleText": "调拨出详细",
"enablePullDownRefresh": true
}
},
@ -1231,20 +1231,7 @@
}
},
//productPutawayDetail
// {
// "path": "test/winScanStandardTest",
// "style": {
// "navigationBarTitleText": "扫描控件测试",
// "enablePullDownRefresh": false
// }
// },
{
"path": "pages/unPlanned/job/receiptJob",
"style": {
@ -1314,6 +1301,13 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/unPlanned/request/receiptRequestCreate",
"style": {
"navigationBarTitleText": "计划外入库申请创建",
"enablePullDownRefresh": false
}
},
{
"path": "pages/unPlanned/job/issueJob",
@ -1383,6 +1377,13 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/unPlanned/request/issueRequestCreate",
"style": {
"navigationBarTitleText": "计划外出库申请创建",
"enablePullDownRefresh": false
}
},
{
"path": "pages/unPlanned/record/receiptRecord",

2
pages/index/index.vue

@ -272,7 +272,7 @@
types:["job_status","location_type","item_status","uom",
"inventory_status","container_type","pack_unit","unplanned_receipt_reason",
"unplanned_issue_reason","scrap_reason","inspect_failed_reason",
"request_status","inspect_type","next_action","sample_method"]
"request_status","inspect_type","next_action","sample_method","transfer_mode"]
}
getDictionaryItem(params).then(res => {
if (res.data.length > 0) {

2
pages/login/index.vue

@ -153,6 +153,8 @@
this.imageSrc = base64.replace(/[\r\n]/g, "")
this.uuid = res.data.uuid
}
}).catch(error=>{
this.showErrorMessage(error);
})
},
methods: {

17
pages/productionReturn/coms/comReturnRequestCreator.vue

@ -2,20 +2,8 @@
<view class="">
<uni-collapse ref="collapse">
<uni-collapse-item :open="true">
<template v-slot:title>
<view class="" style="font-size: 32rpx;">
<view class="" >
车间 : {{dataContent.workShopName}} ({{dataContent.workshopCode}})
</view>
<view class="" >
类型 : {{getType(dataContent.businessType)}}
</view>
<view class="">
总数量 : {{dataContent.totalQty}}
</view>
</view>
</template>
<com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="dataContent">
</com-issue-request-info>
<u-line />
<uni-swipe-action ref="swipeAction">
<view v-for="(item, index) in dataContent.subList" :key="index">
@ -59,6 +47,7 @@
<script>
import uom from '@/mycomponents/qty/uom.vue'
import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
export default {
components: {
uom

6
pages/transfer/coms/comTransferJobCard.vue

@ -6,12 +6,6 @@
申请单号 : {{dataContent.requestNumber}}
</view>
</view>
<view class="task_text">
<view class="">
物品代码 : {{dataContent.itemCode}}
</view>
</view>
</view>
</job-com-main-card>
</template>

99
pages/transfer/job/issueDetail.vue

@ -88,25 +88,23 @@
subList: [], //subList
detailSource: [], //
toLocationCode: "",
toLocationInfo: {},
businessTypeInfo: {},
locationTypeList: [],
managementList: []
managementList: [],
tolocationTypeList:[]
};
},
onLoad(option) {
this.id = option.id;
if (this.id != undefined) {
// //
// if (option.status == "JOB_PENDING") {
// this.receive((callback => {
// this.received = true;
// this.getDetail();
// }));
// } else {
// this.getDetail();
// }
this.getDetail();
if (option.status == "1") {
this.receive((callback => {
this.received = true;
this.getDetail();
}));
} else {
this.getDetail();
}
}
},
//
@ -179,7 +177,6 @@
that.fromLocationCode = that.subList[0].fromLocationCode
that.toLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.getLocationInfo(that.toLocationCode);
} else {
that.showMessage('列表数据为0');
}
@ -191,39 +188,6 @@
},
createItemInfo(res) {
let item = {
itemCode: res.itemCode,
itemName: res.itemName,
stdPackQty: res.stdPackQty,
stdPackUnit: res.stdPackUnit,
qty: res.qty,
handleQty: 0,
uom: res.uom,
subList: []
}
return item;
},
createDetailInfo(data) {
data.scaned = false;
// data.record = {};
let detail = data;
return detail;
},
calcScanCount(closeScan) {
let items = this.subList.filter(r => {
if (r.scaned) {
return r;
}
})
this.scanCount = items != null ? items.length : 0;
if (this.scanCount == this.subList.length) {
this.closeScanPopup();
}
},
calcHandleQty() {
calcHandleQty(this.detailSource)
this.continueScan()
@ -296,11 +260,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 = result.label.qty;
itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -312,8 +276,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 = result.label.qty;
itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -379,17 +343,17 @@
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
// transferIssueJobSubmit(this.id, params).then(res => {
// if (res.data) {
// this.showCommitSuccessMessage("<br>" + res.data.Number )
// } else {
// this.showErrorMessage("[" + res.msg + "]")
// }
// uni.hideLoading()
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
transferIssueJobSubmit(params).then(res => {
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录" + res.data.Number )
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
uni.hideLoading()
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
} else {
uni.hideLoading();
this.showErrorMessage(res.message);
@ -407,6 +371,8 @@
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber;
detail.toContainerNumber = '';
detail.toLocationCode = this.toLocationCode;
detail.toBatch = info.batch;
subList.push(detail)
}
@ -448,15 +414,6 @@
})
},
getLocationInfo(locationCode) {
getBasicLocationByCode(locationCode).then(res => {
if (res.data.list.length > 0) {
this.toLocationInfo = res.data.list[0]
}
})
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {

4
pages/transfer/job/issueJob.vue

@ -166,12 +166,12 @@
}
this.jobList = type === "refresh" ? list : this.jobList.concat(list);
this.pageNo++;
updateTitle("调拨出任务(" + this.totalCount + ")");
updateTitle("调拨出任务(" + this.totalCount + ")");
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();
}
updateTitle("调拨出任务");
updateTitle("调拨出任务");
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)

44
pages/transfer/job/receiptDetail.vue

@ -88,25 +88,23 @@
subList: [], //subList
detailSource: [], //
toLocationCode: "",
toLocationInfo: {},
businessTypeInfo: {},
locationTypeList: [],
managementList: []
managementList: [],
tolocationTypeList:[]
};
},
onLoad(option) {
this.id = option.id;
if (this.id != undefined) {
// //
// if (option.status == "JOB_PENDING") {
// this.receive((callback => {
// this.received = true;
// this.getDetail();
// }));
// } else {
// this.getDetail();
// }
this.getDetail();
if (option.status == "1") {
this.receive((callback => {
this.received = true;
this.getDetail();
}));
} else {
this.getDetail();
}
}
},
//
@ -180,7 +178,6 @@
that.fromLocationCode = that.subList[0].fromLocationCode
that.toLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.getLocationInfo(that.toLocationCode);
} else {
that.showMessage('列表数据为0');
}
@ -265,11 +262,10 @@
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 = result.label.qty
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -281,8 +277,7 @@
});
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.qty) ? Number(result.balance.qty) : Number(result.label.qty);
itemDetail.handleQty = result.label.qty
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -355,9 +350,9 @@
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
// transferReceiptJobSubmit(this.id, params).then(res => {
// transferReceiptJobSubmit(params).then(res => {
// if (res.data) {
// this.showCommitSuccessMessage("<br>" + res.data.Number, )
// this.showCommitSuccessMessage("<br>" + res.data)
// } else {
// this.showErrorMessage("[" + res.msg + "]")
// }
@ -413,15 +408,6 @@
});
},
getLocationInfo(locationCode) {
getBasicLocationByCode(locationCode).then(res => {
if (res.data.list.length > 0) {
this.toLocationInfo = res.data.list[0]
}
})
},
scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code

4
pages/transfer/job/receiptJob.vue

@ -165,14 +165,14 @@
}
this.jobList = type === "refresh" ? list : this.jobList.concat(list);
this.pageNo++;
updateTitle("调拨接收任务(" + this.totalCount + ")");
updateTitle("调拨入库任务(" + this.totalCount + ")");
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();
}
this.loadingType = "";
updateTitle("调拨接收任务");
updateTitle("调拨入库任务");
uni.hideLoading();
that.showMessage(error)
})

25
pages/unPlanned/job/issueJobDetail.vue

@ -88,15 +88,14 @@
this.id = option.id;
if (this.id != undefined) {
// //
// if (option.status == "JOB_PENDING") {
// this.receive((callback => {
// this.received = true;
// this.getDetail();
// }));
// } else {
// this.getDetail();
// }
this.getDetail();
if (option.status == "1") {
this.receive((callback => {
this.received = true;
this.getDetail();
}));
} else {
this.getDetail();
}
}
},
//
@ -220,11 +219,10 @@
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 = result.label.qty
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -236,8 +234,7 @@
});
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
result.balance.qty) : Number(result.label.qty);
itemDetail.handleQty = result.label.qty
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty

8
pages/unPlanned/request/issueRequestCreate.vue

@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

8
pages/unPlanned/request/receiptRequestCreate.vue

@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

2
static/config.json

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

Loading…
Cancel
Save