diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index 9b2e3102c..a929aa479 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -202,10 +202,10 @@ export const getBalancesExpectByFilter = (params) => request(
data: params
});
// ERP料号模糊匹配查询库存
-export const getBalancesByItemCode = (params) => promise(
- devUrl + "/api/pda/inventory/balances/get-fuzzy-by-balances-request-many-parameter", {
- method: 'post',
- data: params
+export const getBalancesByItemCode = (itemCode,pageIndex,pageSize) => request(
+ devUrl + "/api/pda/item/get-fuzzy?itemCode="+itemCode+"&pageIndex="+pageIndex+"&pageSize="+pageSize, {
+ method: 'get',
+ data: {}
});
// ERP料号模糊匹配查询所有物料数据
@@ -1764,6 +1764,13 @@ export const getInjectionIssueListByRequest = (requestNumber) => request(
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(
devUrl + "/api/pda/job/injection-issue/" + params.id, { //
@@ -1804,6 +1811,12 @@ export const getCoatingIssueJobByNumber = (jobNumber) => request(
data: {},
method: "get"
});
+// 喷涂发料根据packingCode 查找任务
+export const getCoatingIssueJobByPackingCode = (packingCode) => request(
+ devUrl + "/api/pda/job/coating-issue/get-job-by-packing/" + packingCode, { //
+ data: {},
+ method: "post"
+ });
// 根据MaterialRequest Number获取喷涂发料任务列表
export const getCoatingIssueListByRequest = (requestNumber) => request(
@@ -1896,6 +1909,13 @@ export const getAssembleIssueJobByNumber = (jobNumber) => request(
data: {},
method: "get"
});
+
+// 装配发料根据packingCode 查找任务
+export const getAssembleIssueJobByPackingCode = (packingCode) => request(
+ devUrl + "/api/pda/job/assemble-issue/get-job-by-packing/" + packingCode, { //
+ data: {},
+ method: "post"
+ });
// 根据MaterialRequest Number获取装配发料任务列表
export const getAssembleIssueListByRequest = (requestNumber) => request(
@@ -1994,6 +2014,12 @@ export const getKitingIssueListByRequest = (requestNumber) => request(
data: {},
method: "get"
});
+// kitting发料根据packingCode 查找任务
+export const getKitingIssueJobPackingCode = (packingCode) => request(
+ devUrl + "/api/pda/job/kitting-issue/get-job-by-packing/" + packingCode, { //
+ data: {},
+ method: "post"
+ });
//kiting发料申请列表
export const getKittingRequestList = (pageIndex,pageSize,isFinished) => request(
@@ -2087,6 +2113,13 @@ export const getSparePartIssueListByRequest = (requestNumber) => request(
data: {},
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(
@@ -2160,7 +2193,12 @@ export const getPoNumberByPackingCode = (toPackingCode) => promise(
method: "get"
})
-
+//获取客户信息
+export const getCustomerList = (id) => request(
+ devUrl + "/api/pda/customer/get-all/", { //
+ data: {},
+ method: "get"
+ });
diff --git a/fe/PDA/pages/task/assembleIssueJob.vue b/fe/PDA/pages/task/assembleIssueJob.vue
index 5f60bf769..f13d242b0 100644
--- a/fe/PDA/pages/task/assembleIssueJob.vue
+++ b/fe/PDA/pages/task/assembleIssueJob.vue
@@ -11,9 +11,8 @@
-
-
-
+
+
@@ -24,7 +23,8 @@
import {
getAssembleIssueList,
getAssembleIssueJobByNumber,
- getAssembleIssueListByRequest
+ getAssembleIssueListByRequest,
+ getAssembleIssueJobByPackingCode
} from '@/api/index.js';
import {
@@ -37,9 +37,9 @@
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
- import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
-
+ import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+
export default {
name: 'issue',
components: {
@@ -48,8 +48,8 @@
issueDetail,
comMessage,
winScanButton,
- winMulitScan,
- comScanIssueList
+ comScanIssueList,
+ winScanByPack
},
data() {
return {
@@ -144,17 +144,23 @@
});
},
- getScanResult(type, result) {
- let code = result.data.code;
- if (code == '') {
- this.showMessage('扫描的内容不能为空')
- return;
- }
- if (type == '申请单号') {
- this.scanByRequesNumber(code, type);
- } else if (type == '任务编号') {
- this.scanByNumber(code, type);
- }
+ getScanResult(result) {
+ uni.showLoading({
+ title: "加载中....",
+ mask: true
+ });
+ getAssembleIssueJobByPackingCode(result.data.code).then(res=>{
+ uni.hideLoading();
+ if(res){
+ this.$refs.scanPopup.closeScanPopup();
+ this.openDetail(res)
+ }else {
+ this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
+ }
+ }).catch(error=>{
+ uni.hideLoading();
+ this.showMessage(error.message);
+ })
},
//扫描申请单号
diff --git a/fe/PDA/pages/task/coatingIssuleJob.vue b/fe/PDA/pages/task/coatingIssuleJob.vue
index 3e7f59bf6..c72846932 100644
--- a/fe/PDA/pages/task/coatingIssuleJob.vue
+++ b/fe/PDA/pages/task/coatingIssuleJob.vue
@@ -11,9 +11,8 @@
-
-
-
+
+
@@ -24,7 +23,8 @@
import {
getCoatingIssueList,
getCoatingIssueJobByNumber,
- getCoatingIssueListByRequest
+ getCoatingIssueListByRequest,
+ getCoatingIssueJobByPackingCode
} from '@/api/index.js';
import {
@@ -40,6 +40,7 @@
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
+ import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
export default {
name: 'issue',
@@ -51,7 +52,8 @@
winScanButton,
winMulitScan,
comScanIssueList,
- comKittingIssue
+ comKittingIssue,
+ winScanByPack
},
data() {
return {
@@ -147,17 +149,23 @@
});
},
- getScanResult(type, result) {
- let code = result.data.code;
- if (code == '') {
- this.showMessage('扫描的内容不能为空')
- return;
- }
- if (type == '申请单号') {
- this.scanByRequesNumber(code, type);
- } else if (type == '任务编号') {
- this.scanByNumber(code, type);
- }
+ getScanResult(result) {
+ uni.showLoading({
+ title: "加载中....",
+ mask: true
+ });
+ getCoatingIssueJobByPackingCode(result.data.code).then(res=>{
+ uni.hideLoading();
+ if(res){
+ this.$refs.scanPopup.closeScanPopup();
+ this.openDetail(res)
+ }else {
+ this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
+ }
+ }).catch(error=>{
+ uni.hideLoading();
+ this.showMessage(error.message);
+ })
},
//扫描申请单号
diff --git a/fe/PDA/pages/task/countFgDetail.vue b/fe/PDA/pages/task/countFgDetail.vue
index 1c402142a..6b1ef983e 100644
--- a/fe/PDA/pages/task/countFgDetail.vue
+++ b/fe/PDA/pages/task/countFgDetail.vue
@@ -421,15 +421,7 @@
},
reqGetList(data) {
-
- let params = {
- pageSize: data.pageSize,
- pageIndex: data.pageIndex,
- itemCode: data.searchValue,
- locationCode:this.datacontent.locationCode,
- packingCode:""
- };
- return getBalancesByItemCode(params);
+ return getBalancesByItemCode(data.searchValue,data.pageIndex,data.pageSize);
},
getDetail() {
uni.showLoading({
diff --git a/fe/PDA/pages/task/injectionIssueJob.vue b/fe/PDA/pages/task/injectionIssueJob.vue
index 5e30ee012..6b306bd35 100644
--- a/fe/PDA/pages/task/injectionIssueJob.vue
+++ b/fe/PDA/pages/task/injectionIssueJob.vue
@@ -11,9 +11,8 @@
-
-
-
+
+
@@ -24,7 +23,8 @@
import {
getInjectionIssueList,
getInjectionIssueJobByNumber,
- getInjectionIssueListByRequest
+ getInjectionIssueListByRequest,
+ getInjectionIssueJobByPackingCode
} from '@/api/index.js';
import {
@@ -37,9 +37,10 @@
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
- import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
-
+ import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+
+
export default {
name: 'issue',
components: {
@@ -48,8 +49,8 @@
issueDetail,
comMessage,
winScanButton,
- winMulitScan,
- comScanIssueList
+ comScanIssueList,
+ winScanByPack
},
data() {
return {
@@ -143,17 +144,23 @@
});
},
- getScanResult(type, result) {
- let code = result.data.code;
- if (code == '') {
- this.showMessage('扫描的内容不能为空')
- return;
- }
- if (type == '申请单号') {
- this.scanByRequesNumber(code, type);
- } else if (type == '任务编号') {
- this.scanByNumber(code, type);
- }
+ getScanResult(result) {
+ uni.showLoading({
+ title: "加载中....",
+ mask: true
+ });
+ getInjectionIssueJobByPackingCode(result.data.code).then(res=>{
+ uni.hideLoading();
+ if(res){
+ this.$refs.scanPopup.closeScanPopup();
+ this.openDetail(res)
+ }else {
+ this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
+ }
+ }).catch(error=>{
+ uni.hideLoading();
+ this.showMessage(error.message);
+ })
},
//扫描申请单号
diff --git a/fe/PDA/pages/task/kittingIssueJob.vue b/fe/PDA/pages/task/kittingIssueJob.vue
index bf9cf6764..442c3eb72 100644
--- a/fe/PDA/pages/task/kittingIssueJob.vue
+++ b/fe/PDA/pages/task/kittingIssueJob.vue
@@ -11,9 +11,8 @@
-
-
-
+
+
@@ -24,7 +23,8 @@
import {
getKittingIssueList,
getKitingIssueJobByNumber,
- getKitingIssueListByRequest
+ getKitingIssueListByRequest,
+ getKitingIssueJobPackingCode
} from '@/api/index.js';
import {
@@ -39,7 +39,8 @@
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
-
+ import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+
export default {
name: 'issue',
components: {
@@ -49,7 +50,8 @@
comMessage,
winScanButton,
winMulitScan,
- comScanIssueList
+ comScanIssueList,
+ winScanByPack
},
data() {
return {
@@ -143,17 +145,23 @@
});
},
- getScanResult(type, result) {
- let code = result.data.code;
- if (code == '') {
- this.showMessage('扫描的内容不能为空')
- return;
- }
- if (type == '申请单号') {
- this.scanByRequesNumber(code, type);
- } else if (type == '任务编号') {
- this.scanByNumber(code, type);
- }
+ getScanResult(result) {
+ uni.showLoading({
+ title: "加载中....",
+ mask: true
+ });
+ getKitingIssueJobPackingCode(result.data.code).then(res=>{
+ uni.hideLoading();
+ if(res){
+ this.$refs.scanPopup.closeScanPopup();
+ this.openDetail(res)
+ }else {
+ this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
+ }
+ }).catch(error=>{
+ uni.hideLoading();
+ this.showMessage(error.message);
+ })
},
//扫描申请单号
diff --git a/fe/PDA/pages/task/sparePartIssueJob.vue b/fe/PDA/pages/task/sparePartIssueJob.vue
index 8be302c72..bd9fdbb83 100644
--- a/fe/PDA/pages/task/sparePartIssueJob.vue
+++ b/fe/PDA/pages/task/sparePartIssueJob.vue
@@ -11,9 +11,8 @@
-
-
-
+
+
@@ -24,7 +23,8 @@
import {
getSparePartIssueList,
getSparePartIssueJobByNumber,
- getSparePartIssueListByRequest
+ getSparePartIssueListByRequest,
+ getSparePartIssueJobByPackingCode
} from '@/api/index.js';
import {
@@ -37,9 +37,9 @@
import comKittingIssue from '@/mycomponents/coms/task/comKittingIssue.vue';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
- import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
import comScanIssueList from '@/mycomponents/scan/comScanIssueList.vue'
-
+ import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+
export default {
name: 'issue',
components: {
@@ -48,8 +48,8 @@
issueDetail,
comMessage,
winScanButton,
- winMulitScan,
- comScanIssueList
+ comScanIssueList,
+ winScanByPack
},
data() {
return {
@@ -143,17 +143,23 @@
});
},
- getScanResult(type, result) {
- let code = result.data.code;
- if (code == '') {
- this.showMessage('扫描的内容不能为空')
- return;
- }
- if (type == '申请单号') {
- this.scanByRequesNumber(code, type);
- } else if (type == '任务编号') {
- this.scanByNumber(code, type);
- }
+ getScanResult(result) {
+ uni.showLoading({
+ title: "加载中....",
+ mask: true
+ });
+ getSparePartIssueJobByPackingCode(result.data.code).then(res=>{
+ uni.hideLoading();
+ if(res){
+ this.$refs.scanPopup.closeScanPopup();
+ this.openDetail(res)
+ }else {
+ this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
+ }
+ }).catch(error=>{
+ uni.hideLoading();
+ this.showMessage(error.message);
+ })
},
//扫描申请单号