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

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_online_20240924
wangyufei 2 months ago
parent
35344202d9 84dc668606
commit
5d6e4be373
4 changed files with 201 additions and 227 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. 256
      src/pages/count/job/countJob.vue
  2. 124
      src/pages/fg/receiptByPlan.vue
  3. 46
      src/pages/fg/receiptNoPlan.vue
  4. 2
      src/pages/unPlanned/coms/comIssueJobCard.vue

256
src/pages/count/job/countJob.vue
View File

@ -1,15 +1,12 @@
<template> <template>
<view class=""> <view class="">
<com-empty-view v-if="jobList.length==0"></com-empty-view> <com-empty-view v-if="jobList.length==0"></com-empty-view>
<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" <job-filter ref="filter" :isShowFromLocationCode="true" @onQuery="getListByFilter" :isShowQurery="true">
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
:checkedWaitTask="checkedWaitTask">
</job-filter> </job-filter>
<view v-if="jobList.length>0"> <view v-if="jobList.length>0">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<view v-for="(item, index) in jobList" :key="index"> <view v-for="(item, index) in jobList" :key="index">
<uni-swipe-action-item <uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
@click="swipeClick($event,item)"> @click="swipeClick($event,item)">
<com-count-job-card :dataContent="item" @click='openJobDetail(item)'></com-count-job-card> <com-count-job-card :dataContent="item" @click='openJobDetail(item)'></com-count-job-card>
</uni-swipe-action-item> </uni-swipe-action-item>
@ -22,7 +19,7 @@
<uni-load-more :status="loadingType" /> <uni-load-more :status="loadingType" />
</view> </view>
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> <win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
<winScanPackJob title="库位" ref="scanPopup" @getResult='getScanResult' > <winScanPackJob title="库位" ref="scanPopup" @getResult='getScanResult'>
</winScanPackJob> </winScanPackJob>
<jobList ref="jobList" @selectItem="selectItem"></jobList> <jobList ref="jobList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
@ -80,10 +77,15 @@
status: '1,2', //待处理 、进行中 status: '1,2', //待处理 、进行中
detailOptions: [], detailOptions: [],
detailGiveupOptions: [], detailGiveupOptions: [],
title:'' title: '',
queryParams: {
creationTime: "",
status: "1,2",
fromLocationCode: ""
}
}; };
}, },
onLoad(option){ onLoad(option) {
this.title = option.title this.title = option.title
}, },
@ -142,44 +144,14 @@
this.jobList = []; this.jobList = [];
} }
var filters = []
if (this.checkedToday) {
filters.push({
column: "create_time",
action: "betweeen",
value: this.todayTime
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
filters.push({ var queryFiltersParams = this.setQueryParam()
column: "countSplitType",
action: "==",
value: "locationCode"
})
filters.push({
column: "isOpenCount",
action: "==",
value: "TRUE"
})
filters.push({
column: "accept_user_id",
action: "==",
value: this.$store.state.user.id
})
var params = { var params = {
filters: filters, filters: queryFiltersParams,
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
sort:"number", sort: "number",
by:"DESC" by: "DESC"
} }
getCountJobList(params).then(res => { getCountJobList(params).then(res => {
@ -190,7 +162,7 @@
var list = res.data.list; var list = res.data.list;
this.totalCount = res.data.total this.totalCount = res.data.total
updateTitle(this.title+"(" + this.totalCount + ")"); updateTitle(this.title + "(" + this.totalCount + ")");
this.loadingType = "loadmore"; this.loadingType = "loadmore";
if (list == null || list.length == 0) { if (list == null || list.length == 0) {
this.loadingType = "nomore"; this.loadingType = "nomore";
@ -215,19 +187,82 @@
// url: './countDetail?id=' + item.id + '&status=' + item.status // url: './countDetail?id=' + item.id + '&status=' + item.status
// }); // });
//明盘 //明盘
if(item.isOpenCount=="TRUE"){ if (item.isOpenCount == "TRUE") {
uni.navigateTo({ uni.navigateTo({
url: './countLightDetail?id=' + item.id + '&status=' + item.status+'&title='+this.title url: './countLightDetail?id=' + item.id + '&status=' + item.status + '&title=' + this.title
}); });
}else { } else {
//盲盘 //盲盘
uni.navigateTo({ uni.navigateTo({
url: './countBlindDetail?id=' + item.id + '&status=' + item.status+'&title='+this.title url: './countBlindDetail?id=' + item.id + '&status=' + item.status + '&title=' + this.title
}); });
} }
}, },
setQueryParam() {
var filterParams = []
//只看当天
if (this.queryParams.creationTime) {
filterParams.push({
column: "create_time",
action: "betweeen",
value: this.queryParams.creationTime
})
}
//只看待处理
if (this.queryParams.status) {
filterParams.push({
column: "status",
action: "in",
value: this.queryParams.status
})
} else {
filterParams.push({
column: "status",
action: "in",
value: "1,2"
})
}
//来源库位
if (this.queryParams.fromLocationCode) {
filterParams.push({
column: "countSplitCode",
action: "==",
value: this.queryParams.fromLocationCode
})
}
filterParams.push({
column: "countSplitType",
action: "==",
value: "locationCode"
})
filterParams.push({
column: "isOpenCount",
action: "==",
value: "TRUE"
})
filterParams.push({
column: "accept_user_id",
action: "==",
value: this.$store.state.user.id
})
return filterParams;
},
getListByFilter(params) {
this.queryParams.creationTime = params.creationTime;
this.queryParams.status = params.status;
this.queryParams.fromLocationCode = params.fromLocationCode;
this.getList('refresh')
},
showItemList(itemList) { showItemList(itemList) {
this.$refs.jobListPopup.openPopup(itemList); this.$refs.jobListPopup.openPopup(itemList);
@ -236,15 +271,15 @@
selectedItem(item) { selectedItem(item) {
this.openJobDetail(item); this.openJobDetail(item);
}, },
openScanPopup() { openScanPopup() {
this.$refs.scanPopup.openScanPopup(); this.$refs.scanPopup.openScanPopup();
}, },
selectItem(item) { selectItem(item) {
this.$refs.scanPopup.closeScanPopup(); this.$refs.scanPopup.closeScanPopup();
this.openJobDetail(item) this.openJobDetail(item)
}, },
swipeClick(e, dataContent) { swipeClick(e, dataContent) {
@ -266,12 +301,12 @@
cancleJob(id) { cancleJob(id) {
cancleTakeCountJob(id).then(res => { cancleTakeCountJob(id).then(res => {
if(res.data){ if (res.data) {
this.getList("refresh") this.getList("refresh")
uni.showToast({ uni.showToast({
title:"放弃任务成功" title: "放弃任务成功"
}) })
}else { } else {
this.showMessage("放弃任务失败") this.showMessage("放弃任务失败")
} }
}).catch(error => { }).catch(error => {
@ -279,77 +314,6 @@
}) })
}, },
switchChangeToday(state, creationTime) {
this.checkedToday = state;
this.todayTime = creationTime;
this.getList("refresh");
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
this.getList("refresh");
},
getScanNumber(code) {
this.getDataListByType(code)
},
getDataListByType(code) {
let that = this;
uni.showLoading({
title: "加载中....",
mask: true
});
var filters = []
filters.push({
column: "status",
action: "in",
value: '1,2'
})
filters.push({
column: "number",
action: "==",
value: code
})
filters.push({
column: "countSplitType",
action: "==",
value: "locationCode"
})
filters.push({
column: "isOpenCount",
action: "==",
value: "TRUE"
})
filters.push({
column: "accept_user_id",
action: "==",
value: this.$store.state.user.id
})
var params = {
filters: filters,
pageNo: 1,
pageSize: 100,
sort:"number",
by:"DESC"
}
getCountJobList(params).then(res => {
uni.hideLoading();
if (res.data.list.length == 0) {
that.showMessage('未查找到' + '【' + code + '】的收货任务');
} else if (res.data.list.length == 1) {
that.openJobDetail(res.data.list[0]);
}
}).catch(error => {
uni.hideLoading();
that.showMessage(error);
})
},
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => { this.$refs.comMessage.showErrorMessage(message, res => {
if (res) { if (res) {
@ -357,8 +321,8 @@
} }
}); });
}, },
getScanResult(result){ getScanResult(result) {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中....", title: "加载中....",
@ -370,57 +334,57 @@
action: "in", action: "in",
value: '1,2' value: '1,2'
}) })
filters.push({ filters.push({
column: "countSplitType", column: "countSplitType",
action: "==", action: "==",
value: "locationCode" value: "locationCode"
}) })
filters.push({ filters.push({
column: "isOpenCount", column: "isOpenCount",
action: "==", action: "==",
value: "TRUE" value: "TRUE"
}) })
filters.push({ filters.push({
column: "countSplitCode", column: "countSplitCode",
action: "==", action: "==",
value: result.label.code value: result.label.code
}) })
filters.push({ filters.push({
column: "accept_user_id", column: "accept_user_id",
action: "==", action: "==",
value: this.$store.state.user.id value: this.$store.state.user.id
}) })
var params = { var params = {
filters: filters, filters: filters,
pageNo: 1, pageNo: 1,
pageSize: 1000, pageSize: 1000,
sort:"number", sort: "number",
by:"DESC" by: "DESC"
} }
getCountJobList(params).then(res => { getCountJobList(params).then(res => {
uni.hideLoading(); uni.hideLoading();
let resultList = res.data.list; let resultList = res.data.list;
resultList.forEach(item => { resultList.forEach(item => {
item.title = item.number; item.title = item.number;
item.selected = false item.selected = false
}) })
let list = [] let list = []
resultList.forEach(item => { resultList.forEach(item => {
if (!list.find(subItem => subItem.title == item.title)) { if (!list.find(subItem => subItem.title == item.title)) {
list.push(item) list.push(item)
} }
}) })
if (list.length == 0) { if (list.length == 0) {
that.showMessage('未查找到库位' + '【' + result.label.code + '】的盘点任务'); that.showMessage('未查找到库位' + '【' + result.label.code + '】的盘点任务');
} else if (list.length == 1) { } else if (list.length == 1) {
that.selectItem(list[0]); that.selectItem(list[0]);
}else { } else {
that.$refs.jobList.openList(list) that.$refs.jobList.openList(list)
} }
}).catch(error => { }).catch(error => {
@ -434,4 +398,4 @@
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

124
src/pages/fg/receiptByPlan.vue
View File

@ -101,6 +101,7 @@
import { import {
isCheckMesCode, isCheckMesCode,
planReceiptSubmit, planReceiptSubmit,
createByPlanSubmit,
createPutawayRequestByPlan, createPutawayRequestByPlan,
createInspectRequestByPlan, createInspectRequestByPlan,
getPlanByNumber, getPlanByNumber,
@ -156,7 +157,9 @@
allList: [], allList: [],
index: 1, index: 1,
loadingType: "", loadingType: "",
pageSize: 500 pageSize: 500,
settingPutAwayRequestSwitch:true,
settingPutAwayInspectSwitch :true
}; };
}, },
@ -211,10 +214,13 @@
packUnit: result.packUnit, packUnit: result.packUnit,
workStationCode: result.workStationCode, workStationCode: result.workStationCode,
fgLocationCode: result.fgLocationCode, fgLocationCode: result.fgLocationCode,
putAwayRequestSwitch:result.putAwayRequestSwitch, putAwayRequestSwitch: result.putAwayRequestSwitch,
putAwayInspectSwitch:result.putAwayInspectSwitch, putAwayInspectSwitch: result.putAwayInspectSwitch,
subList: [] subList: []
} }
this.settingPutAwayRequestSwitch =result.putAwayRequestSwitch
this.settingPutAwayInspectSwitch =result.putAwayInspectSwitch
}, },
initList() { initList() {
@ -268,19 +274,19 @@
}, },
async commit() { async commit() {
let list=[]
try { try {
let startTime = new Date()
uni.showLoading({ uni.showLoading({
title: "提交中...", title: "提交中...",
mask: true mask: true
}) })
let params = this.setParams() let params = this.setParams()
console.log(JSON.stringify(params)) console.log(JSON.stringify(params))
let list = [] var planData = await createByPlanSubmit(params)
var planData = await planReceiptSubmit(params) if (planData.data.tb1&&planData.data.tb1.length>0) {
console.log('planData', planData) planData.data.tb1.forEach(item => {
if (planData.data && planData.data.length > 0) {
planData.data.forEach(item => {
list.push({ list.push({
itemCode: item.itemCode, // 物品代码 itemCode: item.itemCode, // 物品代码
itemName: item.itemName, // 物品名称 itemName: item.itemName, // 物品名称
@ -300,65 +306,36 @@
}) })
}) })
} else { } else {
throw new Error("提交失败") throw new Error("提交失败未获取到打印信息")
}
//创建上架申请
if(this.dataContent.putAwayRequestSwitch){
if(list.length>0&&list[0].requestNumber){
await createPutawayRequestByPlan(list[0].requestNumber)
}
}
//创建检验申请
if(this.dataContent.putAwayInspectSwitch){
if(list.length>0&&list[0].requestNumber){
await createInspectRequestByPlan(list[0].requestNumber)
}
} }
var queryParams = { if (planData.data.tb2 && planData.data.tb2.list.length > 0) {
filters: [{ var planInfo = planData.data.tb2.list[0]
column: "number", //完工数大于等于计划数，说明已经完成
action: "==", if (planInfo.goodQty >= planInfo.planQty) {
value: this.dataContent.planNumber uni.showToast({
}], title:"计划已完成",
pageNo: 1, duration:2000
pageSize: 100, })
} this.clearData()
let isAllSubmit = Number(Number(this.dataContent.goodQty) + Number(this.showList.length)) ==
Number(this.dataContent.planQty)
var planeInfo = await getPlanByNumber(queryParams);
if (planeInfo.data && planeInfo.data.list.length > 0) {
if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
this.clear();
} else { } else {
this.dataContent.planNumber = planeInfo.data.list[0].number; //更新已完工数和未完工数
this.dataContent.handleQty = 0; this.dataContent.planQty = planInfo.planQty
this.dataContent.planQty = planeInfo.data.list[0].planQty this.dataContent.goodQty = planInfo.goodQty
this.dataContent.goodQty = planeInfo.data.list[0].goodQty this.dataContent.noGoodQty = calc.sub(planInfo.planQty, planInfo.goodQty),
this.dataContent.noGoodQty = calc.sub(planeInfo.data.list[0].planQty, planeInfo.data.list[ this.dataContent.handleQty = 0;
0].goodQty), this.dataContent.subList = []
this.dataContent.subList = []
this.showList = []; this.showList = [];
this.allList = [] this.allList = []
this.index = 1 this.index = 1
} }
}
uni.hideLoading()
if (isAllSubmit) {
this.clearData()
} else { } else {
this.showList = []; throw new Error("提交失败未获取到计划信息")
this.allList = [];
this.index = 1;
this.dataContent.handleQty = 0;
} }
var hintMsg ="提交成功\n生成装配收货记录\n";
if(list.length>0&&list[0].requestNumber){ uni.hideLoading()
var hintMsg = "提交成功\n生成装配收货记录\n";
if (list.length > 0 && list[0].requestNumber) {
hintMsg += list[0].requestNumber hintMsg += list[0].requestNumber
} }
nextTick(() => { nextTick(() => {
@ -369,15 +346,33 @@
uni.hideLoading() uni.hideLoading()
var hint = error.message ? error.message : error var hint = error.message ? error.message : error
if (hint.indexOf('请返回开工阶段') > -1) { if (hint.indexOf('请返回开工阶段') > -1) {
this.showErrorMessage('计划已完成') this.showMessage('计划已完成')
this.clearData() this.clearData()
this.openFg();
} else { } else {
this.showErrorMessage(hint) this.showErrorMessage(hint)
} }
} }
this.startSetting(list)
}, },
async startSetting(list){
//创建上架申请
if (this.settingPutAwayRequestSwitch) {
if (list.length > 0 && list[0].requestNumber) {
await createPutawayRequestByPlan(list[0].requestNumber)
}
}
//创建检验申请
if (this.settingPutAwayInspectSwitch) {
if (list.length > 0 && list[0].requestNumber) {
await createInspectRequestByPlan(list[0].requestNumber)
}
}
},
setParams() { setParams() {
this.allList.forEach(res => { this.allList.forEach(res => {
@ -558,6 +553,13 @@
this.scanPopupGetFocus() this.scanPopupGetFocus()
} }
}); });
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
this.openFg();
}
});
} }
} }

