From 54805740972d4ce27539d5405f2aa56d8a15e7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 6 Mar 2023 15:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=A9=BC=E5=B3=B0=E6=98=A0?= =?UTF-8?q?=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/config/MybatisPlusConfig.java | 2 +- .../controller/CollectionController.java | 28 ++++++++++--------- .../collection/service/CollectionService.java | 2 ++ .../service/impl/CollectionServiceImpl.java | 5 ++++ .../receiptout/ReceiptoutPagination.java | 3 ++ .../SaleorderitemPagination.java | 3 ++ .../impl/SaleorderitemServiceImpl.java | 11 ++++++++ .../scm/basicInformation/saleorder/Form.vue | 1 - .../scm/basicInformation/saleorder/index.vue | 8 ++++++ 9 files changed, 48 insertions(+), 15 deletions(-) diff --git a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java index 940f44a7..f9728b97 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java @@ -272,7 +272,7 @@ public class MybatisPlusConfig { public MybatisConfiguration configuration(DataSource dataSource){ MybatisConfiguration mybatisConfiguration = new MybatisConfiguration(); - mybatisConfiguration.setMapUnderscoreToCamelCase(false); + mybatisConfiguration.setMapUnderscoreToCamelCase(true); mybatisConfiguration.setCacheEnabled(false); mybatisConfiguration.addInterceptor(mybatisPlusInterceptor()); mybatisConfiguration.setLogImpl(Slf4jImpl.class); 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 410331f8..f7c0d61b 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 @@ -477,23 +477,25 @@ public class CollectionController { //子表数据转换 List jg_collection_item0List = collectionService.GetCollection_item0List(id); List jg_collection_item0ModelList = JsonUtil.getJsonToList(jg_collection_item0List,Collection_item0Model.class); - for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList){ + for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(SaleorderitemEntity::getId,jg_collection_item0Model.getSalesorderId()); + queryWrapper.lambda().eq(SaleorderitemEntity::getId, jg_collection_item0Model.getSalesorderId()); SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); - 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.setSalesorderId(saleorderitemEntity.getDocumentNo()); - jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum())); - jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount())); - jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate())); - jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice())); + 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.setSalesorderId(saleorderitemEntity.getDocumentNo()); + jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum())); + jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount())); + jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate())); + jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice())); // Map salesorderIdMap = new HashMap<>(); // jg_collection_item0Model.setSalesorderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",jg_collection_item0Model.getSalesorderId(),salesorderIdMap)); - Map deleteTimeMap = new HashMap<>(); - jg_collection_item0Model.setContractId(generaterSwapUtil.getPopupSelectValue("398848549678332037","id","contract_code",jg_collection_item0Model.getContractId(),deleteTimeMap)); - } + Map deleteTimeMap = new HashMap<>(); + jg_collection_item0Model.setContractId(generaterSwapUtil.getPopupSelectValue("398848549678332037", "id", "contract_code", jg_collection_item0Model.getContractId(), deleteTimeMap)); + } + } vo.setCollection_item0List(jg_collection_item0ModelList); //附表数据转换 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 73b19199..248dd68b 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 @@ -37,5 +37,7 @@ public interface CollectionService extends IService { PoundlistEntity queryPoundInfo(String poundlistId); + PoundlistEntity test (String poundlistId); + //列表子表数据方法 } 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 9efc09ed..9c391c6c 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 @@ -277,6 +277,11 @@ public class CollectionServiceImpl extends ServiceImpl issueDate; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java index 604d4987..e11620f2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java @@ -21,6 +21,9 @@ public class SaleorderitemPagination extends Pagination { /** 单据状态 */ private String status; + + /** 单据状态 */ + private List creatorTime; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java index 2a0404ab..bdbcdeed 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java @@ -1,5 +1,6 @@ package jnpf.saleorder.service.impl; +import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.receiptout.entity.Receiptout_item0Entity; import jnpf.receiptout.service.Receiptout_item0Service; import jnpf.saleorder.entity.*; @@ -227,6 +228,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl creatorTime = saleorderitemPagination.getCreatorTime(); + Long fir = Long.valueOf(creatorTime.get(0)); + Long sec = Long.valueOf(creatorTime.get(1)); + + saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir)) + .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + + } if(AllIdList.size()>0){ saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue index d532e932..01f9ab73 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue @@ -1,5 +1,4 @@