From b53ef12a14936be4c7069b55af8585ed64341d2d Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Fri, 17 Feb 2023 13:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=EF=BC=8C=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilePort/entity/PurchaseOrderVO.java | 93 ++++++++++ .../mapper/PurchaseorderitemMapper.java | 9 +- .../service/PurchaseorderitemService.java | 3 + .../impl/PurchaseorderitemServiceImpl.java | 46 +++-- .../main/resources/PurchaseorderMapper.xml | 7 - .../mapper/customer/CustomerVMapper.xml | 2 +- .../mapper/material/MaterialMapper.xml | 8 +- .../purchaseorder/PurchaseorderMapper.xml | 77 +++++++++ .../supplier/SupplierinvoicesMapper.xml | 2 +- .../main/resources/templates/export/test.ftl | 160 ++++++++++++------ 10 files changed, 324 insertions(+), 83 deletions(-) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/entity/PurchaseOrderVO.java delete mode 100644 SC-boot/linkage-scm/src/main/resources/PurchaseorderMapper.xml create mode 100644 SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/entity/PurchaseOrderVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/entity/PurchaseOrderVO.java new file mode 100644 index 00000000..f6377de3 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/entity/PurchaseOrderVO.java @@ -0,0 +1,93 @@ +package jnpf.mobilePort.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jnpf.purchaseorder.model.purchaseorder.*; +import lombok.Data; + +import java.util.List; + +/** + * @Author: WangChuang + * @Date: 17/2/2023 上午8:49 + * @Description //注释：用于生成pdf文件中所要的数据 + * @Version 1.0 + */ +@Data +public class PurchaseOrderVO { + /** 订单号 **/ + @JsonProperty("documentNo") + private String documentNo; + + /** 合同编码 **/ + @JsonProperty("contractCode") + private String contractCode; + + /** 合同名称 **/ + @JsonProperty("contractName") + private String contractName; + + /** 供货单位 **/ + @JsonProperty("supplierName") + private String supplierName; + + /** 币种 **/ + @JsonProperty("currency") + private String currency; + + /** 对方合同号 **/ + @JsonProperty("contractNo") + private String contractNo; + + /** 垫资金额 **/ + @JsonProperty("advanceAmount") + private String advanceAmount; + + /** 重量 **/ + @JsonProperty("num") + private String num; + + /** 金额 **/ + @JsonProperty("amount") + private String amount; + + /** 不含税金额 **/ + @JsonProperty("notAmount") + private String notAmount; + + /** 备注信息 **/ + @JsonProperty("remark") + private String remark; + + /** 制单人 **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** 制单时间 **/ + @JsonProperty("creatorTime") + private String creatorTime; + + /** ERP订单号 **/ + @JsonProperty("erpNo") + private String erpNo; + + /** 已付款金额 **/ + @JsonProperty("payPrice") + private String payPrice; + + /** 发票数量 **/ + @JsonProperty("invoiceNum") + private String invoiceNum; + + /** 发票金额 **/ + @JsonProperty("invoiceAmount") + private String invoiceAmount; + + /** 单据状态 **/ + @JsonProperty("status") + private String status; + + /** 子表数据 **/ + @JsonProperty("purchaseorder_item0List") + private List purchaseorder_item0List; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java index d95ef2d0..663de08c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java @@ -1,8 +1,13 @@ package jnpf.purchaseorder.mapper; -import jnpf.purchaseorder.entity.PurchaseorderitemEntity; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.mobilePort.entity.PurchaseOrderVO; +import jnpf.purchaseorder.entity.PurchaseorderitemEntity; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @@ -13,5 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 日期： 2023-02-01 */ public interface PurchaseorderitemMapper extends BaseMapper { - + List getPurchorderItemMap(@Param("ew")Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java index 9874e383..da2624f1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java @@ -1,4 +1,5 @@ package jnpf.purchaseorder.service; +import jnpf.mobilePort.entity.PurchaseOrderVO; import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; import jnpf.purchaseorder.entity.Invoices_item0itemEntity; import jnpf.purchaseorder.entity.PaymentitemEntity; @@ -19,6 +20,8 @@ import java.util.*; */ public interface PurchaseorderitemService extends IService { + List getPMap(PurchaseorderPagination purchaseorderPagination); + List getList(PurchaseorderPagination purchaseorderPagination); List getTypeList(PurchaseorderPagination purchaseorderPagination, String dataType); 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 247ac6d3..98f04dff 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 @@ -1,27 +1,29 @@ package jnpf.purchaseorder.service.impl; -import jnpf.purchaseorder.entity.*; -import jnpf.purchaseorder.mapper.PurchaseorderitemMapper; -import jnpf.purchaseorder.service.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mobilePort.entity.PurchaseOrderVO; import jnpf.permission.model.authorize.AuthorizeConditionModel; - - +import jnpf.permission.service.AuthorizeService; +import jnpf.purchaseorder.entity.*; +import jnpf.purchaseorder.mapper.PurchaseorderitemMapper; import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; +import jnpf.purchaseorder.service.*; +import jnpf.util.ServletUtil; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; -import jnpf.permission.service.AuthorizeService; +import javax.annotation.Resource; import java.lang.reflect.Field; -import com.baomidou.mybatisplus.annotation.TableField; - - -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import jnpf.util.*; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * @@ -57,8 +59,16 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl getPMap(PurchaseorderPagination purchaseorderPagination) { +// QueryWrapper wrapper = new QueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PurchaseorderitemEntity::getDocumentNo,purchaseorderPagination.getDocumentNo()); + return purchaseorderitemMapper.getPurchorderItemMap(wrapper); + } @Override public List getList(PurchaseorderPagination purchaseorderPagination){ diff --git a/SC-boot/linkage-scm/src/main/resources/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/PurchaseorderMapper.xml deleted file mode 100644 index c03e09fb..00000000 --- a/SC-boot/linkage-scm/src/main/resources/PurchaseorderMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerVMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerVMapper.xml index e35adf66..00f1787d 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerVMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerVMapper.xml @@ -43,7 +43,7 @@ IFNULL( SUM( b.settlement ), 0.0000000000 )* IFNULL( SUM( b.sales_price ), 0.0000000000 ) salesPriceSum FROM jg_customer a - LEFT JOIN jg_poundlist b ON a.id = b.customer_code + LEFT JOIN jg_poundlist b ON a.id = b.customer_id WHERE ( a.delete_mark != 1 OR a.delete_mark IS NULL ) AND ( b.delete_mark != 1 OR b.delete_mark IS NULL ) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml index f23815b8..7225223f 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml @@ -44,16 +44,16 @@ IFNULL( SUM( b.settlement ), 0.0000000000 ) purchasesWeight, ( CASE - ( SELECT COUNT( DISTINCT COALESCE ( purchase_code, 'NULL' )) FROM jg_poundlist WHERE material_code = a.id ) + ( SELECT COUNT( DISTINCT COALESCE ( purchase_id, 'NULL' )) FROM jg_poundlist WHERE material_id = a.id ) WHEN 0 THEN 0.0000000000 ELSE IFNULL( SUM( b.settlement ), 0.0000000000 ) END ) salesWeight, - ( SELECT COUNT( DISTINCT COALESCE ( purchase_code, 'NULL' )) FROM jg_poundlist WHERE material_code = a.id ) salesNumber, - ( SELECT COUNT( DISTINCT COALESCE ( purchase_code, 'NULL' )) FROM jg_poundlist WHERE material_code = a.id ) purchasesNumber + ( SELECT COUNT( DISTINCT COALESCE ( purchase_id, 'NULL' )) FROM jg_poundlist WHERE material_id = a.id ) salesNumber, + ( SELECT COUNT( DISTINCT COALESCE ( purchase_id, 'NULL' )) FROM jg_poundlist WHERE material_id = a.id ) purchasesNumber FROM jg_material a - LEFT JOIN jg_poundlist b ON a.id = b.material_code + LEFT JOIN jg_poundlist b ON a.id = b.material_id AND ( b.purchase_status != 0 OR b.purchase_status IS NULL ) AND ( b.purchase_status != 99 OR b.purchase_status IS NULL ) AND ( b.pound_status != '1' OR b.pound_status IS NULL ) 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 new file mode 100644 index 00000000..22f5bebf --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml index 1e078da9..1eecb6e8 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml @@ -50,7 +50,7 @@ IFNULL( SUM( b.settlement ), 0.0000000000 )* IFNULL( SUM( b.sales_price ), 0.0000000000 ) salesPriceSum FROM jg_supplier a - LEFT JOIN jg_poundlist b ON a.id = b.supplier_code + LEFT JOIN jg_poundlist b ON a.id = b.supplier_id WHERE ( a.delete_mark != 1 OR a.delete_mark IS NULL ) AND ( b.delete_mark != 1 OR b.delete_mark IS NULL ) diff --git a/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl b/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl index de6bf538..7d5473c3 100644 --- a/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl +++ b/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl @@ -8,59 +8,119 @@ -

${title!""}

-

信息

-
-
-

基本信息:

-

用户名称:${name!""}

-
-
-

集合:

- - - - - - - - - - - <#if reportList?? && (reportList?size>0)> - <#list reportList as reportData> - <#if reportData??> - <#if reportData_index == 0> - - - - - - - - - - <#else > - <#assign preData=reportList[reportData_index-1] /> - - - - - - - - - - - - - -
字段1字段2字段3字段4字段5字段6字段7
${reportData.column1!""}${reportData.column2!""}${reportData.column3!""}${reportData.column4!""}${reportData.column5!""}${reportData.column6!""}${reportData.column7!""}
${reportData.column1!""}${reportData.column2!""}${reportData.column3!""}${reportData.column4!""}${reportData.column5!""}${reportData.column6!""}${reportData.column7!""}
-
-
+
+
+

${title!""}

+ +
+
+

业务部门:${name!""}

+ <#--

用户名称:

--> +
+
+

集合:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#-- <#if reportList?? && (reportList?size>0)>--> + <#-- <#list reportList as reportData>--> + <#-- <#if reportData??>--> + <#-- <#if reportData_index == 0>--> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- <#else >--> + <#-- <#assign preData=reportList[reportData_index-1] />--> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> + <#-- --> +
订单日期2022-12-02对方合同编号对方合同编号合同编号合同编号
供货单位2022-12-02
订单号行号物料名称、规格型号数量单位单价（含税）金额（含税）税率（含税）
订单号行号废钢数量吨单价金额税率
合计数量金额
${reportData.column1!""}${reportData.column2!""}${reportData.column3!""}${reportData.column4!""}${reportData.column5!""}${reportData.column6!""}${reportData.column7!""}
${reportData.column1!""}${reportData.column2!""}${reportData.column3!""}${reportData.column4!""}${reportData.column5!""}${reportData.column6!""}${reportData.column7!""}
+
+
+ + +
+ + +