From 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3 Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Wed, 1 Mar 2023 13:29:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/payment/mapper/PaymentMapper.java | 4 + .../jnpf/payment/service/PaymentService.java | 3 + .../service/impl/PaymentServiceImpl.java | 9 +- .../controller/PurchaseorderController.java | 68 +- .../purchaseorder/PurchaseorderCrForm.java | 14 +- .../purchaseorder/PurchaseorderInfoVO.java | 10 +- .../purchaseorder/PurchaseorderUpForm.java | 10 +- .../src/main/resources/PaymentMapper.xml | 7 - .../main/resources/mapper/PaymentMapper.xml | 12 + .../basicInformation/purchaseorder/Detail.vue | 1534 +++++++++++------ .../basicInformation/purchaseorder/Form.vue | 44 +- .../basicInformation/purchaseorder/index.vue | 83 +- 12 files changed, 1165 insertions(+), 633 deletions(-) delete mode 100644 SC-boot/linkage-scm/src/main/resources/PaymentMapper.xml create mode 100644 SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java index 919ee5e8..31683278 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java @@ -3,6 +3,9 @@ package jnpf.payment.mapper; import jnpf.payment.entity.PaymentEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.payment.model.payment.PaymentListVO; + +import java.util.List; /** * @@ -14,5 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PaymentMapper extends BaseMapper { + List queryByPurchaseorderId(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/PaymentService.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/PaymentService.java index 0818231f..523e9ba2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/PaymentService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/PaymentService.java @@ -1,5 +1,6 @@ package jnpf.payment.service; import jnpf.payment.entity.Payment_item0Entity; +import jnpf.payment.model.payment.PaymentListVO; import jnpf.payment.service.Payment_item0Service; import jnpf.payment.entity.PaymentEntity; @@ -33,5 +34,7 @@ public interface PaymentService extends IService { // 子表方法 List GetPayment_item0List(String id); + List queryByPurchaseorderId(String id); + //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java index 8d5e7af6..72cb4645 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java @@ -2,6 +2,7 @@ package jnpf.payment.service.impl; import jnpf.payment.entity.*; import jnpf.payment.mapper.PaymentMapper; +import jnpf.payment.model.payment.PaymentListVO; import jnpf.payment.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.util.RandomUtil; @@ -53,7 +54,8 @@ public class PaymentServiceImpl extends ServiceImpl queryByPurchaseorderId(String id) { + return paymentMapper.queryByPurchaseorderId(id); + } + //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 6940441a..4db70e10 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -19,9 +19,14 @@ import jnpf.contractfile.service.ContractFileService; import jnpf.exception.DataException; import jnpf.materialvo.entity.MaterialEntity; import jnpf.materialvo.service.MaterialService; +import jnpf.payment.model.payment.PaymentListVO; +import jnpf.payment.service.PaymentService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; +import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseback.entity.PurchaseorderEntity; +import jnpf.purchaseback.model.purchaseback.PurchasebackListVO; +import jnpf.purchaseback.service.PurchasebackService; import jnpf.purchaseback.service.PurchaseorderService; import jnpf.purchaseorder.entity.*; import jnpf.purchaseorder.service.*; @@ -79,6 +84,8 @@ public class PurchaseorderController { @Autowired private PurchaseorderitemService purchaseorderitemService; + @Autowired + private PurchasebackService purchasebackService; @Autowired private Purchaseorder_item0Service purchaseorder_item0Service; @Autowired @@ -86,6 +93,8 @@ public class PurchaseorderController { @Autowired private PaymentitemService paymentitemService; @Autowired + private PaymentService paymentService; + @Autowired private PurchasebackitemService purchasebackitemService; @Autowired private CollectionpoService collectionpoService; @@ -475,22 +484,12 @@ public class PurchaseorderController { for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){ } vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class )); - - QueryWrapper PaymentdocpoWrapper = new QueryWrapper<>(); - PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo()); - List paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper); - List PaymentitemList = new ArrayList<>(); - for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) { - List paymentitemlist = purchaseorderitemService.GetPaymentitemList(paymentdocpoEntity.getDocumentNo()); - PaymentitemList.addAll(paymentitemlist); - } - for(PaymentitemEntity paymentitemEntity : PaymentitemList){ - } - vo.setPaymentitemList(JsonUtil.getJsonToList(PaymentitemList,PaymentitemModel.class )); - List PurchasebackitemList = purchaseorderitemService.GetPurchasebackitemList(id); - for(PurchasebackitemEntity purchasebackitemEntity : PurchasebackitemList){ - } - vo.setPurchasebackitemList(JsonUtil.getJsonToList(PurchasebackitemList,PurchasebackitemModel.class )); + List paymentList = paymentService.queryByPurchaseorderId(id); + vo.setPaymentList(paymentList); + QueryWrapper purchasebackWrapper = new QueryWrapper<>(); + purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id); + List PurchasebackList = purchasebackService.list(purchasebackWrapper); + vo.setPurchasebackList(PurchasebackList); List CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo()); for(CollectionpoEntity collectionpoEntity : CollectionitemList){ } @@ -552,29 +551,12 @@ public class PurchaseorderController { } vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class )); - List jg_paymentList = purchaseorderitemService.GetPaymentitemList(id); - List jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentitemModel.class); - for(PaymentitemModel jg_paymentModel : jg_paymentModelList){ - } - vo.setPaymentitemList(jg_paymentModelList); - - QueryWrapper PaymentdocpoWrapper = new QueryWrapper<>(); - PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo()); - List paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper); - List PaymentitemList = new ArrayList<>(); - for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) { - List paymentitemlist = purchaseorderitemService.GetPaymentitemList(paymentdocpoEntity.getDocumentNo()); - PaymentitemList.addAll(paymentitemlist); - } - for(PaymentitemEntity paymentitemEntity : PaymentitemList){ - } - vo.setPaymentitemList(JsonUtil.getJsonToList(PaymentitemList,PaymentitemModel.class )); - - List jg_purchasebackList = purchaseorderitemService.GetPurchasebackitemList(id); - List jg_purchasebackModelList = JsonUtil.getJsonToList(jg_purchasebackList,PurchasebackitemModel.class); - for(PurchasebackitemModel jg_purchasebackModel : jg_purchasebackModelList){ - } - vo.setPurchasebackitemList(jg_purchasebackModelList); + List paymentList = paymentService.queryByPurchaseorderId(id); + vo.setPaymentList(paymentList); + QueryWrapper purchasebackWrapper = new QueryWrapper<>(); + purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id); + List PurchasebackList = purchasebackService.list(purchasebackWrapper); + vo.setPurchasebackList(PurchasebackList); List jg_collectionList = purchaseorderitemService.GetCollectionitemList(id); List jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class); for(CollectionitemModel jg_collectionModel : jg_collectionModelList){ @@ -663,12 +645,12 @@ public class PurchaseorderController { paymentitemService.remove(queryWrapper); } - List PaymentitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentitemList(), PaymentitemEntity.class); + /*List PaymentitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentitemList(), PaymentitemEntity.class); for (PaymentitemEntity entitys : PaymentitemList) { entitys.setId(RandomUtil.uuId()); entitys.setPaymentno(entitys.getPaymentno()); paymentitemService.save(entitys); - } + }*/ // QueryWrapper PaymentitemqueryWrapper = new QueryWrapper<>(); // PaymentitemqueryWrapper.lambda().eq(PaymentitemEntity::getDocumentno, entity.getDocumentNo()); // paymentitemService.remove(PaymentitemqueryWrapper); @@ -679,7 +661,7 @@ public class PurchaseorderController { // entitys.setDocumentno(entity.getDocumentNo()); // paymentitemService.save(entitys); // } - QueryWrapper PurchasebackitemqueryWrapper = new QueryWrapper<>(); + /*QueryWrapper PurchasebackitemqueryWrapper = new QueryWrapper<>(); PurchasebackitemqueryWrapper.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId, entity.getId()); purchasebackitemService.remove(PurchasebackitemqueryWrapper); @@ -698,7 +680,7 @@ public class PurchaseorderController { entitys.setId(RandomUtil.uuId()); entitys.setSalesOrderNo(entity.getDocumentNo()); collectionpoService.save(entitys); - } + }*/ return ActionResult.success("更新成功"); } else { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java index cf9da8e3..3e26a8da 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java @@ -2,6 +2,8 @@ package jnpf.purchaseorder.model.purchaseorder; +import jnpf.payment.model.payment.PaymentListVO; +import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; import jnpf.purchaseorder.model.purchaseorder.Invoices_item0itemModel; import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel; @@ -120,12 +122,12 @@ public class PurchaseorderCrForm { /** 子表数据 **/ @JsonProperty("invoices_item0itemList") private List invoices_item0itemList; - /** 子表数据 **/ - @JsonProperty("paymentitemList") - private List paymentitemList; - /** 子表数据 **/ - @JsonProperty("purchasebackitemList") - private List purchasebackitemList; + /** 子表数据 **/ + @JsonProperty("paymentList") + private List paymentList; + /** 子表数据 **/ + @JsonProperty("purchasebackList") + private List purchasebackList; /** 子表数据 **/ @JsonProperty("collectionitemList") private List collectionitemList; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java index aa386b22..536ace25 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java @@ -3,6 +3,8 @@ package jnpf.purchaseorder.model.purchaseorder; +import jnpf.payment.model.payment.PaymentListVO; +import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; import jnpf.purchaseorder.model.purchaseorder.Invoices_item0itemModel; import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel; @@ -118,11 +120,11 @@ public class PurchaseorderInfoVO{ @JsonProperty("invoices_item0itemList") private List invoices_item0itemList; /** 子表数据 **/ - @JsonProperty("paymentitemList") - private List paymentitemList; + @JsonProperty("paymentList") + private List paymentList; /** 子表数据 **/ - @JsonProperty("purchasebackitemList") - private List purchasebackitemList; + @JsonProperty("purchasebackList") + private List purchasebackList; /** 子表数据 **/ @JsonProperty("collectionitemList") private List collectionitemList; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java index b731e39c..8fc3ce88 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java @@ -2,6 +2,8 @@ package jnpf.purchaseorder.model.purchaseorder; +import jnpf.payment.model.payment.PaymentListVO; +import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; import jnpf.purchaseorder.model.purchaseorder.Invoices_item0itemModel; import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel; @@ -123,11 +125,11 @@ public class PurchaseorderUpForm{ @JsonProperty("invoices_item0itemList") private List invoices_item0itemList; /** 子表数据 **/ - @JsonProperty("paymentitemList") - private List paymentitemList; + @JsonProperty("paymentList") + private List paymentList; /** 子表数据 **/ - @JsonProperty("purchasebackitemList") - private List purchasebackitemList; + @JsonProperty("purchasebackList") + private List purchasebackList; /** 子表数据 **/ @JsonProperty("collectionitemList") private List collectionitemList; diff --git a/SC-boot/linkage-scm/src/main/resources/PaymentMapper.xml b/SC-boot/linkage-scm/src/main/resources/PaymentMapper.xml deleted file mode 100644 index d260b6e8..00000000 --- a/SC-boot/linkage-scm/src/main/resources/PaymentMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml new file mode 100644 index 00000000..43354046 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/PaymentMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue index 33d72726..1a054a86 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue @@ -1,494 +1,1066 @@ diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue index 2779a3bb..8642e683 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue @@ -277,7 +277,7 @@ - + @@ -591,8 +591,8 @@ remark: '', purchaseorder_item0List: [], invoices_item0itemList: [], - paymentitemList: [], - purchasebackitemList: [], + paymentList: [], + purchasebackList: [], collectionitemList: [], }, activeypnmkv: '0', @@ -840,15 +840,15 @@ }, paymentExist() { let isOk = true; - for (let i = 0; i < this.dataForm.paymentitemList.length; i++) { - const e = this.dataForm.paymentitemList[i]; + for (let i = 0; i < this.dataForm.paymentList.length; i++) { + const e = this.dataForm.paymentList[i]; } return isOk; }, purchasebackExist() { let isOk = true; - for (let i = 0; i < this.dataForm.purchasebackitemList.length; i++) { - const e = this.dataForm.purchasebackitemList[i]; + for (let i = 0; i < this.dataForm.purchasebackList.length; i++) { + const e = this.dataForm.purchasebackList[i]; } return isOk; }, @@ -989,10 +989,10 @@ remark: undefined, creatorUserName: undefined, } - this.dataForm.paymentitemList.push(item) + this.dataForm.paymentList.push(item) }, delpaymentList(index) { - this.dataForm.paymentitemList.splice(index, 1); + this.dataForm.paymentList.splice(index, 1); }, addpurchasebackList() { let item = { @@ -1002,10 +1002,10 @@ refundAmount: undefined, creatorUserName: undefined, } - this.dataForm.purchasebackitemList.push(item) + this.dataForm.purchasebackList.push(item) }, delpurchasebackList(index) { - this.dataForm.purchasebackitemList.splice(index, 1); + this.dataForm.purchasebackList.splice(index, 1); }, addcollectionpoList() { let item = { @@ -1028,11 +1028,11 @@ for (let i = 0; i < _data.invoices_item0itemList.length; i++) { var _list = _data.invoices_item0itemList[i]; } - for (let i = 0; i < _data.paymentitemList.length; i++) { - var _list = _data.paymentitemList[i]; + for (let i = 0; i < _data.paymentList.length; i++) { + var _list = _data.paymentList[i]; } - for (let i = 0; i < _data.purchasebackitemList.length; i++) { - var _list = _data.purchasebackitemList[i]; + for (let i = 0; i < _data.purchasebackList.length; i++) { + var _list = _data.purchasebackList[i]; } for (let i = 0; i < _data.collectionitemList.length; i++) { var _list = _data.collectionitemList[i]; @@ -1047,11 +1047,11 @@ for (let i = 0; i < _dataAll.invoices_item0itemList.length; i++) { var _list = _dataAll.invoices_item0itemList[i]; } - for (let i = 0; i < _dataAll.paymentitemList.length; i++) { - var _list = _dataAll.paymentitemList[i]; + for (let i = 0; i < _dataAll.paymentList.length; i++) { + var _list = _dataAll.paymentList[i]; } - for (let i = 0; i < _dataAll.purchasebackitemList.length; i++) { - var _list = _dataAll.purchasebackitemList[i]; + for (let i = 0; i < _dataAll.purchasebackList.length; i++) { + var _list = _dataAll.purchasebackList[i]; } for (let i = 0; i < _dataAll.collectionitemList.length; i++) { var _list = _dataAll.collectionitemList[i]; diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index 82b9ea25..e16b97dd 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -74,6 +74,8 @@