diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileCrForm.java index efac03a5..58236e60 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileCrForm.java @@ -123,6 +123,10 @@ public class ContractFileCrForm { @JsonProperty("approval") private String approval; + /** 保证金 **/ + @JsonProperty("bond") + private String bond; + /** 子表数据 **/ @JsonProperty("contract_item0List") private List contract_item0List; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java index 68c6c2bc..c05818cd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java @@ -42,7 +42,8 @@ public class ContractFileModel { private String status; @Excel(name = "集团审批") private String approval; - + @Excel(name = "保证金") + private String bond; private List list; private String creatorTime; private String code; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java index 4afafabc..4c3ca26c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java @@ -405,6 +405,7 @@ public class ContractFileServiceImpl extends ServiceImpl creatorTime; + private List businessDate; private String status; private Date startDate; private Date endDate; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index 069e30e9..d1165b77 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -1398,8 +1398,9 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl PoundDateList = purchaseorderPagination.getCreatorTime(); + //查询日期 修改为业务日期2023/7/11 + if (StringUtil.isNotEmpty(purchaseorderPagination.getBusinessDate())) { + List PoundDateList = purchaseorderPagination.getBusinessDate(); Long fir = Long.valueOf(PoundDateList.get(0)); Long sec = Long.valueOf(PoundDateList.get(1)); purchaseorderPagination.setStartDate(new Date(fir)); 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 df94e134..bd80ef2e 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 @@ -34,6 +34,7 @@ public class SaleorderitemPagination extends Pagination { private Date endDate; private List creatorTime; + private List businessDate; /** * 添加权限 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 6314c5b8..8105b99c 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 @@ -232,8 +232,9 @@ public class SaleorderitemServiceImpl extends ServiceImpl0){ saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); } - if (StringUtil.isNotEmpty(saleorderitemPagination.getCreatorTime())) { - List PoundDateList = saleorderitemPagination.getCreatorTime(); + //修改为业务日期7.11 + if (StringUtil.isNotEmpty(saleorderitemPagination.getBusinessDate())) { + List PoundDateList = saleorderitemPagination.getBusinessDate(); Long fir = Long.valueOf(PoundDateList.get(0)); Long sec = Long.valueOf(PoundDateList.get(1)); saleorderitemPagination.setStartDate(new Date(fir)); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index fa655cde..ea2f0127 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -351,7 +351,7 @@ AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%')) - AND a.creator_time > #{purchaseorderPagination.startDate} AND a.creator_time <= #{purchaseorderPagination.endDate} + AND a.business_date > #{purchaseorderPagination.startDate} AND a.business_date <= #{purchaseorderPagination.endDate} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml index 029d01f7..737a58e4 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml @@ -34,7 +34,7 @@ and a.creator_user_name LIKE CONCAT('%',#{saleorderitemPagination.creatorUserName},'%') - and a.creator_time > #{saleorderitemPagination.startDate} AND a.creator_time <= #{saleorderitemPagination.endDate} + and a.business_date > #{saleorderitemPagination.startDate} AND a.business_date <= #{saleorderitemPagination.endDate} ORDER BY ${saleorderitemPagination.sidx} ${saleorderitemPagination.sort} diff --git a/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue b/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue index 6e140698..023ead61 100644 --- a/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue +++ b/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue @@ -109,6 +109,11 @@ + + +