From a3c1e9afb9ca03c563eb18f176c6002ec8be6ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 24 Mar 2023 17:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CollectionController.java | 14 +++++++++++++- .../jnpf/collection/mapper/CollectionMapper.java | 3 +++ .../jnpf/collection/service/CollectionService.java | 3 +++ .../service/impl/CollectionServiceImpl.java | 6 ++++++ .../mapper/collection/CollectionMapper.xml | 9 +++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index 570d01c8..b86913a3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -102,6 +102,17 @@ public class CollectionController { return ActionResult.success(result); } + /** + * 合同信息 + * + * @param code + * @return + */ + @GetMapping("/contractShow") + public ActionResult contractShow(@Param("code") String code) { + List contractList = collectionService.queryContractInfo(code); + return ActionResult.success(contractList); + } /** * 选完合同，默认显示订单信息 @@ -204,6 +215,7 @@ public class CollectionController { // saleordercetEntity.setStatus("3"); saleorderitemService.updateById(saleordercetEntity); collectionEntity.setStatus("2"); + collectionEntity.setBusinessDate(new Date()); collectionService.updateById(collectionEntity); return ActionResult.success("认款成功"); } @@ -498,7 +510,7 @@ public class CollectionController { if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice())); jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected())); - jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId()); +// jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId()); jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo()); jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum())); jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount())); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java index 540e3cef..92c5e892 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.collection.entity.CollectionEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.collection.model.collection.CollectionPagination; +import jnpf.contractfile.entity.ContractFileEntity; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.saleorder.entity.SaleorderitemEntity; import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; @@ -26,5 +27,7 @@ public interface CollectionMapper extends BaseMapper { List querySaleOrder(String contractId); + List queryContract(String code); + IPage queryCollection(@Param("page") Page page, @Param("collectionPagination") CollectionPagination collectionPagination); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java index d1e59aa7..67540eaa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java @@ -5,6 +5,7 @@ import jnpf.collection.service.Collection_item0Service; import jnpf.collection.entity.CollectionEntity; import com.baomidou.mybatisplus.extension.service.IService; import jnpf.collection.model.collection.CollectionPagination; +import jnpf.contractfile.entity.ContractFileEntity; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.saleorder.entity.SaleorderitemEntity; @@ -42,5 +43,7 @@ public interface CollectionService extends IService { List querySaleOrderInfo(String contractId); + List queryContractInfo(String code); + //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java index 70a6e2e6..52a686e2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java @@ -4,6 +4,7 @@ import jnpf.collection.entity.*; import jnpf.collection.mapper.CollectionMapper; import jnpf.collection.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.contractfile.entity.ContractFileEntity; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.saleorder.entity.SaleorderitemEntity; @@ -288,6 +289,11 @@ public class CollectionServiceImpl extends ServiceImpl queryContractInfo(String code) { + return collectionMapper.queryContract(code); + } + //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml index 0593174f..be3051bc 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml @@ -41,4 +41,13 @@ and delete_mark = '0' + +