zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

发料任务查找

pda_nev
李俊城 8 months ago
parent
49f27a2a06
commit
a558576b0a
7 changed files with 169 additions and 104 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. 48
      fe/PDA/api/index.js
  2. 40
      fe/PDA/pages/task/assembleIssueJob.vue
  3. 38
      fe/PDA/pages/task/coatingIssuleJob.vue
  4. 10
      fe/PDA/pages/task/countFgDetail.vue
  5. 41
      fe/PDA/pages/task/injectionIssueJob.vue
  6. 38
      fe/PDA/pages/task/kittingIssueJob.vue
  7. 40
      fe/PDA/pages/task/sparePartIssueJob.vue

48
fe/PDA/api/index.js
View File

@ -202,10 +202,10 @@ export const getBalancesExpectByFilter = (params) => request(
data: params data: params
}); });
// ERP料号模糊匹配查询库存 // ERP料号模糊匹配查询库存
export const getBalancesByItemCode = (params) => promise( export const getBalancesByItemCode = (itemCode,pageIndex,pageSize) => request(
devUrl + "/api/pda/inventory/balances/get-fuzzy-by-balances-request-many-parameter", { devUrl + "/api/pda/item/get-fuzzy?itemCode="+itemCode+"&pageIndex="+pageIndex+"&pageSize="+pageSize, {
method: 'post', method: 'get',
data: params data: {}
}); });
// ERP料号模糊匹配查询所有物料数据 // ERP料号模糊匹配查询所有物料数据
@ -1764,6 +1764,13 @@ export const getInjectionIssueListByRequest = (requestNumber) => request(
method: "get" method: "get"
}); });
// 注塑发料根据packingCode 查找任务
export const getInjectionIssueJobByPackingCode = (packingCode) => request(
devUrl + "/api/pda/job/injection-issue/get-job-by-packing/" + packingCode, { //
data: {},
method: "post"
});
//注塑发料任务详情 //注塑发料任务详情
export const getInjectionIssueDetail = (params) => request( export const getInjectionIssueDetail = (params) => request(
devUrl + "/api/pda/job/injection-issue/" + params.id, { // devUrl + "/api/pda/job/injection-issue/" + params.id, { //
@ -1804,6 +1811,12 @@ export const getCoatingIssueJobByNumber = (jobNumber) => request(
data: {}, data: {},
method: "get" method: "get"
}); });
// 喷涂发料根据packingCode 查找任务
export const getCoatingIssueJobByPackingCode = (packingCode) => request(
devUrl + "/api/pda/job/coating-issue/get-job-by-packing/" + packingCode, { //
data: {},
method: "post"
});
// 根据MaterialRequest Number获取喷涂发料任务列表 // 根据MaterialRequest Number获取喷涂发料任务列表
export const getCoatingIssueListByRequest = (requestNumber) => request( export const getCoatingIssueListByRequest = (requestNumber) => request(
@ -1897,6 +1910,13 @@ export const getAssembleIssueJobByNumber = (jobNumber) => request(
method: "get" method: "get"
}); });
// 装配发料根据packingCode 查找任务
export const getAssembleIssueJobByPackingCode = (packingCode) => request(
devUrl + "/api/pda/job/assemble-issue/get-job-by-packing/" + packingCode, { //
data: {},
method: "post"
});
// 根据MaterialRequest Number获取装配发料任务列表 // 根据MaterialRequest Number获取装配发料任务列表
export const getAssembleIssueListByRequest = (requestNumber) => request( export const getAssembleIssueListByRequest = (requestNumber) => request(
devUrl + "/api/pda/job/assemble-issue/list/by-request/" + requestNumber, { // devUrl + "/api/pda/job/assemble-issue/list/by-request/" + requestNumber, { //
@ -1994,6 +2014,12 @@ export const getKitingIssueListByRequest = (requestNumber) => request(
data: {}, data: {},
method: "get" method: "get"
}); });
// kitting发料根据packingCode 查找任务
export const getKitingIssueJobPackingCode = (packingCode) => request(
devUrl + "/api/pda/job/kitting-issue/get-job-by-packing/" + packingCode, { //
data: {},
method: "post"
});
//kiting发料申请列表 //kiting发料申请列表
export const getKittingRequestList = (pageIndex,pageSize,isFinished) => request( export const getKittingRequestList = (pageIndex,pageSize,isFinished) => request(
@ -2088,6 +2114,13 @@ export const getSparePartIssueListByRequest = (requestNumber) => request(
method: "get" method: "get"
}); });
// 备件发料根据packingCode 查找任务
export const getSparePartIssueJobByPackingCode = (packingCode) => request(
devUrl + "/api/pda/job/spare-part-issue/get-job-by-packing/" + packingCode, { //
data: {},
method: "post"
});
//备件发料申请列表 //备件发料申请列表
export const getSparePartRequestList = (pageIndex,pageSize,isFinished) => request( export const getSparePartRequestList = (pageIndex,pageSize,isFinished) => request(
devUrl + "/api/pda/store/spare-part-request/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, { devUrl + "/api/pda/store/spare-part-request/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, {
@ -2160,7 +2193,12 @@ export const getPoNumberByPackingCode = (toPackingCode) => promise(
method: "get" method: "get"
}) })
//获取客户信息
export const getCustomerList = (id) => request(
devUrl + "/api/pda/customer/get-all/", { //
data: {},
method: "get"
});