46
src/pages/fg/receiptNoPlan.vue
View File

@ -97,7 +97,7 @@
<script> <script>
import { import {
isCheckMesCode, isCheckMesCode,
planReceiptSubmit, createByPlanSubmit,
createPutawayRequestByPlan, createPutawayRequestByPlan,
createInspectRequestByPlan, createInspectRequestByPlan,
getPlanByNumber, getPlanByNumber,
@ -150,6 +150,8 @@
loadingType: "", loadingType: "",
pageSize: 20, pageSize: 20,
scanedQty: 0, scanedQty: 0,
settingPutAwayRequestSwitch:true,
settingPutAwayInspectSwitch :true
}; };
}, },
@ -214,6 +216,8 @@
putAwayRequestSwitch:result.putAwayRequestSwitch, putAwayRequestSwitch:result.putAwayRequestSwitch,
putAwayInspectSwitch:result.putAwayInspectSwitch putAwayInspectSwitch:result.putAwayInspectSwitch
} }
this.settingPutAwayRequestSwitch =result.putAwayRequestSwitch
this.settingPutAwayInspectSwitch =result.putAwayInspectSwitch
}, },
initList() { initList() {
@ -264,6 +268,7 @@
}, },
async commit() { async commit() {
let list = []
try { try {
uni.showLoading({ uni.showLoading({
title: "提交中...", title: "提交中...",
@ -271,12 +276,10 @@
}) })
let params = this.setParams() let params = this.setParams()
console.log(JSON.stringify(params))
let list = [] var planData = await createByPlanSubmit(params)
var planData = await planReceiptSubmit(params) if (planData.data.tb1&&planData.data.tb1.length>0) {
if (planData.data&&planData.data.length>0) { planData.data.tb1.forEach(item => {
planData.data.forEach(item => {
list.push({ list.push({
itemCode: item.itemCode, // 物品代码 itemCode: item.itemCode, // 物品代码
itemName: item.itemName, // 物品名称 itemName: item.itemName, // 物品名称
@ -298,19 +301,6 @@
} else { } else {
throw new Error("提交失败") throw new Error("提交失败")
} }
//创建上架申请
if(this.dataContent.putAwayRequestSwitch){
if(list.length>0&&list[0].requestNumber){
await createPutawayRequestByPlan(list[0].requestNumber)
}
}
//创建检验申请
if(this.dataContent.putAwayInspectSwitch){
if(list.length>0&&list[0].requestNumber){
await createInspectRequestByPlan(list[0].requestNumber)
}
}
var hintMsg ="提交成功\n生成装配收货记录\n"; var hintMsg ="提交成功\n生成装配收货记录\n";
if(list.length>0&&list[0].requestNumber){ if(list.length>0&&list[0].requestNumber){
hintMsg += list[0].requestNumber hintMsg += list[0].requestNumber
@ -327,6 +317,24 @@
var hint = error.message ? error.message : error var hint = error.message ? error.message : error
this.showErrorMessage(hint) this.showErrorMessage(hint)
} }
this.startSetting(list)
},
async startSetting(list){
//创建上架申请
if (this.settingPutAwayRequestSwitch) {
if (list.length > 0 && list[0].requestNumber) {
await createPutawayRequestByPlan(list[0].requestNumber)
}
}
//创建检验申请
if (this.settingPutAwayInspectSwitch) {
if (list.length > 0 && list[0].requestNumber) {
await createInspectRequestByPlan(list[0].requestNumber)
}
}
console.log("提交所有完成"+getCurrDateTime())
}, },
setParams() { setParams() {

2
src/pages/unPlanned/coms/comIssueJobCard.vue
View File

@ -5,7 +5,7 @@
<view class="task_text"> <view class="task_text">
<view class="card_view"> <view class="card_view">
<text class="card_packing_code ">目的地</text> <text class="card_packing_code ">目的地</text>
<text class="card_content ">{{dataContent.destination}}</text> <text class="card_content" style="word-wrap: break-word; word-break: break-all;" >{{dataContent.destination}}</text>
</view> </view>
</view> </view>
</view> </view>

Write Preview
Loading…
Cancel
Save