From a21906521689490fb7daadeee9fa0fc729d946aa Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 16 Aug 2024 18:26:41 +0800
Subject: [PATCH 01/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/scan/winScanPackage.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index e751e5f4..bb364b40 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -176,7 +176,7 @@
getBalanceByFilter(params).then(res => {
if (res.data.list.length > 0) {
res.data.list.forEach(r => {
- if (packageInfo.parentNumber !== null) {
+ if (packageInfo.parentNumber) {
r.parentPackingNumber = packageInfo.parentNumber
} else {
r.parentPackingNumber = packageInfo.number
@@ -230,7 +230,7 @@
},
losefocus() {
- if (this.$refs.comscan ) {
+ if (this.$refs.comscan) {
this.$refs.comscan.losefocus();
}
},
From 6bbef5511cf24fd19b4a13572eaf249e0a8729e0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 19:41:27 +0800
Subject: [PATCH 02/31] =?UTF-8?q?HL-5420=E5=8F=91=E6=96=99=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E3=80=81=E7=89=A9=E6=96=99=E4=BB=BB=E5=8A=A1-?=
=?UTF-8?q?=E7=AD=9B=E9=80=89=E7=82=B9=E5=87=BB=E2=80=9C=E9=87=8D=E7=BD=AE?=
=?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8F=AA=E7=9C=8B=E5=BD=93=E5=A4=A9=E5=92=8C?=
=?UTF-8?q?=E5=8F=AA=E7=9C=8B=E5=BE=85=E5=A4=84=E7=90=86=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/job/jobFilter.vue | 2 +
src/pages/issue/job/issueJob.vue | 95 +++++++++++++-----------
src/pages/repleinsh/job/repleinshJob.vue | 64 +++++++++-------
3 files changed, 90 insertions(+), 71 deletions(-)
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 4dcd4b84..32d1546f 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -198,6 +198,8 @@
return params;
},
reset(){
+ this.checkedTodayModel = false
+ this.checkedWaitModel = false
this.productionLineCode = ''
this.fromLocationCode = ''
this.fromAreaCode = ''// 来源库区
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 5d5db6d8..38acf2ac 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -329,82 +329,91 @@
title: "加载中....",
mask: true
});
- var filters = []
- if (this.checkedToday) {
- filters.push({
- column: "create_time",
- action: "betweeen",
- value: this.todayTime
- })
+ // var filters = []
+ // if (this.checkedToday) {
+ // filters.push({
+ // column: "create_time",
+ // action: "betweeen",
+ // value: this.todayTime
+ // })
+ // }
+
+ // filters.push({
+ // column: "status",
+ // action: "in",
+ // value: this.status
+ // })
+ if (params.status) {
+ this.status = params.status
+
+ }else{
+ this.status = "1,2"
+ }
+ if(params.creationTime==""){
+ this.checkedToday = false;
}
- filters.push({
- column: "status",
- action: "in",
- value: this.status
- })
-
if (params.fromLocationCode) {
// 来源库位
this.fromLocation = params.fromLocationCode
- filters.push({
- column: "fromLocationCode",
- action: "==",
- value: params.fromLocationCode
- })
+ // filters.push({
+ // column: "fromLocationCode",
+ // action: "==",
+ // value: params.fromLocationCode
+ // })
}else{
this.fromLocation = ''
}
if (params.productionLineCode) {
// 生产线
this.productionLine = params.productionLineCode
- filters.push({
- column: "productionLineCode",
- action: "==",
- value: params.productionLineCode
- })
+ // filters.push({
+ // column: "productionLineCode",
+ // action: "==",
+ // value: params.productionLineCode
+ // })
}else{
this.productionLine = ''
}
if (params.itemCode) {
// 物料代码
this.filterItemCode = params.itemCode
- filters.push({
- column: "itemCode",
- action: "like",
- value: params.itemCode
- })
+ // filters.push({
+ // column: "itemCode",
+ // action: "like",
+ // value: params.itemCode
+ // })
}else{
this.filterItemCode = ''
}
if (params.fromAreaCode) {
// 来源库区
this.fromAreaCode = params.fromAreaCode
- filters.push({
- column: "fromAreaCode",
- action: "==",
- value: params.fromAreaCode
- })
+ // filters.push({
+ // column: "fromAreaCode",
+ // action: "==",
+ // value: params.fromAreaCode
+ // })
}else{
this.fromAreaCode = ''
}
if (params.toAreaCode) {
// 到库区
this.toAreaCode = params.toAreaCode
- filters.push({
- column: "toAreaCode",
- action: "==",
- value: params.toAreaCode
- })
+ // filters.push({
+ // column: "toAreaCode",
+ // action: "==",
+ // value: params.toAreaCode
+ // })
}else{
this.toAreaCode = ''
}
- var params = {
- filters: filters,
- pageNo: 1,
- pageSize: 100,
- }
+ // var params = {
+ // filters: filters,
+ // pageNo: 1,
+ // pageSize: 100,
+ // }
this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
// getIssueJobList(params).then(res => {
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index d0c1605f..a711b862 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -281,29 +281,37 @@
title: "加载中....",
mask: true
});
- var filters = []
- if (this.checkedToday) {
- filters.push({
- column: "create_time",
- action: "betweeen",
- value: this.todayTime
- })
- }
+ // 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({
+ // column: "status",
+ // action: "in",
+ // value: this.status
+ // })
+ if (params.status) {
+ this.status = params.status
+ }else{
+ this.status = "1,2"
+ }
+ if(params.creationTime==""){
+ this.checkedToday = false;
+ }
if (params.fromLocationCode) {
// 来源库位
this.fromLocationCode = params.fromLocationCode
- filters.push({
- column: "fromLocationCode",
- action: "==",
- value: params.fromLocationCode
- })
+ // filters.push({
+ // column: "fromLocationCode",
+ // action: "==",
+ // value: params.fromLocationCode
+ // })
}else{
this.fromLocationCode = ''
}
@@ -311,19 +319,19 @@
if (params.itemCode) {
// 物料代码
this.filterItemCode = params.itemCode
- filters.push({
- column: "itemCode",
- action: "like",
- value: params.itemCode
- })
+ // filters.push({
+ // column: "itemCode",
+ // action: "like",
+ // value: params.itemCode
+ // })
}else{
this.filterItemCode = ''
}
- var params = {
- filters: filters,
- pageNo: 1,
- pageSize: 100,
- }
+ // var params = {
+ // filters: filters,
+ // pageNo: 1,
+ // pageSize: 100,
+ // }
this.getList('refresh', this.fromLocationCode, this.filterItemCode)
// getRepleinshJobList(params).then(res => {
From d88bdff7c54576eaaa582f33ffab6c9c2fd789af Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 16 Aug 2024 20:12:25 +0800
Subject: [PATCH 03/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=990816?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/issue/record/directIssue0816.vue | 71 +++++++++++++---------
1 file changed, 43 insertions(+), 28 deletions(-)
diff --git a/src/pages/issue/record/directIssue0816.vue b/src/pages/issue/record/directIssue0816.vue
index 8efa0038..6e4668b1 100644
--- a/src/pages/issue/record/directIssue0816.vue
+++ b/src/pages/issue/record/directIssue0816.vue
@@ -45,9 +45,9 @@
-
-
-
+
+
@@ -100,7 +100,7 @@
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
// import balanceQuery from '@/mycomponents/query/balanceQuery.vue'
-
+ import winScanPackage from '@/mycomponents/scan/winScanPackage.vue'
export default {
components: {
@@ -114,6 +114,7 @@
recordDetailCard,
balanceSelect,
winComScanBalance,
+ winScanPackage
// balanceQuery
},
data() {
@@ -181,7 +182,6 @@
// showDrawer() {
// this.$refs.showRight.open();
// },
-
getBusinessType() {
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
@@ -196,27 +196,36 @@
},
getScanResult(result) {
+ // let balance = result.balance;
let pack = result.package;
- let balance = result.balance;
-
- if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) {
- this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this
- .fromLocationCode + "]没有库存余额")
- return;
- }
-
- //扫描的是子包装
- if (pack.parentNumber) {
- this.setPackageData(result);
- } else {
- this.setContainerData(result);
- }
+ result.balance.forEach(
+ b => {
+ this.setPackageData(b,pack);
+ }
+ )
},
+
+ // getScanResult(result) {
+ // let pack = result.package;
+ // let balance = result.balance;
+
+ // if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) {
+ // this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this
+ // .fromLocationCode + "]没有库存余额")
+ // return;
+ // }
+
+ // //扫描的是子包装
+ // if (pack.parentNumber) {
+ // this.setPackageData(result);
+ // } else {
+ // this.setContainerData(result);
+ // }
+ // },
- setPackageData(result) {
- let balance = result.balance;
- let label = result.label;
- let pack = result.package;
+ setPackageData(balance, pack) {
+ // let balance = result.balance;
+ // let pack = result.package;
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
@@ -432,12 +441,18 @@
this.updateData();
},
+ // openScanPopup() {
+ // if (this.businessType) {
+ // this.$refs.scanPopup.openScanPopup(this.businessType);
+ // } else {
+ // this.getBusinessType()
+ // }
+ // },
+
openScanPopup() {
- if (this.businessType) {
- this.$refs.scanPopup.openScanPopup(this.businessType);
- } else {
- this.getBusinessType()
- }
+ setTimeout(r => {
+ this.$refs.scanPopup.openScanPopupByBusinessType(this.businessType);
+ })
},
showFromLocationPopup() {
From 8b7c4acc0f96a90705d198f86c82dec4ef68477f Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sat, 17 Aug 2024 09:11:55 +0800
Subject: [PATCH 04/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/issue/job/issueDetail.vue | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 374ef22a..76a209e7 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -32,7 +32,7 @@
-
+
@@ -449,9 +449,15 @@
afterScan() {
this.resizeCollapse();
- let str = ""
+ this.autoCommit()
+ },
+
+ autoCommit(){
+ var totalQty =0;
+ var taskQty =0;
this.detailSource.forEach(detail => {
detail.Items.forEach(item => {
+ taskQty =calc.add(taskQty,item.qty)
item.Locations.forEach(lco => {
lco.Batchs.forEach(batch => {
batch.Records.forEach(record => {
@@ -466,16 +472,23 @@
str +=
`包装号【${record.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${batch.qty}】不一致\n`
}
-
}
+ if(record){
+ var hanleQty =record.qty?record.qty:0
+ totalQty = calc.add(totalQty,hanleQty)
+ }
+
})
})
})
})
})
-
- if (str) {
+
+ if(str){
str = '任务明细未全部完成,是否提交?\n' + str
+ }
+ if(totalQty!=taskQty){
+ str ="扫描数量["+totalQty+"]与任务数量不一致["+taskQty+"],是否提交"
this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
if (res) {
//防止重复点击
@@ -484,10 +497,9 @@
this.scanPopupGetFocus()
}
});
- } else {
+ }else {
//防止重复点击
this.$throttle(this.submit, 2000, this)()
-
}
},
From c8727798e28372d1bfa5b026b4ef1eb4e9dcfa96 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sat, 17 Aug 2024 10:59:29 +0800
Subject: [PATCH 05/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=81=AF=E7=A0=81?=
=?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/scan/winComScanFg.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index b8772969..92a94549 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -188,6 +188,11 @@
// let productDate = content.substr(lengthMat, 8);
// let batch = content.substr(lengthMat + 8, 3);
let order = content.substr(-8);
+ if(content.length!=lengthBc){
+ that.clear();
+ throw new Error("解析错误:扫描标签长度与配置条码的长度不一致")
+ }
+
if (scanPartNumber != partNumber) {
that.clear();
throw new Error("解析错误:扫描的客户物料号【" + scanPartNumber +
From 7b5f7f91d4dde7bdc070a9e7d6834d72ee32f66a Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sat, 17 Aug 2024 11:00:06 +0800
Subject: [PATCH 06/31] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E3=80=81?=
=?UTF-8?q?=E8=A3=85=E9=85=8D=E4=B8=8A=E6=9E=B6=E6=A0=A1=E9=AA=8C=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/scan/winScanPackage.vue | 48 +++++++++++++++----
.../record/productPutawayRecord.vue | 20 ++++----
2 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index e751e5f4..eb7f074a 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -32,7 +32,13 @@
import {
getBalanceByFilter
} from '@/api/request2.js';
-
+
+ import {
+ getInventoryStatusDesc,
+ getDirectoryItemArray,
+ getLocationAreaTypeName
+ } from '@/common/directory.js';
+
export default {
name: 'winScanPack',
components: {
@@ -55,7 +61,8 @@
data() {
return {
show: false,
- businessType: null
+ businessType: null,
+ scanResult:{}
}
},
created() {
@@ -104,6 +111,7 @@
getScanResult(result) {
if (result.success) {
+ this.scanResult=result
this.getBalance(result, res => {
result.balance = res;
this.$emit("getResult", result);
@@ -130,14 +138,14 @@
value: this.businessType.outInventoryStatuses
})
}
- if (this.businessType.outAreaTypes != null) {
+ if (this.businessType.outAreaTypes ) {
filters.push({
column: "areaType",
action: "in",
value: this.businessType.outAreaTypes
})
}
- if (this.businessType.outAreaCodes != null) {
+ if (this.businessType.outAreaCodes ) {
filters.push({
column: "areaCode",
action: "in",
@@ -146,6 +154,30 @@
}
return filters;
},
+
+ getQueryCondition() {
+ let condition = '按照以下条件:\n';
+ let label = this.scanResult.label;
+ let status = getInventoryStatusDesc(getDirectoryItemArray(this.businessType.outInventoryStatuses));
+ let areaType =getLocationAreaTypeName(this.businessType.outAreaTypes)
+ condition = condition + '物料号=[' + label.itemCode
+ + ']\n箱码=[' + label.packingNumber +
+ ']\n批次=[' +
+ label.batch +
+ ']'
+
+ if (status) {
+ condition = condition + '\n库存状态=[' + status + ']'
+ }
+
+ if (areaType) {
+ condition = condition + '\n库区类型=[' + areaType + ']'
+ }
+ if (this.businessType.outAreaCodes) {
+ condition = condition + '\n库区代码=[' + this.businessType.outAreaCodes + ']'
+ }
+ return condition;
+ },
getBalance(result, callback) {
let filters = [];
@@ -201,9 +233,7 @@
params.filters = filters;
getBalanceByFilter(params).then(res1 => {
if (res1.data.list.length == 0) {
- this.showErrorMessage('未查找到该包装的库存余额', res => {
- this.packGetFocus();
- })
+ this.showErrorMessage(this.getQueryCondition()+'\n未查找到该包装的库存余额')
} else {
res1.data.list.forEach(r => r.parentPackingNumber = packageInfo.number)
callback(res1.data.list)
@@ -212,9 +242,7 @@
this.showErrorMessage(err.message);
})
} else {
- this.showErrorMessage('未查找到该包装的库存余额', res => {
- this.packGetFocus();
- })
+ this.showErrorMessage(this.getQueryCondition()+'\n未查找到该包装的库存余额')
}
}
}).catch(err => {
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index d3362b7d..31cc12c5 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -147,6 +147,7 @@
getScanResult(result) {
let label = result.label;
let pack = result.package;
+ let errorHint=""
result.balance.forEach(
balance => {
let item = this.detailSource.find(res => {
@@ -180,14 +181,19 @@
item.subList.push(newDetail);
} else {
if (detail.scaned == true) {
- this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch +
- "]重复扫描")
+ errorHint+="箱码[" + balance.packingNumber + "批次[" + balance.batch +
+ "]重复扫描\n"
}
}
}
this.calcHandleQty();
}
)
+ if(errorHint){
+ this.showErrorMessage(errorHint)
+ }else {
+ this.scanPopupGetFocus()
+ }
},
getRecommendLocation(balance) {
@@ -251,9 +257,6 @@
this.$forceUpdate();
},
- updateData() {
- this.calcHandleQty();
- },
removeItem(index, item) {
this.removeRecommendLocation([item.expectinNumber]);
this.detailSource.splice(index, 1)
@@ -423,13 +426,6 @@
if (res) {}
});
},
- showErrorMessage(message) {
- this.$refs.comMessage.showErrorMessage(message, res => {
- if (res) {
-
- }
- });
- },
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message);
From 1c1628290c33a1661ff24c7806d91912fb0bb66d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 11:04:20 +0800
Subject: [PATCH 07/31] =?UTF-8?q?HL-5369=E7=89=A9=E6=96=99=E9=9A=94?=
=?UTF-8?q?=E7=A6=BB=E4=BB=BB=E5=8A=A1=EF=BC=8CPDA=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/inventoryMove/coms/comMoveJob.vue | 47 +++++++++++++++++--
.../inventoryMove/job/okToHoldMoveJob.vue | 2 +-
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index fd6ab5f2..7446bf81 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -1,9 +1,9 @@
-
+ :checkedWaitTask="checkedWaitTask" @onQuery="getListByFilter">
@@ -67,7 +67,15 @@
title: {
type: String,
default: ""
- }
+ },
+ isShowItemCode: {
+ type: Boolean,
+ default: false
+ },
+ isShowQurery: {
+ type: Boolean,
+ default: false
+ },
},
data() {
return {
@@ -82,7 +90,8 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- titleName:""
+ titleName:"",
+ filterItemCode:''
};
},
@@ -172,6 +181,15 @@
value: this.status
})
+ if(this.filterItemCode){
+ // 物料代码
+ filters.push({
+ column: "itemCode",
+ action: "like",
+ value: this.filterItemCode
+ })
+ }
+
filters.push({
column: "accept_user_id",
action: "==",
@@ -260,6 +278,27 @@
this.showMessage(error)
})
},
+ getListByFilter(params) {
+ console.log('getListByFilter',params)
+ if (params.itemCode) {
+ // 物料代码
+ this.filterItemCode = params.itemCode
+ }else{
+ this.filterItemCode = ''
+ }
+ if (params.status) {
+ this.status = params.status
+
+ }else{
+ this.status = "1,2"
+ }
+ if(params.creationTime==""){
+ this.checkedToday = false;
+ }
+ this.todayTime = params.creationTime
+
+ this.getList('refresh')
+ },
switchChangeToday(state, creationTime) {
this.checkedToday = state;
diff --git a/src/pages/inventoryMove/job/okToHoldMoveJob.vue b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
index bded74f7..43d7e0b5 100644
--- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
@@ -1,6 +1,6 @@
-
+
From 9e6e5b799dd28bda4d8a1118b602ae3266fd242e Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sat, 17 Aug 2024 11:09:10 +0800
Subject: [PATCH 08/31] =?UTF-8?q?=E5=8F=91=E6=96=99=E6=8E=A5=E6=94=B6?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=92=8C=E8=87=AA=E5=8A=A8=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/productionReceipt/job/productionReceiptDetail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 3968605d..56c41363 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -34,7 +34,7 @@
:locationAreaTypeList="toLocationAreaTypeList">
-
+
From d097282c73bbab2cbdc09b3d5f580cf6596d069a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 13:26:37 +0800
Subject: [PATCH 09/31] =?UTF-8?q?HL-5359=E5=9C=A8=E5=BC=80=E5=85=B3?=
=?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=EF=BC=9A?=
=?UTF-8?q?semiProductReceipCommitValidate=EF=BC=8C=E5=9C=A8=E9=A2=84?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BA=A4=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=BC=80?=
=?UTF-8?q?=E5=85=B3=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E8=A6=81=E6=89=AB?=
=?UTF-8?q?=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=A6=82?=
=?UTF-8?q?=E6=9E=9C=E4=B8=8D=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93?=
=?UTF-8?q?=E4=BD=8D=E5=8F=96=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=9B=AE?=
=?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=82=E8=80=83=E8=A3=85?=
=?UTF-8?q?=E9=85=8D=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84fgProductReceipCom?=
=?UTF-8?q?mitValidate=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/productReceipt/job/productReceiptDetail.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 1c6c3cb3..574f5b56 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -228,9 +228,9 @@
that.jobToLocationCode = that.subList[0].toLocationCode;
that.productionLineCode = that.jobContent.subList[0].productionLineCode;
- if (that.jobContent.allowModifyLocation == 'FALSE') {
- that.toLocationCode = that.subList[0].toLocationCode
- }
+ // if (that.jobContent.allowModifyLocation == 'FALSE') {
+ // that.toLocationCode = that.subList[0].toLocationCode
+ // }
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList)
if (that.scanMessage) {
From fdcf2ab346fe3eb00cefbb7c0378691a6690a5fe Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 13:31:54 +0800
Subject: [PATCH 10/31] =?UTF-8?q?HL-5426=20PDA=E5=8F=91=E6=96=99=E6=8E=A5?=
=?UTF-8?q?=E6=94=B6=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=AD=9B=E9=80=89=E4=B8=AD?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=B2=A1=E6=9C=89=E6=B8=85?=
=?UTF-8?q?=E7=A9=BA=E5=8F=AA=E7=9C=8B=E5=BD=93=E5=A4=A9=E5=92=8C=E5=8F=AA?=
=?UTF-8?q?=E7=9C=8B=E5=BE=85=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productionReceipt/job/productionReceiptJob.vue | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index fe5f82a4..a78c388d 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -460,6 +460,17 @@
}else{
this.filterItemCode = ''
}
+ if (params.status) {
+ this.status = params.status
+
+ }else{
+ this.status = "1,2"
+ }
+ if(params.creationTime==""){
+ this.checkedToday = false;
+ }
+ this.todayTime = params.creationTime
+
this.getList('refresh', this.productionLine, this.filterItemCode)
},
From 2f5d6c0e841baef553ed0793779b3e8ca7aff490 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 17 Aug 2024 13:53:10 +0800
Subject: [PATCH 11/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/record.js | 17 +-
src/mycomponents/balance/balance.vue | 7 +-
.../record/recordComDetailCard.vue | 12 +-
.../scan/winScanParentPackage.vue | 273 ++++++++++++++++++
src/pages/issue/record/directIssue0816.vue | 203 ++++++-------
5 files changed, 385 insertions(+), 127 deletions(-)
create mode 100644 src/mycomponents/scan/winScanParentPackage.vue
diff --git a/src/common/record.js b/src/common/record.js
index df840606..6cbcb38b 100644
--- a/src/common/record.js
+++ b/src/common/record.js
@@ -39,7 +39,7 @@ export function createDetailInfo(balance, pack) {
let detail = deepCopyData(balance);
detail.balanceQty = new Decimal(detail.qty).toNumber()
detail.qty = new Decimal(detail.qty).toNumber();
- detail.packQty = pack.packQty?new Decimal(pack.packQty).toNumber():0
+ detail.packQty = pack.packQty ? new Decimal(pack.packQty).toNumber() : 0
detail.packUnit = pack.packUnit
detail.handleQty = new Decimal(detail.qty).toNumber();
detail.package = pack;
@@ -49,6 +49,21 @@ export function createDetailInfo(balance, pack) {
return detail;
}
+
+export function createDetailByPackInfo(pack) {
+
+ // data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus;
+ // data.inventoryStatus = data.inventoryStatus;
+ let detail = deepCopyData(pack); detail.scaned = true;
+ detail.balanceQty = new Decimal(detail.qty).toNumber()
+ detail.qty = new Decimal(detail.qty).toNumber();
+ detail.packQty = pack.packQty ? new Decimal(pack.packQty).toNumber() : 0
+ detail.packUnit = pack.packUnit
+ detail.handleQty = new Decimal(detail.qty).toNumber();
+ detail.package = pack;
+ return detail;
+}
+
//计算实际数量
export function calcHandleQty(detailSource) {
for (let item of detailSource) {
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index b4ed53fb..fc5582ab 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -2,7 +2,8 @@
-
+
@@ -91,6 +92,10 @@
type: Boolean,
default: false
},
+ isShowParentPack: {
+ type: Boolean,
+ default: true
+ },
},
watch: {
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index 26d24503..cd6be527 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -9,7 +9,8 @@
:isShowBalanceQty="isShowBalanceQty">
-
+
@@ -21,7 +22,7 @@
:right-options="detail.scaned?scanOptions:detailOptions">
+ :isShowToLocation="isShowToLocation" :isShowParentPack="isShowParentPack">
@@ -100,6 +101,11 @@
type: Boolean,
default: false
},
+
+ isShowParentPack: {
+ type: Boolean,
+ default: true
+ },
},
watch: {
@@ -146,7 +152,7 @@
this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
res => {
if (res) {
- this.$emit('removeItem',dataContent)
+ this.$emit('removeItem', dataContent)
// this.$emit('removeItem', this.dataContent)
}
});
diff --git a/src/mycomponents/scan/winScanParentPackage.vue b/src/mycomponents/scan/winScanParentPackage.vue
new file mode 100644
index 00000000..8a0553a8
--- /dev/null
+++ b/src/mycomponents/scan/winScanParentPackage.vue
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/issue/record/directIssue0816.vue b/src/pages/issue/record/directIssue0816.vue
index 6e4668b1..9a28e633 100644
--- a/src/pages/issue/record/directIssue0816.vue
+++ b/src/pages/issue/record/directIssue0816.vue
@@ -18,9 +18,8 @@
+ @removePack="removePack" :isShowParentPack="false">
-
@@ -45,7 +44,8 @@
-
+
+
@@ -79,6 +79,7 @@
getBusinessType,
createItemInfo,
createDetailInfo,
+ createDetailByPackInfo,
calcTreeHandleQty,
calcHandleQty
} from '@/common/record.js';
@@ -100,7 +101,7 @@
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
// import balanceQuery from '@/mycomponents/query/balanceQuery.vue'
- import winScanPackage from '@/mycomponents/scan/winScanPackage.vue'
+ import winScanParentPackage from '@/mycomponents/scan/winScanParentPackage.vue'
export default {
components: {
@@ -114,7 +115,7 @@
recordDetailCard,
balanceSelect,
winComScanBalance,
- winScanPackage
+ winScanParentPackage
// balanceQuery
},
data() {
@@ -196,82 +197,87 @@
},
getScanResult(result) {
- // let balance = result.balance;
let pack = result.package;
- result.balance.forEach(
- b => {
- this.setPackageData(b,pack);
+ let childBalance = result.balance.childBalance;
+ let parentBalance = result.balance.parentBalance[0];
+
+ //1.先判断是否重复扫描
+ if (this.itemCode) {
+ var item = this.detailSource.find(res => res.itemCode == pack.itemCode)
+ if (item == undefined) {
+ this.showErrorMessage("请扫描物料为【" + this.itemCode + "】不在此次发料记录中")
+ return;
}
- )
- },
-
- // getScanResult(result) {
- // let pack = result.package;
- // let balance = result.balance;
-
- // if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) {
- // this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this
- // .fromLocationCode + "]没有库存余额")
- // return;
- // }
+ if (item.subList.length > 0) {
+ var detail = item.subList.find(r => {
+ if (r.packingNumber == pack.number &&
+ r.batch == pack.batch) {
+ return r;
+ }
+ })
- // //扫描的是子包装
- // if (pack.parentNumber) {
- // this.setPackageData(result);
- // } else {
- // this.setContainerData(result);
- // }
- // },
+ if (detail && detail.scaned) {
+ this.showErrorMessage("箱码[" + pack.number + "批次[" + pack.batch + "]重复扫描")
+ return;
+ }
+ }
+ }
- setPackageData(balance, pack) {
- // let balance = result.balance;
- // let pack = result.package;
+ //2.向列表中增加明细
+ //扫描的是子包装
+ if (pack.parentNumber) {
+ //子包装没有库存
+ if (childBalance.length == 0) {
+ this.setPackageData(parentBalance, pack);
+ } else { //子包装有库存
+ this.setPackageData(childBalance[0], pack);
+ }
+ } else {
+ //扫描的是父包装,要过滤掉不在超市的库存,加上没有的库存
+ pack.subList.forEach(sub => {
+ let subBalance = childBalance.find(r => r.packingNumber == sub.number);
+ if (subBalance) {
+ //校验父包装和子包装是否在一个库位
+ if (subBalance.locationCode == parentBalance.locationCode) {
+ this.setPackageData(subBalance, sub);
+ } else {
+ //不在一个库位暂时先不加
+ }
+ } else {
+ //如果子包装没有库存,取父包装库存
+ this.setPackageData(parentBalance, sub);
+ }
+ })
+ }
+ },
+
+ setPackageData(balance, pack) {
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
}
})
if (item == undefined) {
- if (this.itemCode != "" && this.itemCode != balance.itemCode) {
- this.showErrorMessage("请扫描物料为【" + this.itemCode + "】的箱码")
- return;
- }
- if (this.fromWarehouseCode == '') {
- this.fromWarehouseCode = balance.warehouseCode;
- }
var itemp = createItemInfo(balance, pack);
- let newDetail = createDetailInfo(balance, pack); //
- newDetail.parentNumber = pack.parentNumber;
- newDetail.packingNumber = pack.number
- newDetail.packUnit = pack.packUnit;
- newDetail.packQty = pack.packQty;
- if (balance.lableQty) {
- newDetail.handleQty = balance.lableQty
- }
+ let newDetail = this.createPackageDetail(balance, pack);
itemp.subList.push(newDetail);
- this.detailSource.push(itemp)
+ this.detailSource.push(itemp);
this.itemCode = balance.itemCode;
- this.fromLocationCode = balance.locationCode
+ this.fromLocationCode = balance.locationCode;
+ this.fromWarehouseCode = balance.warehouseCode;
this.scanPopupGetFocus()
} else {
var detail = item.subList.find(r => {
if (r.packingNumber == pack.number &&
- r.batch == balance.batch &&
- r.locationCode == balance.locationCode &&
+ r.batch == pack.batch &&
+ r.locationCode == pack.locationCode &&
r.inventoryStatus == balance.inventoryStatus) {
return r;
}
})
if (detail == undefined) {
- let newDetail = createDetailInfo(balance, pack);
- newDetail.parentNumber = pack.parentNumber;
- newDetail.packingNumber = pack.number
- newDetail.packUnit = pack.packUnit;
- newDetail.packQty = pack.packQty;
- if (balance.lableQty) {
- newDetail.handleQty = balance.lableQty
- }
+ let newDetail = this.createPackageDetail(balance, pack);
item.subList.push(newDetail);
this.scanPopupGetFocus()
} else {
@@ -283,73 +289,26 @@
calcHandleQty(this.detailSource);
},
- setContainerData(result) {
- //1.查询托和箱所有的库存
- this.getBalance(result, resList => {
-
- });
- },
-
- getBalance(result, callback) {
- let packageInfo = result.package;
- let filters = [{
- column: "itemCode",
- action: "==",
- value: packageInfo.itemCode
- }, {
- column: "batch",
- action: "==",
- value: packageInfo.batch
- }];
- if (this.businessType.outInventoryStatuses != null) {
- filters.push({
- column: "inventoryStatus",
- action: "in",
- value: this.businessType.outInventoryStatuses
- })
- }
- if (this.businessType.outAreaTypes != null) {
- filters.push({
- column: "areaType",
- action: "in",
- value: this.businessType.outAreaTypes
- })
- }
-
-
- let packingNumber = packageInfo.number;
- packageInfo.subList.forEach(sub => {
- packingNumber = packingNumber + ',' + sub.number
- })
- packingNumber = packingNumber.trimEnd(',');
- filters.push({
- column: "packingNumber",
- action: "in",
- value: packingNumber
- })
- var params = {
- filters: filters,
- pageNo: 1,
- pageSize: 100,
- }
- getBalanceByFilter(params).then(res => {
- if (res.data.list.length > 0) {
- res.data.list.forEach(r => {
- // if (packageInfo.parentNumber !== null) {
- // r.parentPackingNumber = packageInfo.parentNumber
- // } else {
- // r.parentPackingNumber = packageInfo.number
- // }
- })
- callback(res.data.list)
- } else {
+ createPackageDetail(balance, pack) {
+ let newDetail = {};
+ if (balance.packingNumber != pack.number) {
+ newDetail = createDetailByPackInfo(pack);
+ newDetail.inventoryStatus = balance.inventoryStatus;
+ } else {
+ newDetail = createDetailInfo(balance, pack);
+ if (balance.lableQty) {
+ newDetail.handleQty = balance.lableQty
}
- }).catch(err => {
- this.showErrorMessage(err.message);
- })
+ }
+ newDetail.parentNumber = pack.parentNumber;
+ newDetail.packingNumber = pack.number
+ newDetail.packUnit = pack.packUnit;
+ newDetail.packQty = pack.packQty;
+ return newDetail;
},
+
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
@@ -448,7 +407,7 @@
// this.getBusinessType()
// }
// },
-
+
openScanPopup() {
setTimeout(r => {
this.$refs.scanPopup.openScanPopupByBusinessType(this.businessType);
From ca3dc72b155bc09c1130a40f3eef10c6b31ceaef Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 14:01:03 +0800
Subject: [PATCH 12/31] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8CPDA=E5=A2=9E=E5=8A=A0=E7=89=A9?=
=?UTF-8?q?=E6=96=99=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/inventoryMove/coms/comMoveJob.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index 7446bf81..4e77583f 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -212,14 +212,14 @@
uni.stopPullDownRefresh();
}
- var list = res.data.list;
+ let list = res.data.list;
this.totalCount = res.data.total
this.loadingType = "loadmore";
+ this.jobList = type === "refresh" ? list : this.jobList.concat(list);
if (list == null || list.length == 0) {
this.loadingType = "nomore";
return;
}
- this.jobList = type === "refresh" ? list : this.jobList.concat(list);
this.pageNo++;
this.updateTitle();
}).catch(error => {
From df6cf1ff23303120a2f4c158cb528be609902ddf Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sat, 17 Aug 2024 14:20:16 +0800
Subject: [PATCH 13/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
=?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/issue/job/issueDetail.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 76a209e7..baabd9a2 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -453,6 +453,7 @@
},
autoCommit(){
+ let str=""
var totalQty =0;
var taskQty =0;
this.detailSource.forEach(detail => {
From 0f194e6870c6336aaa54ec4f28b62486649f6d59 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 17 Aug 2024 15:07:58 +0800
Subject: [PATCH 14/31] =?UTF-8?q?HL-5366=E7=9B=98=E7=82=B9=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=98=8E=E7=9B=98=EF=BC=8C=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=E6=98=AF=E7=9B=B8=E5=90=8C=E5=8C=85=E8=A3=85?=
=?UTF-8?q?=E3=80=81=E7=9B=B8=E5=90=8C=E7=89=A9=E6=96=99=E3=80=81=E7=9B=B8?=
=?UTF-8?q?=E5=90=8C=E5=BA=93=E4=BD=8D=E3=80=81=E4=B8=8D=E5=90=8C=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=EF=BC=8C=E7=9B=98=E7=82=B9=E4=B9=8B=E5=90=8E=EF=BC=8C?=
=?UTF-8?q?=E4=BA=A7=E7=94=9F=E8=AE=B0=E5=BD=95=E5=8F=98=E6=88=90=E7=9B=B8?=
=?UTF-8?q?=E5=90=8C=E7=89=A9=E6=96=99=E3=80=81=E7=9B=B8=E5=90=8C=E5=BA=93?=
=?UTF-8?q?=E4=BD=8D=E3=80=81=E7=9B=B8=E5=90=8C=E7=8A=B6=E6=80=81=EF=BC=8C?=
=?UTF-8?q?=E4=B9=9F=E9=83=BD=E7=94=9F=E6=88=90=E7=9B=98=E7=82=B9=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/scan/winScanPackAndLocation.vue | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index d7504bf6..a5e6cdce 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -140,6 +140,7 @@
managementPrecision: '',
fromInventoryStatuses: "",
isCheck: false,
+ chooseWhich:'1'
}
},
created() {
@@ -341,7 +342,8 @@
this.countCallBack(datas);
} else {
if (Array.isArray(datas)) {
- this.countCallBack(datas[0]);
+ this.chooseWhich = '2'
+ this.showBalanceSelect(datas);
} else {
this.countCallBack(datas);
}
@@ -386,6 +388,7 @@
// }
} else {
this.showBalanceSelect(datas);
+ this.chooseWhich='1'
}
},
@@ -394,7 +397,12 @@
},
selectBalanceItem(balance) {
- this.packCallBack(balance);
+ if(this.chooseWhich == 1){
+ this.packCallBack(balance);
+ }else{
+ this.countCallBack(balance);
+ }
+
//因为盘点时有负库存,暂时去掉判断 2023年12月28日
// if (balance.qty > 0) {
// this.packCallBack(balance);
From 36fe6cb120c132d808bdd5850b82c067d855360c Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 17 Aug 2024 15:16:32 +0800
Subject: [PATCH 15/31] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=AE=A1=E5=87=BA=E7=9A=84=E5=88=A4?=
=?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/request2.js | 17 ++++-
src/pages/issue/record/directIssue0816.vue | 80 ++++++++++++++++++----
2 files changed, 81 insertions(+), 16 deletions(-)
diff --git a/src/api/request2.js b/src/api/request2.js
index 8dc5ef33..232d296c 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -568,7 +568,7 @@ export function getBasicItemByCodeSenior(itemCode) {
}],
pageNo: 1,
pageSize: 1000
- }
+ }
return request({
url: baseApi + "/wms/itembasic/senior",
method: "post",
@@ -4114,6 +4114,21 @@ export function getBalanceByFilter(param) {
});
}
+
+
+/**
+ * 查询库存事务
+ * @param {*}
+ *
+ */
+export function getTransactionByFilter(param) {
+ return request({
+ url: baseApi + "/wms/transaction/senior",
+ method: "post",
+ data: param,
+ });
+}
+
/**
* 查询管理精度,多个物料,多个库位
* @param {*}
diff --git a/src/pages/issue/record/directIssue0816.vue b/src/pages/issue/record/directIssue0816.vue
index 9a28e633..89d4915e 100644
--- a/src/pages/issue/record/directIssue0816.vue
+++ b/src/pages/issue/record/directIssue0816.vue
@@ -57,7 +57,7 @@
import {
issueRecordSubmit,
getWorkShopLineStation,
- getBalanceByFilter
+ getTransactionByFilter
} from '@/api/request2.js';
import {
@@ -228,27 +228,48 @@
if (pack.parentNumber) {
//子包装没有库存
if (childBalance.length == 0) {
- this.setPackageData(parentBalance, pack);
+ this.getTransactionList(pack.number, transactionRes => {
+ if (transactionRes.length == 0) {
+ this.setPackageData(parentBalance, pack);
+ } else {
+ this.showErrorMessage("箱码[" + pack.number + "批次[" + pack.batch +
+ "]已经发过料")
+ }
+ });
} else { //子包装有库存
this.setPackageData(childBalance[0], pack);
}
} else {
- //扫描的是父包装,要过滤掉不在超市的库存,加上没有的库存
- pack.subList.forEach(sub => {
- let subBalance = childBalance.find(r => r.packingNumber == sub.number);
- if (subBalance) {
- //校验父包装和子包装是否在一个库位
- if (subBalance.locationCode == parentBalance.locationCode) {
- this.setPackageData(subBalance, sub);
+ let packparams = '';
+ pack.subList.forEach(pack => {
+ packparams = packparams + pack.number + ','
+ })
+ packparams = packparams.trimEnd(',');
+ this.getTransactionList(packparams, transactionRes => {
+ //扫描的是父包装,要过滤掉不在超市的库存,加上没有的库存
+ pack.subList.forEach(sub => {
+ let subBalance = childBalance.find(r => r.packingNumber == sub.number);
+ if (subBalance) {
+ //校验父包装和子包装是否在一个库位
+ if (subBalance.locationCode == parentBalance.locationCode) {
+ this.setPackageData(subBalance, sub);
+ } else {
+ //不在一个库位暂时先不加
+ }
+
} else {
- //不在一个库位暂时先不加
+ //如果子包装没有库存,取父包装库存
+ //查询是不是已经出过库,在发料任务中产生了出库库存事务
+ let transaction = transactionRes.find(p => p.packingNumber == sub
+ .number)
+ if (!transaction) {
+ this.setPackageData(parentBalance, sub);
+ }
}
-
- } else {
- //如果子包装没有库存,取父包装库存
- this.setPackageData(parentBalance, sub);
- }
+ })
})
+
+
}
},
@@ -289,6 +310,35 @@
calcHandleQty(this.detailSource);
},
+ //查询发料的业务类型
+ getTransactionList(packingNumbers, callback) {
+ let params = {
+ filters: [{
+ column: "businessType",
+ action: "==",
+ value: "发料"
+ }, {
+ column: "packingNumber",
+ action: "in",
+ value: packingNumbers
+ }, {
+ column: "inventoryAction",
+ action: "==",
+ value: "OUT"
+ }],
+ pageSize: 20,
+ pageNo: 1,
+ sort: "",
+ by: "ASC"
+ }
+
+ getTransactionByFilter(params).then(res => {
+ callback(res.data.list);
+ }).catch(err => {
+ callback([]);
+ })
+ },
+
createPackageDetail(balance, pack) {
let newDetail = {};
From d656c643ebf3fba8f867407f184606139bb24f9f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 17 Aug 2024 15:21:29 +0800
Subject: [PATCH 16/31] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scan/winScanPackAndLocation.vue | 1066 ++++++++---------
1 file changed, 529 insertions(+), 537 deletions(-)
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index a5e6cdce..60c9b134 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -1,538 +1,530 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 93508acd61c5c96a1d0e3a6e5938520f2b1eee11 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 15:38:12 +0800
Subject: [PATCH 17/31] =?UTF-8?q?=E5=9C=A8=E5=BC=80=E5=85=B3=E8=A1=A8?=
=?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=EF=BC=9AsemiProdu?=
=?UTF-8?q?ctReceipCommitValidate=EF=BC=8C=E5=9C=A8=E9=A2=84=E7=94=9F?=
=?UTF-8?q?=E4=BA=A7=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=BC=80=E5=85=B3?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E8=A6=81=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=A6=82=E6=9E=9C?=
=?UTF-8?q?=E4=B8=8D=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?=
=?UTF-8?q?=E5=8F=96=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=9B=AE=E6=A0=87?=
=?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=82=E8=80=83=E8=A3=85=E9=85=8D?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84fgProductReceipCommitValida?=
=?UTF-8?q?te=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/productReceipt/job/productReceiptDetail.vue | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 574f5b56..6cf39a85 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -226,8 +226,13 @@
that.subList = res.data.subList;
that.jobStatus = res.data.status;
that.jobToLocationCode = that.subList[0].toLocationCode;
- that.productionLineCode = that.jobContent.subList[0].productionLineCode;
-
+ that.productionLineCode = that.jobContent.subList[0].productionLineCode;
+ var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate")
+ if(valiDate){
+ that.jobContent.allowModifyLocation = 'TRUE'
+ }else{
+ that.jobContent.allowModifyLocation = 'FALSE'
+ }
// if (that.jobContent.allowModifyLocation == 'FALSE') {
// that.toLocationCode = that.subList[0].toLocationCode
// }
From 1c11e4ea0be03d20c11f5d5fe0e63aadd4252ef3 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 15:53:02 +0800
Subject: [PATCH 18/31] =?UTF-8?q?HL-5388=20=E8=A3=85=E9=85=8D=E6=94=B6?=
=?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=AB=E5=AE=8C=E7=AE=B1?=
=?UTF-8?q?=E7=A0=81=E5=90=8E=EF=BC=8C=E7=82=B9=E5=A4=8D=E5=88=B6=E5=BA=93?=
=?UTF-8?q?=E4=BD=8D=E3=80=81=E6=89=AB=E5=BA=93=E4=BD=8D=E4=B8=8D=E5=BC=B9?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E5=BA=93=E4=BD=8D=E6=A1=86=EF=BC=8C=E7=82=B9?=
=?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=98=AF=E6=89=AB=E7=AE=B1=E7=A0=81=E7=9A=84?=
=?UTF-8?q?=E6=A1=86=EF=BC=8C=E5=BA=94=E5=8A=A0=E4=B8=AA=E6=89=AB=E5=BA=93?=
=?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/productReceipt/job/fgProductReceiptDetail.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index fbfe4c8a..c702a838 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -231,7 +231,14 @@
that.subList = res.data.subList;
that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode
- that.productionLineCode = that.subList[0].productionLineCode;
+ that.productionLineCode = that.subList[0].productionLineCode;
+ var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
+ if(valiDate){
+ that.jobContent.allowModifyLocation = 'TRUE'
+
+ }else{
+ that.jobContent.allowModifyLocation = 'FALSE'
+ }
// if (that.jobContent.allowModifyLocation == 'FALSE') {
// that.toLocationCode = that.subList[0].toLocationCode
// }
From 22e34028d2bec49f1aecbe0d36cfade354d19d6f Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 17 Aug 2024 16:51:39 +0800
Subject: [PATCH 19/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 35 ++
src/pages/issue/job/issueDetail0816.vue | 608 +++++++++++++++++++
src/pages/issue/job/issueJob0816.vue | 746 ++++++++++++++++++++++++
3 files changed, 1389 insertions(+)
create mode 100644 src/pages/issue/job/issueDetail0816.vue
create mode 100644 src/pages/issue/job/issueJob0816.vue
diff --git a/src/pages.json b/src/pages.json
index fa471c6d..fa0e473d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -629,6 +629,41 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/issue/job/issueJob0816",
+ "style": {
+ "navigationBarTitleText": "发料任务0816",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/issue/job/issueDetail0816",
+ "style": {
+ "navigationBarTitleText": "发料任务详情0816",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/issue/record/issueRecord",
"style": {
diff --git a/src/pages/issue/job/issueDetail0816.vue b/src/pages/issue/job/issueDetail0816.vue
new file mode 100644
index 00000000..baabd9a2
--- /dev/null
+++ b/src/pages/issue/job/issueDetail0816.vue
@@ -0,0 +1,608 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/issue/job/issueJob0816.vue b/src/pages/issue/job/issueJob0816.vue
new file mode 100644
index 00000000..a3017f95
--- /dev/null
+++ b/src/pages/issue/job/issueJob0816.vue
@@ -0,0 +1,746 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 6172e62b33a09b05baa8ce56ebca7b75e0841326 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 17 Aug 2024 17:28:32 +0800
Subject: [PATCH 20/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/issue/coms/comScanIssuePack0816.vue | 732 ++++++++++++++++++
1 file changed, 732 insertions(+)
create mode 100644 src/pages/issue/coms/comScanIssuePack0816.vue
diff --git a/src/pages/issue/coms/comScanIssuePack0816.vue b/src/pages/issue/coms/comScanIssuePack0816.vue
new file mode 100644
index 00000000..fc40c63f
--- /dev/null
+++ b/src/pages/issue/coms/comScanIssuePack0816.vue
@@ -0,0 +1,732 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From d8bb622a72bc83f2e87d91f3a40dd33dda07f497 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sat, 17 Aug 2024 17:43:52 +0800
Subject: [PATCH 21/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=EF=BC=8C=E4=B8=8A=E6=9E=B6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/request2.js | 29 ++-
src/mycomponents/query/balanceQuery.vue | 184 ++++++++++--------
.../record/recordComDetailCard.vue | 8 +-
.../record/productPutawayRecord.vue | 1 +
src/pages/putaway/record/putawayRecord.vue | 90 ++++++++-
5 files changed, 222 insertions(+), 90 deletions(-)
diff --git a/src/api/request2.js b/src/api/request2.js
index 8dc5ef33..2fcbcd5b 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4492,4 +4492,31 @@ export function fgChangeCommit(params) {
method: "post",
data: params,
});
-}
\ No newline at end of file
+}
+
+/**
+ * 查询物料与库位关系
+ */
+export function checkItemCodeAndLocation(params) {
+ return request({
+ url: baseApi + "/wms/location/checkRecommendLocation",
+ method: "post",
+ data: params,
+ });
+}
+
+/**
+ * 库存余额根据业务类型汇总接口
+ */
+export function getBalanceByBusinessType(params) {
+ return request({
+ url: baseApi + "/wms/balance/summaryByBusinessType",
+ method: "get",
+ data: params,
+ });
+}
+
+
+
+
+
diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue
index 0a3bee4d..4a3b396a 100644
--- a/src/mycomponents/query/balanceQuery.vue
+++ b/src/mycomponents/query/balanceQuery.vue
@@ -60,7 +60,7 @@
-
+
@@ -86,6 +86,7 @@