root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix]销售管理: 

修复出货资料
1、前端页面各功能按钮和字段需按照prd文档进行调整
2、列表添加数据
dev
liuxiaoxu 7 months ago
parent
ca1ffcad17
commit
b9dcd1b9fd
3 changed files with 371 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 249
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java
  2. 53
      ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml
  3. 139
      ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html

249
ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/DeliveryGoodsNotice.java
View File

@ -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)

53
ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml
View File

@ -4,33 +4,78 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.manufacture.mapper.DeliveryGoodsNoticeMapper">
<!-- <resultMap type="DeliveryGoodsNotice" id="DeliveryGoodsNoticeResult">-->
<!-- <result property="deliveryGoodsNoticeId" column="delivery_goods_notice_id" />-->
<!-- <result property="noticeOrderNumber" column="notice_order_number" />-->
<!-- <result property="deliveryDate" column="delivery_date" />-->
<!-- <result property="enterpriseCode" column="enterprise_code" />-->
<!-- <result property="enterpriseName" column="enterprise_name" />-->
<!-- <result property="customerContact" column="customer_contact" />-->
<!-- <result property="customerFactory" column="customer_factory" />-->
<!-- <result property="deliveryAddress" column="delivery_address" />-->
<!-- <result property="exportSales" column="export_sales" />-->
<!-- <result property="stockNumber" column="stock_number" />-->
<!-- <result property="stockName" column="stock_name" />-->
<!-- <result property="remarks" column="remarks" />-->
<!-- <result property="voucherPreparation" column="voucher_preparation" />-->
<!-- <result property="deliveryGoodsFlag" column="delivery_goods_flag" />-->
<!-- <result property="firstAddTime" column="first_add_time" />-->
<!-- <result property="updateInfoTime" column="update_info_time" />-->
<!-- <result property="standbyOne" column="standby_one" />-->
<!-- <result property="standbyTwo" column="standby_two" />-->
<!-- <result property="createBy" column="create_by" />-->
<!-- <result property="createTime" column="create_time" />-->
<!-- <result property="updateBy" column="update_by" />-->
<!-- <result property="updateTime" column="update_time" />-->
<!-- </resultMap>-->
<resultMap type="DeliveryGoodsNotice" id="DeliveryGoodsNoticeResult">
<result property="deliveryGoodsNoticeId" column="delivery_goods_notice_id" />
<result property="noticeOrderNumber" column="notice_order_number" />
<result property="deliveryDate" column="delivery_date" />
<result property="informationType" column="information_type" />
<result property="templateType" column="template_type" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="businessMembers" column="business_members" />
<result property="relatedDeliveryNumber" column="related_delivery_number" />
<result property="customerContact" column="customer_contact" />
<result property="contactNumber" column="contact_number" />
<result property="customerNumber" column="customer_number" />
<result property="customerFactory" column="customer_factory" />
<result property="orderType" column="order_type" />
<result property="deliveryAddress" column="delivery_address" />
<result property="exportSales" column="export_sales" />
<result property="stockNumber" column="stock_number" />
<result property="stockName" column="stock_name" />
<result property="remarks" column="remarks" />
<result property="productQuantity" column="product_quantity" />
<result property="voucherPreparation" column="voucher_preparation" />
<result property="amountMoney" column="amount_money" />
<result property="deliveryGoodsFlag" column="delivery_goods_flag" />
<result property="allPriceExcludingTaxRmb" column="all_price_excluding_tax_rmb" />
<result property="firstAddTime" column="first_add_time" />
<result property="allPriceExcludingTaxDollar" column="all_price_excluding_tax_dollar" />
<result property="updateInfoTime" column="update_info_time" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
<result property="createBy" column="create_by" />
<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" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<!-- <sql id="selectDeliveryGoodsNoticeVo">-->
<!-- 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-->
<!-- </sql>-->
<sql id="selectDeliveryGoodsNoticeVo">
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
</sql>
<select id="selectDeliveryGoodsNoticeList" parameterType="DeliveryGoodsNotice" resultMap="DeliveryGoodsNoticeResult">

139
ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
View File

@ -95,57 +95,104 @@
columns: [
{checkbox: true},
{field: 'deliveryGoodsNoticeId',title: '出货通知单Id',visible: false},
{field: 'noticeOrderNumber',title: '出货通知单号'},
{title: '资料类型',field: '',},
{title: '模版类型',field: 'shipping_template',},
{title: '员工ID',field: 'staffNo',visible: false},
{title: '业务员',field: 'saleStaff'},
{title: '关联出库单号',field: '',},
{title: '订单类型',field: '',},
{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: 'stockNumber',visible: false},
{title: '仓库名称',field: 'stockName',visible: false},
{title: '备注',field: 'remarks'},
{title: '出货状态',field: 'deliveryGoodsFlag',visible: false,
formatter: function(value, row, index) {
return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
}
{
title: '出货资料单单号',
field: 'noticeOrderNumber',
},
{
title: '资料类型',
field: 'informationType',
},
{
title: '模板类型',
field: 'templateType',
},
{
title: '业务员',
field: 'businessMembers',
},
{
title: '关联出库单号',
field: 'relatedDeliveryNumber',
},
{
title: '客户ID',
field: 'enterpriseCode',
},
{
title: '客户公司名称',
field: 'enterpriseName',
},
{
title: '客户订单号',
field: 'customerNumber',
},
{
title: '物料数量',
field: 'productQuantity',
},
{
title: '物料合计',
field: 'amountMoney',
},
{
title: '订单类型',
field: 'orderType',
},
{
title: '不含税总价(RMB)',
field: 'allPriceExcludingTaxRmb',
},
{title: '内外销',field: 'exportSales',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(exportSalesDatas, value);}
{
title: '含税总价(RMB)',
field: 'allPriceIncludesTax',
},
{title: '发货否',field: 'deliveryGoodsFlag',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);}
{
title: '不含税总价(美元)',
field: 'allPriceExcludingTaxDollar',
},
{title: '录入时间',field: 'createTime',
formatter: function (value, row, index) {if (value == null) {return " ";} else {return value;}}
{
title: '计划交付时间',
field: 'plannedDeliveryTime',
},
{title: '更新人',field: 'updateBy',visible: false},
{title: '上次修改时间',field: 'updateTime',
{
title: '客户验收时间',
field: 'acceptanceTime',
},
{
title: '付款条件',
field: 'paymentCondition',
},
{
title: '交付条件',
field: 'deliveryCondition',
},
{
title: '联系人',
field: 'customerContact',
},
{
title: '联系电话',
field: 'contactNumber',
},
{
title: '收货地址',
field: 'deliveryAddress',
},
{
title: '送货日期',
field: 'deliverTime',
},
{
title: '录入时间',
field: 'firstAddTime',
},
{title: '更新人',field: 'updateBy'},
{title: '上次更新时间',field: 'updateTime',
formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(',');return vArr[0];}}
}
},
]
};
$.table.init(options);

Write Preview
Loading…
Cancel
Save