From ca1ffcad17dd29c1cecfd4dfef4b435d311fc733 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 15 Apr 2024 14:01:39 +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=E9=80=9A=E7=9F=A5=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/DeliveryGoodsDetail.java | 242 +++++++++++++++--- .../manufacture/DeliveryGoodsDetailMapper.xml | 21 +- .../deliveryGoodsDetail.html | 58 ++--- 3 files changed, 260 insertions(+), 61 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsDetail.java index 8ca9cb38..b6fa105a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsDetail.java @@ -1,10 +1,14 @@ 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_detail * @@ -18,72 +22,136 @@ public class DeliveryGoodsDetail extends BaseEntity /** 发货通知单详情id */ private Long deliveryGoodsDetailId; - /** 通知单号 */ - @Excel(name = "通知单号") + /** 出库单号 */ + @Excel(name = "出库单号") private String noticeOrderNumber; - /** 订单号码 */ - @Excel(name = "订单号码") + @Excel(name = "出库状态") + private String deliverStatus; + + /** 业务员 */ + @Excel(name = "业务员") + private String finishProductName; + + /** 关联销售单号 */ + @Excel(name = "关联销售单号") private String salesOrderNumber; - /** 客户代码 */ - @Excel(name = "客户代码") + /** 出库类型 */ + @Excel(name = "出库类型") + private String outboundType; + + /** 订单类型 */ + @Excel(name = "订单类型") + private String orderType; + + /** 客户代码/ID */ + @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 contactNumber; + + /** 收货地址 */ + @Excel(name = "收货地址") + private String contactAddress; + + /** 送货日期*/ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "送货日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date deliverTime; + + + /** 成品代码 */ - @Excel(name = "成品代码") private String finishProductCode; - /** 成品名称 */ - @Excel(name = "成品名称") - private String finishProductName; + /** 规格型号 */ - @Excel(name = "规格型号") private String specificationModel; - /** 客户料号 */ - @Excel(name = "客户料号") - private String customerNumber; + + + + + + /** 机种 */ - @Excel(name = "机种") private String typeMachine; /** 单位 */ - @Excel(name = "单位") private String inventoryUnit; /** 币别 */ - @Excel(name = "币别") private String commonCurrency; /** 单价 */ - @Excel(name = "单价") private String processPrice; - /** 数量 */ - @Excel(name = "数量") - private String productQuantity; - /** 金额 */ - @Excel(name = "金额") - private String amountMoney; /** Line# */ - @Excel(name = "Line#") private String line; /** 版本号 */ - @Excel(name = "版本号") private String versionNumber; /** 说明 */ - @Excel(name = "说明") private String salesExplain; /** 备用一 */ @@ -92,6 +160,10 @@ public class DeliveryGoodsDetail extends BaseEntity /** 备用二 */ private String standbyTwo; + + + + public void setDeliveryGoodsDetailId(Long deliveryGoodsDetailId) { this.deliveryGoodsDetailId = deliveryGoodsDetailId; @@ -273,6 +345,118 @@ public class DeliveryGoodsDetail extends BaseEntity return standbyTwo; } + public String getDeliverStatus() { + return deliverStatus; + } + + public void setDeliverStatus(String deliverStatus) { + this.deliverStatus = deliverStatus; + } + + public String getOutboundType() { + return outboundType; + } + + public void setOutboundType(String outboundType) { + this.outboundType = outboundType; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + 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 getCustomerContact() { + return customerContact; + } + + public void setCustomerContact(String customerContact) { + this.customerContact = customerContact; + } + + public String getContactNumber() { + return contactNumber; + } + + public void setContactNumber(String contactNumber) { + this.contactNumber = contactNumber; + } + + public String getContactAddress() { + return contactAddress; + } + + public void setContactAddress(String contactAddress) { + this.contactAddress = contactAddress; + } + + public Date getDeliverTime() { + return deliverTime; + } + + public void setDeliverTime(Date deliverTime) { + this.deliverTime = deliverTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml index 44da9307..916ed7da 100644 --- a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml @@ -30,12 +30,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + - select delivery_goods_detail_id, notice_order_number, sales_order_number, enterprise_code, enterprise_name, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, version_number, sales_explain, standby_one, standby_two,create_by, create_time, update_by, update_time, remark from delivery_goods_detail + select delivery_goods_detail_id, deliver_status,deliver_time,notice_order_number, sales_order_number, enterprise_code, enterprise_name, outbound_type, order_type, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, sales_explain, contact_address, customer_contact, contact_number, create_time, create_by, update_by, update_time, remark, all_price_excluding_tax_rmb, all_price_excluding_tax_dollar, all_price_includes_tax, planned_delivery_time, acceptance_time, payment_condition, delivery_condition from delivery_goods_detail -