40
fe/PDA/pages/task/assembleIssueJob.vue
View File

@ -11,9 +11,8 @@
<comKittingIssue :dataContent="item"></comKittingIssue> <comKittingIssue :dataContent="item"></comKittingIssue>
</view> </view>
<uni-load-more :status="loadingType" v-if="issueList.length>0" /> <uni-load-more :status="loadingType" v-if="issueList.length>0" />
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup' title="箱码"></win-scan-button>
<win-mulit-scan ref="scanPopup" :titleArray="titleArray" @getScanResult='getScanResult'> <win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult' title="箱码"></win-scan-by-pack>
</win-mulit-scan>
<com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list> <com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list>
<!-- com-message必须放在最下层 --> <!-- com-message必须放在最下层 -->
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
@ -24,7 +23,8 @@
import { import {
getAssembleIssueList, getAssembleIssueList,
getAssembleIssueJobByNumber, getAssembleIssueJobByNumber,
getAssembleIssueListByRequest getAssembleIssueListByRequest,
getAssembleIssueJobByPackingCode
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -37,8 +37,8 @@
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue'; import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue' import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue' import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
export default { export default {
name: 'issue', name: 'issue',
@ -48,8 +48,8 @@
issueDetail, issueDetail,
comMessage, comMessage,
winScanButton, winScanButton,
winMulitScan, comScanIssueList,
comScanIssueList winScanByPack
}, },
data() { data() {
return { return {
@ -144,17 +144,23 @@
}); });
}, },
getScanResult(type, result) { getScanResult(result) {
let code = result.data.code; uni.showLoading({
if (code == '') { title: "加载中....",
this.showMessage('扫描的内容不能为空') mask: true
return; });
} getAssembleIssueJobByPackingCode(result.data.code).then(res=>{
if (type == '申请单号') { uni.hideLoading();
this.scanByRequesNumber(code, type); if(res){
} else if (type == '任务编号') { this.$refs.scanPopup.closeScanPopup();
this.scanByNumber(code, type); this.openDetail(res)
}else {
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
} }
}).catch(error=>{
uni.hideLoading();
this.showMessage(error.message);
})
}, },
//扫描申请单号 //扫描申请单号

38
fe/PDA/pages/task/coatingIssuleJob.vue
View File

