[fix]销售管理:

修复出货通知
1、前端页面各功能按钮和字段需按照prd文档进行调整
2、列表添加数据

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)

ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml

@@ -30,12 +30,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="deliverStatus"    column="deliver_status"    />
+        <result property="outboundType"    column="outbound_type"    />
+        <result property="orderType"    column="order_type"    />
+        <result property="contactAddress"    column="contact_address"    />
+        <result property="customerContact"    column="customer_contact"    />
+        <result property="contactNumber"    column="contact_number"    />
+        <result property="allPriceExcludingTaxRmb"    column="all_price_excluding_tax_rmb"    />
+        <result property="allPriceExcludingTaxDollar"    column="all_price_excluding_tax_dollar"    />
+        <result property="allPriceIncludesTax"    column="all_price_includes_tax"    />
+        <result property="plannedDeliveryTime"    column="planned_delivery_time"    />
+        <result property="acceptanceTime"    column="acceptance_time"    />
+        <result property="paymentCondition"    column="payment_condition"    />
+        <result property="deliveryCondition"    column="delivery_condition"    />
+        <result property="deliverTime"    column="deliver_time"    />
     </resultMap>
 
+<!--    <sql id="selectDeliveryGoodsDetailVo">-->
+<!--        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-->
+<!--    </sql>-->
+
     <sql id="selectDeliveryGoodsDetailVo">
-        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
     </sql>
-
     <select id="selectDeliveryGoodsDetailList" parameterType="DeliveryGoodsDetail" resultMap="DeliveryGoodsDetailResult">
         <include refid="selectDeliveryGoodsDetailVo"/>
         <where>  

ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html

@@ -81,39 +81,37 @@
                 columns: [
                     {checkbox: true},
                     {field: 'deliveryGoodsDetailId',title: '发货通知单详情id',  visible: false},
-                    {title: '出库单号',field: 'noticeOrderNumber',visible: false},
-                    {title: '出货状态',field: 'deliveryGoodsFlag',visible: false,
-                        formatter: function(value, row, index) {
-                            return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
-                        }
-                    },
+                    {title: '出库单号',field: 'noticeOrderNumber'},
+                    // {title: '出货状态',field: 'deliveryGoodsFlag',
+                    //     formatter: function(value, row, index) {
+                    //         return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
+                    //     }
+                    // },
+                    {title: '出货状态',field: 'deliverStatus'},
+                    {title: '业务员',field: 'finishProductName'},
+                    {title: '关联销售单号',field: 'salesOrderNumber',},
                     {title: '员工ID',field: 'staffNo',visible: false},
-                    {title: '业务员',field: 'saleStaff'},
-                    {title: '关联出库单号',field: '',},
-                    {title: '订单类型',field: '',},
+                    {title: '订单类型',field: 'outboundType',},
+                    {title: '出库类型',field: 'orderType',},
                     {title: '客户ID',field: 'enterpriseCode'},
                     {title: '客户公司名称',field: 'enterpriseName'},
-                    {title: '联系人',field: 'customerContact',visible: false},
-                    {title: '客户厂区',field: 'customerFactory',visible: false},
-                    {title: '客户订单号',field: '',},
-                    {title: '物料总量数量合计',field: '',},
-                    {title: '国内汇率',field: 'rmbTax',visible: false},
-                    {title: '美元汇率',field: 'usdTax',visible: false},
-                    {title: '不含税总价(RMB)',field: 'noRmbSum'},
-                    {title: '含税总价(RMB)',field: 'rmbSum'},
-                    {title: '付款条件',field: 'paymentTerms'},
-                    {title: '国内汇率',field: ''},
-                    {title: '美元汇率',field: ''},
-                    {title: '不含税总价(RMB)',field: ''},
-                    {title: '含税总价(RMB)',field: ''},
-                    {title: '不含税总价(美元)',field: ''},
-                    {title: '计划交付时间',field: ''},
-                    {title: '客户验收时间',field: ''},
-                    {title: '付款条件',field: ''},
-                    {title: '交付条件',field: ''},
-                    {title: '收货人联系人联系电话',field: ''},
-                    {title: '送货日期',field: 'deliveryDate'},
-                    {title: '收货地址',field: 'deliveryAddress'},
+                    {title: '客户订单号',field: 'customerNumber',},
+                    {title: '物料总量',field: 'productQuantity'},
+                    {title: '数量合计',field: 'amountMoney'},
+                    {title: '不含税总价(RMB)',field: 'allPriceExcludingTaxRmb'},
+                    {title: '含税总价(RMB)',field: 'allPriceIncludesTax'},
+                    {title: '不含税总价(美元)',field: 'allPriceExcludingTaxDollar'},
+                    {title: '计划交付时间',field: 'plannedDeliveryTime'},
+                    {title: '客户验收时间',field: 'acceptanceTime'},
+                    {title: '付款条件',field: 'paymentCondition'},
+                    {title: '交付条件',field: 'deliveryCondition'},
+                    {title: '收货联系人',field: 'customerContact'},
+                    {title: '联系电话',field: 'contactNumber'},
+                    {title: '收货地址',field: 'contactAddress'},
+                    {title: '送货日期',field: 'deliverTime'},
+                    {title: '录入时间',field: 'createTime'},
+                    {title: '更新人',field: 'updateBy'},
+                    {title: '上次更新时间',field: 'updateTime'},
                     {
                         title: '操作',
                         align: 'center',