From 7f9ae8f86a6784072c3b8160718a0f3ed3a69cc0 Mon Sep 17 00:00:00 2001 From: vayne Date: Tue, 14 May 2024 16:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E5=92=8C?= =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/form/businessOrder/purchaseIndex.vue | 17 +++++++++-------- .../service/impl/ReceiptOrderServiceImpl.java | 3 +-- .../impl/WarehousingOutboundServiceImpl.java | 1 + .../impl/WarehousingStorageServiceImpl.java | 2 +- .../controller/YunguanInterfaceController.java | 1 + .../src/views/scm/publicPopup/VoucherBox.vue | 2 +- .../purchaseCenter/receiptVoucher/index.vue | 18 +++++------------- .../purchaseCenter/returnCargoOrder/form.vue | 4 ++-- .../scm/saleCenter/deliveryOrder/form.vue | 8 ++++++++ .../views/scm/saleCenter/receiptOrder/form.vue | 8 ++++++++ .../scm/saleCenter/returnCargoOrder/form.vue | 12 ++++++------ 11 files changed, 43 insertions(+), 33 deletions(-) diff --git a/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue b/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue index dea7a1c0..0a93bb8b 100644 --- a/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue +++ b/jnpf-app/pages/scm/form/businessOrder/purchaseIndex.vue @@ -293,20 +293,21 @@ - - ({{i+1}}) - 删除 - + :required="requiredList['settlementinfoList-subjectBasicId']" label="供应商名称"> + + @@ -1117,7 +1118,7 @@ expectArriveDateStart: [], createOrderDate: [], deliveryType: [], - contractId: [], + contractId: [{ "dataType": "varchar", "defaultValue": "", "field": "businessLineId", "fieldName": "", "id": "PneOdw1", "jnpfKey": "popupSelect", "relationField": "businessLineId", "required": "0" }], currency: [], saleMode: [], correlatedOrderId: [], diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java index 9433782f..3bb24f85 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptOrderServiceImpl.java @@ -489,10 +489,9 @@ public class ReceiptOrderServiceImpl extends ServiceImpl - diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue index 60478f1c..6e0333d3 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue @@ -558,20 +558,16 @@ export default { }) return } - if (this.multipleSelectionItem.length > 1) { - this.$message({ - type: 'error', - message: '只能选择一条数据', - duration: 1500, - }) - return - } const selectData = this.multipleSelectionItem let stateFlag = true + let isSaleFlag = true selectData.forEach(function (item) { if (item.flowState != 2) { stateFlag = false; } + if (item.isSaleDeliveryVoucher == '2') { + isSaleFlag = false + } }); if (!stateFlag) { this.$message({ @@ -581,14 +577,10 @@ export default { }) return } - let isSaleFlag = false - selectData.every(function (item) { - isSaleFlag = item.isSaleDeliveryVoucher == '1' - }) if (!isSaleFlag) { this.$message({ type: 'error', - message: '订单已生成销售发货凭证', + message: '凭证已生成销售发货凭证', duration: 1500, }) return diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue index f1b0fa75..8852e709 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue @@ -1303,7 +1303,6 @@ export default { initVoucherList(list) { for (let i = 0; i < list.length; i++) { const e = list[i]; - debugger let item = { voucherId: e.voucherId, voucherCode: e.voucherCode, @@ -1342,7 +1341,6 @@ export default { if (this.dataForm.deliveryProductRelationList.length == 0) { this.dataForm.deliveryProductRelationList.push(productEntity); } else { - debugger const product = this.dataForm.deliveryProductRelationList.find(item => item.id == productEntity.id) if (product) { product.netWeight = this.jnpf.floatAdd(product.netWeight, productEntity.netWeight) @@ -1350,6 +1348,7 @@ export default { product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight) product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight) product.receivedQuantity = this.jnpf.floatAdd(product.receivedQuantity, productEntity.receivedQuantity) + product.deliveryNum = this.jnpf.floatAdd(product.deliveryNum, productEntity.deliveryNum) } else { this.dataForm.deliveryProductRelationList.push(productEntity) } @@ -1551,6 +1550,7 @@ export default { target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight) target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight) target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight) + target.deliveryNum = this.jnpf.floatSub(target.deliveryNum, productNetWeight) } this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1); }).catch(() => { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue index 46c29abb..b9c2afdc 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue @@ -1223,6 +1223,14 @@ export default { }, //选择凭证弹窗 choiceVoucher() { + if (!this.dataForm.businessId) { + this.$message({ + type: "error", + message: "请先选择销售订单", + duration: 1500 + }); + return; + } this.voucherBoxVisible = true let excludeIdList = []; for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue index 22539d3c..b8d42eac 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue @@ -1193,6 +1193,14 @@ export default { }, //选择凭证弹窗 choiceVoucher() { + if (!this.dataForm.businessId) { + this.$message({ + type: "error", + message: "请先选择退货订单", + duration: 1500 + }); + return; + } this.voucherBoxVisible = true let excludeIdList = []; for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue index c0ced638..11f9ace1 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue @@ -1273,7 +1273,6 @@ export default { businessType: '5', } this.dataForm.deliveryVoucherRelationList.push(item) - debugger let productEntity = {} e.warehousingOutboundProductEntityList.forEach(item => { debugger @@ -1299,6 +1298,7 @@ export default { product.grossWeight = this.jnpf.floatAdd(product.grossWeight, productEntity.grossWeight) product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight) product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight) + product.deliveryNum = this.jnpf.floatAdd(product.deliveryNum, productEntity.deliveryNum) } else { this.dataForm.deliveryProductRelationList.push(productEntity) } @@ -1489,22 +1489,22 @@ export default { this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', { type: 'warning' }).then(() => { - const delObj = scope.row.list[0] - var productId = delObj.id - var unit = delObj.unit + const delObj = scope.row + var storageProductId = delObj.storageProductId var productNetWeight = delObj.netWeight var productGrossWeight = delObj.grossWeight var productTareWeight = delObj.tareWeight var productBuckleWeight = delObj.buckleWeight - const target = this.dataForm.deliveryProductRelationList.find(e => e.id == productId && e.deliveryUnit == unit) + const target = this.dataForm.deliveryProductRelationList.find(e => e.id == storageProductId) if (target.netWeight == productNetWeight) { - const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == productId && e.deliveryUnit == unit) + const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == storageProductId) this.dataForm.deliveryProductRelationList.splice(idx, 1) } else { target.netWeight = this.jnpf.floatSub(target.netWeight, productNetWeight) target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight) target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight) target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight) + target.deliveryNum = this.jnpf.floatSub(target.deliveryNum, productNetWeight) } this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1); }).catch(() => {