@ -11,9 +11,8 @@
<comKittingIssue :dataContent="item"></comKittingIssue> <comKittingIssue :dataContent="item"></comKittingIssue>
</view> </view>
<uni-load-more :status="loadingType" v-if="issueList.length>0" /> <uni-load-more :status="loadingType" v-if="issueList.length>0" />
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup' title="箱码"></win-scan-button>
<win-mulit-scan ref="scanPopup" :titleArray="titleArray" @getScanResult='getScanResult'> <win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult' title="箱码"></win-scan-by-pack>
</win-mulit-scan>
<com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list> <com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list>
<!-- com-message必须放在最下层 --> <!-- com-message必须放在最下层 -->
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
@ -24,7 +23,8 @@
import { import {
getCoatingIssueList, getCoatingIssueList,
getCoatingIssueJobByNumber, getCoatingIssueJobByNumber,
getCoatingIssueListByRequest getCoatingIssueListByRequest,
getCoatingIssueJobByPackingCode
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -40,6 +40,7 @@
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue' import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue' import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue'; import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
export default { export default {
name: 'issue', name: 'issue',
@ -51,7 +52,8 @@
winScanButton, winScanButton,
winMulitScan, winMulitScan,
comScanIssueList, comScanIssueList,
comKittingIssue comKittingIssue,
winScanByPack
}, },
data() { data() {
return { return {
@ -147,17 +149,23 @@
}); });
}, },
getScanResult(type, result) { getScanResult(result) {
let code = result.data.code; uni.showLoading({
if (code == '') { title: "加载中....",
this.showMessage('扫描的内容不能为空') mask: true
return; });
} getCoatingIssueJobByPackingCode(result.data.code).then(res=>{
if (type == '申请单号') { uni.hideLoading();
this.scanByRequesNumber(code, type); if(res){
} else if (type == '任务编号') { this.$refs.scanPopup.closeScanPopup();
this.scanByNumber(code, type); this.openDetail(res)
}else {
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
} }
}).catch(error=>{
uni.hideLoading();
this.showMessage(error.message);
})
}, },
//扫描申请单号 //扫描申请单号

10
fe/PDA/pages/task/countFgDetail.vue
View File

