From b9dcd1b9fd082cd0d57ea5a8675fba8709705b42 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 15 Apr 2024 15:39:46 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=BA=E8=B4=A7=E8=B5=84=E6=96=99=201?= =?UTF-8?q?=E3=80=81=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=90=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=8C=89=E9=92=AE=E5=92=8C=E5=AD=97=E6=AE=B5=E9=9C=80?= =?UTF-8?q?=E6=8C=89=E7=85=A7prd=E6=96=87=E6=A1=A3=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=202=E3=80=81=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/DeliveryGoodsNotice.java | 249 ++++++++++++++++-- .../manufacture/DeliveryGoodsNoticeMapper.xml | 53 +++- .../deliveryGoodsNotice.html | 139 ++++++---- 3 files changed, 371 insertions(+), 70 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java index aeb63e8b..d7c9113e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java @@ -1,12 +1,16 @@ package com.ruoyi.manufacture.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import java.util.Date; + /** - * 发货通知单对象 delivery_goods_notice + * 出货资料 delivery_goods_notice * * @author ruoyi * @date 2023-04-11 @@ -18,56 +22,125 @@ public class DeliveryGoodsNotice extends BaseEntity /** 发货通知单id */ private Long deliveryGoodsNoticeId; - /** 通知单号 */ - @Excel(name = "通知单号") + /** 出货资料单号 */ + @Excel(name = "出货资料单号") private String noticeOrderNumber; /** 发货日期 */ @Excel(name = "发货日期") private String deliveryDate; + /** 资料类型 */ + @Excel(name = "资料类型") + private String informationType; + + /** 模板类型 */ + @Excel(name = "模板类型") + private String templateType; + + /** 业务人员 */ + @Excel(name = "业务人员") + private String businessMembers; + + /** 关联出库单号 */ + @Excel(name = "关联出库单号") + private String relatedDeliveryNumber; + + /** 订单类型 */ + @Excel(name = "订单类型") + private String orderType; + /** 客户代码 */ - @Excel(name = "客户代码") + @Excel(name = "客户ID") private String enterpriseCode; /** 客户名称 */ - @Excel(name = "客户名称") + @Excel(name = "客户公司名称") private String enterpriseName; + /** 客户订单号 */ + @Excel(name = "客户订单号") + private String customerNumber; + + + /** 物料数量 */ + @Excel(name = "物料总量") + private String productQuantity; + + /** 物料合计 */ + @Excel(name = "物料合计") + private String amountMoney; + + /** 不含税总价（RMB） */ + @Excel(name = "不含税总价") + private BigDecimal allPriceExcludingTaxRmb; + + /** 含税总价（RMB） */ + @Excel(name = "含税总价") + private BigDecimal allPriceIncludesTax; + + /** 不含税总价（美元） */ + @Excel(name = "不含税总价") + private BigDecimal allPriceExcludingTaxDollar; + + + /** 计划交付时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date plannedDeliveryTime; + + /** 客户验收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "客户验收时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date acceptanceTime; + + /** 付款条件 */ + @Excel(name = "付款条件") + private String paymentCondition; + + /** 交付条件 */ + @Excel(name = "交付条件") + private String deliveryCondition; + /** 联系人 */ @Excel(name = "联系人") private String customerContact; - /** 客户厂区 */ - @Excel(name = "客户厂区") - private String customerFactory; - /** 送货地址 */ - @Excel(name = "送货地址") + /** 联系电话 */ + @Excel(name = "联系电话") + private String contactNumber; + + /** 收货 */ + @Excel(name = "收货地址") private String deliveryAddress; + /** 送货日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "送货日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date deliverTime; + + + /** 客户厂区 */ + + private String customerFactory; + /** 内外销 */ - @Excel(name = "内外销") private String exportSales; /** 仓库编号 */ - @Excel(name = "仓库编号") private String stockNumber; /** 仓库名称 */ - @Excel(name = "仓库名称") private String stockName; /** 备注 */ - @Excel(name = "备注") private String remarks; /** 制单人 */ - @Excel(name = "制单人") private String voucherPreparation; /** 发货否 */ - @Excel(name = "发货否") private String deliveryGoodsFlag; /** 录入时间 */ @@ -210,21 +283,21 @@ public class DeliveryGoodsNotice extends BaseEntity { return deliveryGoodsFlag; } - public void setFirstAddTime(String firstAddTime) + public void setFirstAddTime(String firstAddTime) { this.firstAddTime = firstAddTime; } - public String getFirstAddTime() + public String getFirstAddTime() { return firstAddTime; } - public void setUpdateInfoTime(String updateInfoTime) + public void setUpdateInfoTime(String updateInfoTime) { this.updateInfoTime = updateInfoTime; } - public String getUpdateInfoTime() + public String getUpdateInfoTime() { return updateInfoTime; } @@ -247,6 +320,142 @@ public class DeliveryGoodsNotice extends BaseEntity return standbyTwo; } + public String getInformationType() { + return informationType; + } + + public void setInformationType(String informationType) { + this.informationType = informationType; + } + + public String getTemplateType() { + return templateType; + } + + public void setTemplateType(String templateType) { + this.templateType = templateType; + } + + public String getBusinessMembers() { + return businessMembers; + } + + public void setBusinessMembers(String businessMembers) { + this.businessMembers = businessMembers; + } + + public String getRelatedDeliveryNumber() { + return relatedDeliveryNumber; + } + + public void setRelatedDeliveryNumber(String relatedDeliveryNumber) { + this.relatedDeliveryNumber = relatedDeliveryNumber; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + public String getProductQuantity() { + return productQuantity; + } + + public void setProductQuantity(String productQuantity) { + this.productQuantity = productQuantity; + } + + public String getAmountMoney() { + return amountMoney; + } + + public void setAmountMoney(String amountMoney) { + this.amountMoney = amountMoney; + } + + public BigDecimal getAllPriceExcludingTaxRmb() { + return allPriceExcludingTaxRmb; + } + + public void setAllPriceExcludingTaxRmb(BigDecimal allPriceExcludingTaxRmb) { + this.allPriceExcludingTaxRmb = allPriceExcludingTaxRmb; + } + + public BigDecimal getAllPriceIncludesTax() { + return allPriceIncludesTax; + } + + public void setAllPriceIncludesTax(BigDecimal allPriceIncludesTax) { + this.allPriceIncludesTax = allPriceIncludesTax; + } + + public BigDecimal getAllPriceExcludingTaxDollar() { + return allPriceExcludingTaxDollar; + } + + public void setAllPriceExcludingTaxDollar(BigDecimal allPriceExcludingTaxDollar) { + this.allPriceExcludingTaxDollar = allPriceExcludingTaxDollar; + } + + public Date getPlannedDeliveryTime() { + return plannedDeliveryTime; + } + + public void setPlannedDeliveryTime(Date plannedDeliveryTime) { + this.plannedDeliveryTime = plannedDeliveryTime; + } + + public Date getAcceptanceTime() { + return acceptanceTime; + } + + public void setAcceptanceTime(Date acceptanceTime) { + this.acceptanceTime = acceptanceTime; + } + + public String getPaymentCondition() { + return paymentCondition; + } + + public void setPaymentCondition(String paymentCondition) { + this.paymentCondition = paymentCondition; + } + + public String getDeliveryCondition() { + return deliveryCondition; + } + + public void setDeliveryCondition(String deliveryCondition) { + this.deliveryCondition = deliveryCondition; + } + + public String getCustomerNumber() { + return customerNumber; + } + + public void setCustomerNumber(String customerNumber) { + this.customerNumber = customerNumber; + } + + public Date getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(Date deliverTime) { + this.deliverTime = deliverTime; + } + + public String getContactNumber() { + return contactNumber; + } + + public void setContactNumber(String contactNumber) { + this.contactNumber = contactNumber; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml index 59dd7680..49727d9b 100644 --- a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml @@ -4,33 +4,78 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + - select delivery_goods_notice_id, notice_order_number, delivery_date, enterprise_code, enterprise_name, customer_contact, customer_factory, delivery_address, export_sales, stock_number, stock_name, remarks, voucher_preparation, delivery_goods_flag, first_add_time, update_info_time, standby_one, standby_two, create_by, create_time, update_by, update_time from delivery_goods_notice + select delivery_goods_notice_id, notice_order_number, delivery_date, information_type, template_type, enterprise_code, enterprise_name, business_members, related_delivery_number, customer_contact, customer_factory, order_type, delivery_address, export_sales, stock_number, customer_number, contact_number,stock_name, remarks, product_quantity, voucher_preparation, amount_money, delivery_goods_flag, all_price_excluding_tax_rmb, first_add_time, all_price_excluding_tax_dollar, update_info_time, all_price_includes_tax, planned_delivery_time, acceptance_time, payment_condition, delivery_condition, deliver_time, create_time, create_by, update_by, update_time from delivery_goods_notice