发货主表 明细表 订单主表添加字段 添加发货费用表 发货附件表

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.List;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -32,7 +33,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 发货通知单实体类
  *
  * @author BladeX
- * @since 2021-09-26
+ * @since 2021-10-21
  */
 @Data
 @TableName("business_delivery")
@@ -157,6 +158,11 @@ public class Delivery implements Serializable {
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
 	/**
+	* 仓库类型
+	*/
+		@ApiModelProperty(value = "仓库类型")
+		private String warehouseType;
+	/**
 	* 创建人
 	*/
 		@ApiModelProperty(value = "创建人")
@@ -182,6 +188,36 @@ public class Delivery implements Serializable {
 		@ApiModelProperty(value = "修改时间")
 		private Date updateTime;
 	/**
+	* 出库金额
+	*/
+		@ApiModelProperty(value = "出库金额")
+		private BigDecimal deliveryAmount;
+	/**
+	* 费用合计
+	*/
+		@ApiModelProperty(value = "费用合计")
+		private BigDecimal totalCost;
+	/**
+	* 合同号
+	*/
+		@ApiModelProperty(value = "合同号")
+		private String contractNumber;
+	/**
+	* 业务员
+	*/
+		@ApiModelProperty(value = "业务员")
+		private String saleman;
+	/**
+	* 销售公司
+	*/
+		@ApiModelProperty(value = "销售公司")
+		private Long salesCompany;
+	/**
+	* 发票重量
+	*/
+		@ApiModelProperty(value = "发票重量")
+		private BigDecimal invoiceWeight;
+	/**
 	* 状态（0 正常 1停用）
 	*/
 		@ApiModelProperty(value = "状态（0 正常 1停用）")
@@ -192,9 +228,9 @@ public class Delivery implements Serializable {
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
 	/**
-	 * 发货收货明细
+	 * 发货 收货明细
 	 */
-		@ApiModelProperty(value = "发货收货明细")
+		@ApiModelProperty(value = "发货 收货明细")
 		@TableField(exist = false)
 		private List<DeliveryItems> deliveryItemsList;
 

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryFees.java

@@ -0,0 +1,159 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 发货费用明细表实体类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@Data
+@TableName("business_delivery_fees")
+@ApiModel(value = "DeliveryFees对象", description = "发货费用明细表")
+public class DeliveryFees implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 主表id
+	*/
+		@ApiModelProperty(value = "主表id")
+		private Long pid;
+	/**
+	* 排序
+	*/
+		@ApiModelProperty(value = "排序")
+		private Integer sort;
+	/**
+	* 费用id
+	*/
+		@ApiModelProperty(value = "费用id")
+		private Long itemId;
+	/**
+	* 客户id
+	*/
+		@ApiModelProperty(value = "客户id")
+		private Long corpId;
+	/**
+	* 数量
+	*/
+		@ApiModelProperty(value = "数量")
+		private BigDecimal quantity;
+	/**
+	* 计费单位
+	*/
+		@ApiModelProperty(value = "计费单位")
+		private String unit;
+	/**
+	* 单价
+	*/
+		@ApiModelProperty(value = "单价")
+		private BigDecimal price;
+	/**
+	* 金额
+	*/
+		@ApiModelProperty(value = "金额")
+		private BigDecimal amount;
+	/**
+	* 币别
+	*/
+		@ApiModelProperty(value = "币别")
+		private String currency;
+	/**
+	* 汇率
+	*/
+		@ApiModelProperty(value = "汇率")
+		private BigDecimal exchangeRate;
+	/**
+	* 税率
+	*/
+		@ApiModelProperty(value = "税率")
+		private BigDecimal taxRate;
+	/**
+	* 核销金额
+	*/
+		@ApiModelProperty(value = "核销金额")
+		private BigDecimal settlmentAmount;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	 * 租户id
+	 */
+		@ApiModelProperty(value = "租户id")
+		private String tenantId;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private Date createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private Date updateTime;
+	/**
+	* 状态（0 正常 1停用）
+	*/
+		@ApiModelProperty(value = "状态（0 正常 1停用）")
+		private Integer status;
+	/**
+	* 是否已删除（0 否 1是）
+	*/
+		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		private Integer isDeleted;
+
+
+}

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryFiles.java

@@ -0,0 +1,118 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 发货附件表实体类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@Data
+@TableName("business_delivery_files")
+@ApiModel(value = "DeliveryFiles对象", description = "发货附件表")
+public class DeliveryFiles implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 主键
+	*/
+		@ApiModelProperty(value = "主键")
+		private Long id;
+	/**
+	* 主表id
+	*/
+		@ApiModelProperty(value = "主表id")
+		private Long pid;
+	/**
+	* 排序
+	*/
+		@ApiModelProperty(value = "排序")
+		private Integer sort;
+	/**
+	* 文件名
+	*/
+		@ApiModelProperty(value = "文件名")
+		private String fileName;
+	/**
+	* 文件地址
+	*/
+		@ApiModelProperty(value = "文件地址")
+		private String url;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
+	 * 租户id
+	 */
+		@ApiModelProperty(value = "租户id")
+		private String tenantId;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private Date createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private Date updateTime;
+	/**
+	* 状态（0 正常 1停用）
+	*/
+		@ApiModelProperty(value = "状态（0 正常 1停用）")
+		private Integer status;
+	/**
+	* 是否已删除（0 否 1是）
+	*/
+		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		private Integer isDeleted;
+
+
+}

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -18,7 +18,6 @@ package org.springblade.deliver.goods.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -31,7 +30,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 发货明细实体类
  *
  * @author BladeX
- * @since 2021-09-26
+ * @since 2021-10-21
  */
 @Data
 @TableName("business_delivery_items")
@@ -116,6 +115,11 @@ public class DeliveryItems implements Serializable {
 		@ApiModelProperty(value = "来源id")
 		private Long srcId;
 	/**
+	* 库存数量
+	*/
+		@ApiModelProperty(value = "库存数量")
+		private BigDecimal inventoryNumber;
+	/**
 	* 备注
 	*/
 		@ApiModelProperty(value = "备注")
@@ -165,6 +169,56 @@ public class DeliveryItems implements Serializable {
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
+	/**
+	* 商品类别
+	*/
+		@ApiModelProperty(value = "商品类别")
+		private String priceCategory;
+	/**
+	* 库存金额
+	*/
+		@ApiModelProperty(value = "库存金额")
+		private BigDecimal inventoryAmount;
+	/**
+	* 出库金额
+	*/
+		@ApiModelProperty(value = "出库金额")
+		private BigDecimal deliveryAmount;
+	/**
+	* 提单号
+	*/
+		@ApiModelProperty(value = "提单号")
+		private String billNo;
+	/**
+	* 合同号
+	*/
+		@ApiModelProperty(value = "合同号")
+		private String contractNumber;
+	/**
+	* 发票重量
+	*/
+		@ApiModelProperty(value = "发票重量")
+		private BigDecimal invoiceWeight;
+	/**
+	* 码单重量
+	*/
+		@ApiModelProperty(value = "码单重量")
+		private BigDecimal billWeight;
+	/**
+	* 单价
+	*/
+		@ApiModelProperty(value = "单价")
+		private BigDecimal price;
+	/**
+	* 合同金额
+	*/
+		@ApiModelProperty(value = "合同金额")
+		private BigDecimal contractAmount;
+	/**
+	* 税率
+	*/
+		@ApiModelProperty(value = "税率")
+		private BigDecimal taxRate;
 
 
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/vo/DeliveryFeesVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.vo;
+
+import org.springblade.deliver.goods.entity.DeliveryFees;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 发货费用明细表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "DeliveryFeesVO对象", description = "发货费用明细表")
+public class DeliveryFeesVO extends DeliveryFees {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/vo/DeliveryFilesVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.vo;
+
+import org.springblade.deliver.goods.entity.DeliveryFiles;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 发货附件表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "DeliveryFilesVO对象", description = "发货附件表")
+public class DeliveryFilesVO extends DeliveryFiles {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -389,6 +389,27 @@ public class Order implements Serializable {
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
 	/**
+	 * 到港日期
+	 */
+		@ApiModelProperty(value = "到港日期")
+		private LocalDateTime dateOfArrival;
+	/**
+	 * 是否到货
+	 */
+		@ApiModelProperty(value = "是否到货")
+		private Integer arrival;
+	/**
+	 * 首付比列
+	 */
+		@ApiModelProperty(value = "首付比列")
+		private BigDecimal downPayment;
+	/**
+	 * 人民币金额
+	 */
+		@ApiModelProperty(value = "人民币金额")
+		private BigDecimal rmbAmount;
+
+	/**
 	 * 订单费用信息
 	 */
 		@ApiModelProperty(value = "订单费用信息")

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryFeesController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.deliver.goods.entity.DeliveryFees;
+import org.springblade.deliver.goods.vo.DeliveryFeesVO;
+import org.springblade.deliver.goods.service.IDeliveryFeesService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 发货费用明细表 控制器
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/deliveryfees")
+@Api(value = "发货费用明细表", tags = "发货费用明细表接口")
+public class DeliveryFeesController extends BladeController {
+
+	private final IDeliveryFeesService deliveryFeesService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入deliveryFees")
+	public R<DeliveryFees> detail(DeliveryFees deliveryFees) {
+		DeliveryFees detail = deliveryFeesService.getOne(Condition.getQueryWrapper(deliveryFees));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 发货费用明细表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入deliveryFees")
+	public R<IPage<DeliveryFees>> list(DeliveryFees deliveryFees, Query query) {
+		IPage<DeliveryFees> pages = deliveryFeesService.page(Condition.getPage(query), Condition.getQueryWrapper(deliveryFees));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 发货费用明细表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入deliveryFees")
+	public R<IPage<DeliveryFeesVO>> page(DeliveryFeesVO deliveryFees, Query query) {
+		IPage<DeliveryFeesVO> pages = deliveryFeesService.selectDeliveryFeesPage(Condition.getPage(query), deliveryFees);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 发货费用明细表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入deliveryFees")
+	public R save(@Valid @RequestBody DeliveryFees deliveryFees) {
+		return R.status(deliveryFeesService.save(deliveryFees));
+	}
+
+	/**
+	 * 修改 发货费用明细表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入deliveryFees")
+	public R update(@Valid @RequestBody DeliveryFees deliveryFees) {
+		return R.status(deliveryFeesService.updateById(deliveryFees));
+	}
+
+	/**
+	 * 新增或修改 发货费用明细表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入deliveryFees")
+	public R submit(@Valid @RequestBody DeliveryFees deliveryFees) {
+		return R.status(deliveryFeesService.saveOrUpdate(deliveryFees));
+	}
+
+	
+	/**
+	 * 删除 发货费用明细表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(deliveryFeesService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryFilesController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.deliver.goods.entity.DeliveryFiles;
+import org.springblade.deliver.goods.vo.DeliveryFilesVO;
+import org.springblade.deliver.goods.service.IDeliveryFilesService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 发货附件表 控制器
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/deliveryfiles")
+@Api(value = "发货附件表", tags = "发货附件表接口")
+public class DeliveryFilesController extends BladeController {
+
+	private final IDeliveryFilesService deliveryFilesService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入deliveryFiles")
+	public R<DeliveryFiles> detail(DeliveryFiles deliveryFiles) {
+		DeliveryFiles detail = deliveryFilesService.getOne(Condition.getQueryWrapper(deliveryFiles));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 发货附件表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入deliveryFiles")
+	public R<IPage<DeliveryFiles>> list(DeliveryFiles deliveryFiles, Query query) {
+		IPage<DeliveryFiles> pages = deliveryFilesService.page(Condition.getPage(query), Condition.getQueryWrapper(deliveryFiles));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 发货附件表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入deliveryFiles")
+	public R<IPage<DeliveryFilesVO>> page(DeliveryFilesVO deliveryFiles, Query query) {
+		IPage<DeliveryFilesVO> pages = deliveryFilesService.selectDeliveryFilesPage(Condition.getPage(query), deliveryFiles);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 发货附件表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入deliveryFiles")
+	public R save(@Valid @RequestBody DeliveryFiles deliveryFiles) {
+		return R.status(deliveryFilesService.save(deliveryFiles));
+	}
+
+	/**
+	 * 修改 发货附件表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入deliveryFiles")
+	public R update(@Valid @RequestBody DeliveryFiles deliveryFiles) {
+		return R.status(deliveryFilesService.updateById(deliveryFiles));
+	}
+
+	/**
+	 * 新增或修改 发货附件表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入deliveryFiles")
+	public R submit(@Valid @RequestBody DeliveryFiles deliveryFiles) {
+		return R.status(deliveryFilesService.saveOrUpdate(deliveryFiles));
+	}
+
+	
+	/**
+	 * 删除 发货附件表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(deliveryFilesService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFeesMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.mapper;
+
+import org.springblade.deliver.goods.entity.DeliveryFees;
+import org.springblade.deliver.goods.vo.DeliveryFeesVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 发货费用明细表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+public interface DeliveryFeesMapper extends BaseMapper<DeliveryFees> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param deliveryFees
+	 * @return
+	 */
+	List<DeliveryFeesVO> selectDeliveryFeesPage(IPage page, DeliveryFeesVO deliveryFees);
+
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFeesMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.deliver.goods.mapper.DeliveryFeesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="deliveryFeesResultMap" type="org.springblade.deliver.goods.entity.DeliveryFees">
+        <id column="id" property="id"/>
+        <result column="pid" property="pid"/>
+        <result column="sort" property="sort"/>
+        <result column="item_id" property="itemId"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="quantity" property="quantity"/>
+        <result column="unit" property="unit"/>
+        <result column="price" property="price"/>
+        <result column="amount" property="amount"/>
+        <result column="currency" property="currency"/>
+        <result column="exchange_rate" property="exchangeRate"/>
+        <result column="tax_rate" property="taxRate"/>
+        <result column="settlment_amount" property="settlmentAmount"/>
+        <result column="remarks" property="remarks"/>
+        <result column="version" property="version"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectDeliveryFeesPage" resultMap="deliveryFeesResultMap">
+        select * from business_delivery_fees where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFilesMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.mapper;
+
+import org.springblade.deliver.goods.entity.DeliveryFiles;
+import org.springblade.deliver.goods.vo.DeliveryFilesVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 发货附件表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+public interface DeliveryFilesMapper extends BaseMapper<DeliveryFiles> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param deliveryFiles
+	 * @return
+	 */
+	List<DeliveryFilesVO> selectDeliveryFilesPage(IPage page, DeliveryFilesVO deliveryFiles);
+
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFilesMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.deliver.goods.mapper.DeliveryFilesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="deliveryFilesResultMap" type="org.springblade.deliver.goods.entity.DeliveryFiles">
+        <id column="id" property="id"/>
+        <result column="pid" property="pid"/>
+        <result column="sort" property="sort"/>
+        <result column="file_name" property="fileName"/>
+        <result column="url" property="url"/>
+        <result column="remarks" property="remarks"/>
+        <result column="version" property="version"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectDeliveryFilesPage" resultMap="deliveryFilesResultMap">
+        select * from business_delivery_files where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 发货明细 Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-26
+ * @since 2021-10-21
  */
 public interface DeliveryItemsMapper extends BaseMapper<DeliveryItems> {
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -19,6 +19,7 @@
         <result column="org_order_no" property="orgOrderNo"/>
         <result column="src_order_no" property="srcOrderNo"/>
         <result column="src_id" property="srcId"/>
+        <result column="inventory_number" property="inventoryNumber"/>
         <result column="remarks" property="remarks"/>
         <result column="version" property="version"/>
         <result column="create_user" property="createUser"/>
@@ -28,6 +29,16 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="price_category" property="priceCategory"/>
+        <result column="inventory_amount" property="inventoryAmount"/>
+        <result column="delivery_amount" property="deliveryAmount"/>
+        <result column="bill_no" property="billNo"/>
+        <result column="contract_number" property="contractNumber"/>
+        <result column="invoice_weight" property="invoiceWeight"/>
+        <result column="bill_weight" property="billWeight"/>
+        <result column="price" property="price"/>
+        <result column="contract_amount" property="contractAmount"/>
+        <result column="tax_rate" property="taxRate"/>
     </resultMap>
 
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryMapper.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 发货通知单 Mapper 接口
  *
  * @author BladeX
- * @since 2021-09-26
+ * @since 2021-10-21
  */
 public interface DeliveryMapper extends BaseMapper<Delivery> {
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryMapper.xml

@@ -26,11 +26,18 @@
         <result column="delivery_remarks" property="deliveryRemarks"/>
         <result column="special_remarks" property="specialRemarks"/>
         <result column="version" property="version"/>
+        <result column="warehouse_type" property="warehouseType"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
         <result column="update_user" property="updateUser"/>
         <result column="update_time" property="updateTime"/>
+        <result column="delivery_amount" property="deliveryAmount"/>
+        <result column="total_cost" property="totalCost"/>
+        <result column="contract_number" property="contractNumber"/>
+        <result column="saleman" property="saleman"/>
+        <result column="sales_company" property="salesCompany"/>
+        <result column="invoice_weight" property="invoiceWeight"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/IDeliveryFeesService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.service;
+
+import org.springblade.deliver.goods.entity.DeliveryFees;
+import org.springblade.deliver.goods.vo.DeliveryFeesVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 发货费用明细表 服务类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+public interface IDeliveryFeesService extends IService<DeliveryFees> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param deliveryFees
+	 * @return
+	 */
+	IPage<DeliveryFeesVO> selectDeliveryFeesPage(IPage<DeliveryFeesVO> page, DeliveryFeesVO deliveryFees);
+
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/IDeliveryFilesService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.service;
+
+import org.springblade.deliver.goods.entity.DeliveryFiles;
+import org.springblade.deliver.goods.vo.DeliveryFilesVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 发货附件表 服务类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+public interface IDeliveryFilesService extends IService<DeliveryFiles> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param deliveryFiles
+	 * @return
+	 */
+	IPage<DeliveryFilesVO> selectDeliveryFilesPage(IPage<DeliveryFilesVO> page, DeliveryFilesVO deliveryFiles);
+
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryFeesServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.service.impl;
+
+import org.springblade.deliver.goods.entity.DeliveryFees;
+import org.springblade.deliver.goods.vo.DeliveryFeesVO;
+import org.springblade.deliver.goods.mapper.DeliveryFeesMapper;
+import org.springblade.deliver.goods.service.IDeliveryFeesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 发货费用明细表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@Service
+public class DeliveryFeesServiceImpl extends ServiceImpl<DeliveryFeesMapper, DeliveryFees> implements IDeliveryFeesService {
+
+	@Override
+	public IPage<DeliveryFeesVO> selectDeliveryFeesPage(IPage<DeliveryFeesVO> page, DeliveryFeesVO deliveryFees) {
+		return page.setRecords(baseMapper.selectDeliveryFeesPage(page, deliveryFees));
+	}
+
+}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryFilesServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.deliver.goods.service.impl;
+
+import org.springblade.deliver.goods.entity.DeliveryFiles;
+import org.springblade.deliver.goods.vo.DeliveryFilesVO;
+import org.springblade.deliver.goods.mapper.DeliveryFilesMapper;
+import org.springblade.deliver.goods.service.IDeliveryFilesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 发货附件表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-10-21
+ */
+@Service
+public class DeliveryFilesServiceImpl extends ServiceImpl<DeliveryFilesMapper, DeliveryFiles> implements IDeliveryFilesService {
+
+	@Override
+	public IPage<DeliveryFilesVO> selectDeliveryFilesPage(IPage<DeliveryFilesVO> page, DeliveryFilesVO deliveryFiles) {
+		return page.setRecords(baseMapper.selectDeliveryFilesPage(page, deliveryFiles));
+	}
+
+}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -72,6 +72,10 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="date_of_arrival" property="dateOfArrival"/>
+        <result column="arrival" property="arrival"/>
+        <result column="down_payment" property="downPayment"/>
+        <result column="rmb_amount" property="rmbAmount"/>
     </resultMap>