@ -421,15 +421,7 @@
}, },
reqGetList(data) { reqGetList(data) {
return getBalancesByItemCode(data.searchValue,data.pageIndex,data.pageSize);
let params = {
pageSize: data.pageSize,
pageIndex: data.pageIndex,
itemCode: data.searchValue,
locationCode:this.datacontent.locationCode,
packingCode:""
};
return getBalancesByItemCode(params);
}, },
getDetail() { getDetail() {
uni.showLoading({ uni.showLoading({

41
fe/PDA/pages/task/injectionIssueJob.vue
View File

@ -11,9 +11,8 @@
<comKittingIssue :dataContent="item"></comKittingIssue> <comKittingIssue :dataContent="item"></comKittingIssue>
</view> </view>
<uni-load-more :status="loadingType" v-if="issueList.length>0" /> <uni-load-more :status="loadingType" v-if="issueList.length>0" />
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup' title="箱码"></win-scan-button>
<win-mulit-scan ref="scanPopup" :titleArray="titleArray" @getScanResult='getScanResult'> <win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult' title="箱码"></win-scan-by-pack>
</win-mulit-scan>
<com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list> <com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list>
<!-- com-message必须放在最下层 --> <!-- com-message必须放在最下层 -->
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
@ -24,7 +23,8 @@
import { import {
getInjectionIssueList, getInjectionIssueList,
getInjectionIssueJobByNumber, getInjectionIssueJobByNumber,
getInjectionIssueListByRequest getInjectionIssueListByRequest,
getInjectionIssueJobByPackingCode
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -37,8 +37,9 @@
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue'; import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue' import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue' import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
export default { export default {
name: 'issue', name: 'issue',
@ -48,8 +49,8 @@
issueDetail, issueDetail,
comMessage, comMessage,
winScanButton, winScanButton,
winMulitScan, comScanIssueList,
comScanIssueList winScanByPack
}, },
data() { data() {
return { return {
@ -143,17 +144,23 @@
}); });
}, },
getScanResult(type, result) { getScanResult(result) {
let code = result.data.code; uni.showLoading({
if (code == '') { title: "加载中....",
this.showMessage('扫描的内容不能为空') mask: true
return; });
} getInjectionIssueJobByPackingCode(result.data.code).then(res=>{
if (type == '申请单号') { uni.hideLoading();
this.scanByRequesNumber(code, type); if(res){
} else if (type == '任务编号') { this.$refs.scanPopup.closeScanPopup();
this.scanByNumber(code, type); this.openDetail(res)
}else {
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
} }
}).catch(error=>{
uni.hideLoading();
this.showMessage(error.message);
})
}, },
//扫描申请单号 //扫描申请单号

38
fe/PDA/pages/task/kittingIssueJob.vue
View File

@ -11,9 +11,8 @@
<comKittingIssue :dataContent="item"></comKittingIssue> <comKittingIssue :dataContent="item"></comKittingIssue>
</view> </view>
<uni-load-more :status="loadingType" v-if="issueList.length>0" /> <uni-load-more :status="loadingType" v-if="issueList.length>0" />
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup' title="箱码"></win-scan-button>
<win-mulit-scan ref="scanPopup" :titleArray="titleArray" @getScanResult='getScanResult'> <win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult' title="箱码"></win-scan-by-pack>
</win-mulit-scan>
<com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list> <com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list>
<!-- com-message必须放在最下层 --> <!-- com-message必须放在最下层 -->
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
@ -24,7 +23,8 @@
import { import {
getKittingIssueList, getKittingIssueList,
getKitingIssueJobByNumber, getKitingIssueJobByNumber,
getKitingIssueListByRequest getKitingIssueListByRequest,
getKitingIssueJobPackingCode
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -39,6 +39,7 @@
import winScanButton from '@/mycomponents/wincom/winScanButton.vue' import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue' import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue' import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
export default { export default {
name: 'issue', name: 'issue',
@ -49,7 +50,8 @@
comMessage, comMessage,
winScanButton, winScanButton,
winMulitScan, winMulitScan,
comScanIssueList comScanIssueList,
winScanByPack
}, },
data() { data() {
return { return {
@ -143,17 +145,23 @@
}); });
}, },
getScanResult(type, result) { getScanResult(result) {
let code = result.data.code; uni.showLoading({
if (code == '') { title: "加载中....",
this.showMessage('扫描的内容不能为空') mask: true
return; });
} getKitingIssueJobPackingCode(result.data.code).then(res=>{
if (type == '申请单号') { uni.hideLoading();
this.scanByRequesNumber(code, type); if(res){
} else if (type == '任务编号') { this.$refs.scanPopup.closeScanPopup();
this.scanByNumber(code, type); this.openDetail(res)
}else {
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
} }
}).catch(error=>{
uni.hideLoading();
this.showMessage(error.message);
})
}, },
//扫描申请单号 //扫描申请单号

40
fe/PDA/pages/task/sparePartIssueJob.vue
View File

@ -11,9 +11,8 @@
<comKittingIssue :dataContent="item"></comKittingIssue> <comKittingIssue :dataContent="item"></comKittingIssue>
</view> </view>
<uni-load-more :status="loadingType" v-if="issueList.length>0" /> <uni-load-more :status="loadingType" v-if="issueList.length>0" />
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup' title="箱码"></win-scan-button>
<win-mulit-scan ref="scanPopup" :titleArray="titleArray" @getScanResult='getScanResult'> <win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult' title="箱码"></win-scan-by-pack>
</win-mulit-scan>
<com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list> <com-scan-issue-list ref="scanList" @selectedItem="selectedItem"></com-scan-issue-list>
<!-- com-message必须放在最下层 --> <!-- com-message必须放在最下层 -->
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
@ -24,7 +23,8 @@
import { import {
getSparePartIssueList, getSparePartIssueList,
getSparePartIssueJobByNumber, getSparePartIssueJobByNumber,
getSparePartIssueListByRequest getSparePartIssueListByRequest,
getSparePartIssueJobByPackingCode
} from '@/api/index.js'; } from '@/api/index.js';
import { import {
@ -37,8 +37,8 @@
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue'; import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue' import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue' import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
export default { export default {
name: 'issue', name: 'issue',
@ -48,8 +48,8 @@
issueDetail, issueDetail,
comMessage, comMessage,
winScanButton, winScanButton,
winMulitScan, comScanIssueList,
comScanIssueList winScanByPack
}, },
data() { data() {
return { return {
@ -143,17 +143,23 @@
}); });
}, },
getScanResult(type, result) { getScanResult(result) {
let code = result.data.code; uni.showLoading({
if (code == '') { title: "加载中....",
this.showMessage('扫描的内容不能为空') mask: true
return; });
} getSparePartIssueJobByPackingCode(result.data.code).then(res=>{
if (type == '申请单号') { uni.hideLoading();
this.scanByRequesNumber(code, type); if(res){
} else if (type == '任务编号') { this.$refs.scanPopup.closeScanPopup();
this.scanByNumber(code, type); this.openDetail(res)
}else {
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
} }
}).catch(error=>{
uni.hideLoading();
this.showMessage(error.message);
})
}, },
//扫描申请单号 //扫描申请单号

Write Preview
Loading…
Cancel
Save