修改字段

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsDescClient.java

@@ -49,6 +49,6 @@ public interface ICorpsDescClient {
 	 * @return 客户集合
 	 */
 	@GetMapping(CORP_DETAILS)
-	R<List<CorpsDescVO>> selCorpsDetails(String tenantId);
+	R<List<CorpsDescVO>> selCorpsDetails(@RequestParam("tenantId") String tenantId);
 
 }

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

@@ -16,20 +16,17 @@
  */
 package org.springblade.purchase.sales.entity;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 /**
  * 销售或采购订单表实体类
  *
@@ -44,414 +41,418 @@ public class Order implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 系统编号
-	*/
-		@ApiModelProperty(value = "系统编号")
-		private String sysNo;
-	/**
-	* 订单号
-	*/
-		@ApiModelProperty(value = "订单号")
-		private String orderNo;
-	/**
-	* 主订单号
-	*/
-		@ApiModelProperty(value = "主订单号")
-		private String morderNo;
-	/**
-	* 原始订单号
-	*/
-		@ApiModelProperty(value = "原始订单号")
-		private String orgOrderNo;
-	/**
-	* 来源订单号
-	*/
-		@ApiModelProperty(value = "来源订单号")
-		private String srcOrderNo;
-	/**
-	* 来源id
-	*/
-		@ApiModelProperty(value = "来源id")
-		private Long srcId;
-	/**
-	* 订单类型 销售订单 XS 采购订单 CG
-	*/
-		@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
-		private String billType;
-	/**
-	* 合同类型
-	*/
-		@ApiModelProperty(value = "合同类型")
-		private String orderType;
-	/**
-	* 订单日期
-	*/
-		@ApiModelProperty(value = "订单日期")
-		private Date businesDate;
-	/**
-	* 客户或供应商id(全称)
-	*/
-		@ApiModelProperty(value = "客户或供应商id(全称)")
-		private Long corpId;
-	/**
-	* 采购商id
-	*/
-		@ApiModelProperty(value = "采购商id")
-		private Long purchaserId;
-	/**
-	* 仓库id
-	*/
-		@ApiModelProperty(value = "仓库id")
-		private Long storageId;
-	/**
-	* 发货地址
-	*/
-		@ApiModelProperty(value = "发货地址")
-		private String shippingAddress;
-	/**
-	* 到货地址
-	*/
-		@ApiModelProperty(value = "到货地址")
-		private String arrivalAddress;
-	/**
-	* 包装要求
-	*/
-		@ApiModelProperty(value = "包装要求")
-		private String packageRemarks;
-	/**
-	* 运费要求
-	*/
-		@ApiModelProperty(value = "运费要求")
-		private String freightRemarks;
-	/**
-	* 银行信息
-	*/
-		@ApiModelProperty(value = "银行信息")
-		private String banks;
-	/**
-	* 公司户头
-	*/
-		@ApiModelProperty(value = "公司户头")
-		private String banksAccountName;
-	/**
-	* 要求发货日期
-	*/
-		@ApiModelProperty(value = "要求发货日期")
-		private Date requiredDeliveryDate;
-	/**
-	* 要求到货日期
-	*/
-		@ApiModelProperty(value = "要求到货日期")
-		private Date requiredArrivalDate;
-	/**
-	* 订单备注
-	*/
-		@ApiModelProperty(value = "订单备注")
-		private String orderRemark;
-	/**
-	* 订单金额(合同金额)
-	*/
-		@ApiModelProperty(value = "订单金额(合同金额)")
-		private BigDecimal orderAmount;
-	/**
-	* 其他费用
-	*/
-		@ApiModelProperty(value = "其他费用")
-		private BigDecimal otherAmount;
-	/**
-	* 应收账款
-	*/
-		@ApiModelProperty(value = "应收账款")
-		private BigDecimal debitAmount;
-	/**
-	* 已收账款
-	*/
-		@ApiModelProperty(value = "已收账款")
-		private BigDecimal settlmentAmount;
-	/**
-	* 未收账款
-	*/
-		@ApiModelProperty(value = "未收账款")
-		private BigDecimal balanceAmount;
-	/**
-	* 付款方式
-	*/
-		@ApiModelProperty(value = "付款方式")
-		private String paymentType;
-	/**
-	* 信用证到期日(付款方式开证,必须输入)
-	*/
-		@ApiModelProperty(value = "信用证到期日(付款方式开证,必须输入)")
-		private Date creditDate;
-	/**
-	* 预(收)付款
-	*/
-		@ApiModelProperty(value = "预(收)付款")
-		private BigDecimal advancePayment;
-	/**
-	* 溢付款
-	*/
-		@ApiModelProperty(value = "溢付款")
-		private BigDecimal overPayment;
-	/**
-	* 保证金
-	*/
-		@ApiModelProperty(value = "保证金")
-		private BigDecimal deposit;
-	/**
-	* 逾期款
-	*/
-		@ApiModelProperty(value = "逾期款")
-		private BigDecimal overDueAccounts;
-	/**
-	* 预收款日期
-	*/
-		@ApiModelProperty(value = "预收款日期")
-		private Date advanceCollectionDate;
-	/**
-	* 应收(付)款日期
-	*/
-		@ApiModelProperty(value = "应收(付)款日期")
-		private Date accountsCollectionDate;
-	/**
-	* 毛利率
-	*/
-		@ApiModelProperty(value = "毛利率")
-		private BigDecimal grossProfitRate;
-	/**
-	* 毛利润
-	*/
-		@ApiModelProperty(value = "毛利润")
-		private BigDecimal grossProfit;
-	/**
-	* 所属公司id(全称)销售公司
-	*/
-		@ApiModelProperty(value = "所属公司id(全称)销售公司")
-		private Long belongToCorpId;
-	/**
-	* 历史平均运费
-	*/
-		@ApiModelProperty(value = "历史平均运费")
-		private BigDecimal freightAmountHistory;
-	/**
-	* 实际发货日期
-	*/
-		@ApiModelProperty(value = "实际发货日期")
-		private Date actualDeliveryDate;
-	/**
-	* 实际到货日期
-	*/
-		@ApiModelProperty(value = "实际到货日期")
-		private Date arrivalDate;
-	/**
-	* 采购方式
-	*/
-		@ApiModelProperty(value = "采购方式")
-		private String procurementMethod;
-	/**
-	* 入库金额
-	*/
-		@ApiModelProperty(value = "入库金额")
-		private BigDecimal storageAmount;
-	/**
-	* 采购金额
-	*/
-		@ApiModelProperty(value = "采购金额")
-		private BigDecimal purchaseAmount;
-	/**
-	* 入库数量
-	*/
-		@ApiModelProperty(value = "入库数量")
-		private BigDecimal storageQuantity;
-	/**
-	* 采购数量
-	*/
-		@ApiModelProperty(value = "采购数量")
-		private BigDecimal purchaseQuantity;
-	/**
-	* 积分倍数
-	*/
-		@ApiModelProperty(value = "积分倍数")
-		private BigDecimal pointMutiple;
-	/**
-	* 特别提醒
-	*/
-		@ApiModelProperty(value = "特别提醒")
-		private String specialRemarks;
-	/**
-	* 业务员
-	*/
-		@ApiModelProperty(value = "业务员")
-		private String salesName;
-	/**
-	* 提成标准
-	*/
-		@ApiModelProperty(value = "提成标准")
-		private String commissionRate;
-	/**
-	* 销售单价
-	*/
-		@ApiModelProperty(value = "销售单价")
-		private BigDecimal salesPrice;
-	/**
-	* 发票重量
-	*/
-		@ApiModelProperty(value = "发票重量")
-		private BigDecimal invoiceWeight;
-	/**
-	* 码单重量
-	*/
-		@ApiModelProperty(value = "码单重量")
-		private BigDecimal billWeight;
-	/**
-	* 币别
-	*/
-		@ApiModelProperty(value = "币别")
-		private String currency;
-	/**
-	* 汇率
-	*/
-		@ApiModelProperty(value = "汇率")
-		private BigDecimal exchangeRate;
-	/**
-	* 计划交货日期
-	*/
-		@ApiModelProperty(value = "计划交货日期")
-		private Date plannedDeliveryDate;
-	/**
-	* 形式发票
-	*/
-		@ApiModelProperty(value = "形式发票")
-		private String proformInvoice;
-	/**
-	* 装货港
-	*/
-		@ApiModelProperty(value = "装货港")
-		private String portOfLoad;
-	/**
-	* 目的港
-	*/
-		@ApiModelProperty(value = "目的港")
-		private String portOfDestination;
-	/**
-	* 海运费
-	*/
-		@ApiModelProperty(value = "海运费")
-		private BigDecimal oceanFreight;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 系统编号
+	 */
+	@ApiModelProperty(value = "系统编号")
+	private String sysNo;
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+	/**
+	 * 主订单号
+	 */
+	@ApiModelProperty(value = "主订单号")
+	private String morderNo;
+	/**
+	 * 原始订单号
+	 */
+	@ApiModelProperty(value = "原始订单号")
+	private String orgOrderNo;
+	/**
+	 * 来源订单号
+	 */
+	@ApiModelProperty(value = "来源订单号")
+	private String srcOrderNo;
+	/**
+	 * 来源id
+	 */
+	@ApiModelProperty(value = "来源id")
+	private Long srcId;
+	/**
+	 * 订单类型 销售订单 XS 采购订单 CG
+	 */
+	@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
+	private String billType;
+	/**
+	 * 贸易类型(枚举：国内、进口、出口)
+	 */
+	@ApiModelProperty(value = "贸易类型(枚举：国内、进口、出口)")
+	private String tradeType;
+	/**
+	 * 合同类型
+	 */
+	@ApiModelProperty(value = "合同类型")
+	private String orderType;
+	/**
+	 * 订单日期
+	 */
+	@ApiModelProperty(value = "订单日期")
+	private Date businesDate;
+	/**
+	 * 客户或供应商id(全称)
+	 */
+	@ApiModelProperty(value = "客户或供应商id(全称)")
+	private Long corpId;
+	/**
+	 * 采购商id
+	 */
+	@ApiModelProperty(value = "采购商id")
+	private Long purchaserId;
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private Long storageId;
+	/**
+	 * 发货地址
+	 */
+	@ApiModelProperty(value = "发货地址")
+	private String shippingAddress;
+	/**
+	 * 到货地址
+	 */
+	@ApiModelProperty(value = "到货地址")
+	private String arrivalAddress;
+	/**
+	 * 包装要求
+	 */
+	@ApiModelProperty(value = "包装要求")
+	private String packageRemarks;
+	/**
+	 * 运费要求
+	 */
+	@ApiModelProperty(value = "运费要求")
+	private String freightRemarks;
+	/**
+	 * 银行信息
+	 */
+	@ApiModelProperty(value = "银行信息")
+	private String banks;
+	/**
+	 * 公司户头
+	 */
+	@ApiModelProperty(value = "公司户头")
+	private String banksAccountName;
+	/**
+	 * 要求发货日期
+	 */
+	@ApiModelProperty(value = "要求发货日期")
+	private Date requiredDeliveryDate;
+	/**
+	 * 要求到货日期
+	 */
+	@ApiModelProperty(value = "要求到货日期")
+	private Date requiredArrivalDate;
+	/**
+	 * 订单备注
+	 */
+	@ApiModelProperty(value = "订单备注")
+	private String orderRemark;
+	/**
+	 * 订单金额(合同金额)
+	 */
+	@ApiModelProperty(value = "订单金额(合同金额)")
+	private BigDecimal orderAmount;
+	/**
+	 * 其他费用
+	 */
+	@ApiModelProperty(value = "其他费用")
+	private BigDecimal otherAmount;
+	/**
+	 * 应收账款
+	 */
+	@ApiModelProperty(value = "应收账款")
+	private BigDecimal debitAmount;
+	/**
+	 * 已收账款
+	 */
+	@ApiModelProperty(value = "已收账款")
+	private BigDecimal settlmentAmount;
+	/**
+	 * 未收账款
+	 */
+	@ApiModelProperty(value = "未收账款")
+	private BigDecimal balanceAmount;
+	/**
+	 * 付款方式
+	 */
+	@ApiModelProperty(value = "付款方式")
+	private String paymentType;
+	/**
+	 * 信用证到期日(付款方式开证,必须输入)
+	 */
+	@ApiModelProperty(value = "信用证到期日(付款方式开证,必须输入)")
+	private Date creditDate;
+	/**
+	 * 预(收)付款
+	 */
+	@ApiModelProperty(value = "预(收)付款")
+	private BigDecimal advancePayment;
+	/**
+	 * 溢付款
+	 */
+	@ApiModelProperty(value = "溢付款")
+	private BigDecimal overPayment;
+	/**
+	 * 保证金
+	 */
+	@ApiModelProperty(value = "保证金")
+	private BigDecimal deposit;
+	/**
+	 * 逾期款
+	 */
+	@ApiModelProperty(value = "逾期款")
+	private BigDecimal overDueAccounts;
+	/**
+	 * 预收款日期
+	 */
+	@ApiModelProperty(value = "预收款日期")
+	private Date advanceCollectionDate;
+	/**
+	 * 应收(付)款日期
+	 */
+	@ApiModelProperty(value = "应收(付)款日期")
+	private Date accountsCollectionDate;
+	/**
+	 * 毛利率
+	 */
+	@ApiModelProperty(value = "毛利率")
+	private BigDecimal grossProfitRate;
+	/**
+	 * 毛利润
+	 */
+	@ApiModelProperty(value = "毛利润")
+	private BigDecimal grossProfit;
+	/**
+	 * 所属公司id(全称)销售公司
+	 */
+	@ApiModelProperty(value = "所属公司id(全称)销售公司")
+	private Long belongToCorpId;
+	/**
+	 * 历史平均运费
+	 */
+	@ApiModelProperty(value = "历史平均运费")
+	private BigDecimal freightAmountHistory;
+	/**
+	 * 实际发货日期
+	 */
+	@ApiModelProperty(value = "实际发货日期")
+	private Date actualDeliveryDate;
+	/**
+	 * 实际到货日期
+	 */
+	@ApiModelProperty(value = "实际到货日期")
+	private Date arrivalDate;
+	/**
+	 * 采购方式
+	 */
+	@ApiModelProperty(value = "采购方式")
+	private String procurementMethod;
+	/**
+	 * 入库金额
+	 */
+	@ApiModelProperty(value = "入库金额")
+	private BigDecimal storageAmount;
+	/**
+	 * 采购金额
+	 */
+	@ApiModelProperty(value = "采购金额")
+	private BigDecimal purchaseAmount;
+	/**
+	 * 入库数量
+	 */
+	@ApiModelProperty(value = "入库数量")
+	private BigDecimal storageQuantity;
+	/**
+	 * 采购数量
+	 */
+	@ApiModelProperty(value = "采购数量")
+	private BigDecimal purchaseQuantity;
+	/**
+	 * 积分倍数
+	 */
+	@ApiModelProperty(value = "积分倍数")
+	private BigDecimal pointMutiple;
+	/**
+	 * 特别提醒
+	 */
+	@ApiModelProperty(value = "特别提醒")
+	private String specialRemarks;
+	/**
+	 * 业务员
+	 */
+	@ApiModelProperty(value = "业务员")
+	private String salesName;
+	/**
+	 * 提成标准
+	 */
+	@ApiModelProperty(value = "提成标准")
+	private String commissionRate;
+	/**
+	 * 销售单价
+	 */
+	@ApiModelProperty(value = "销售单价")
+	private BigDecimal salesPrice;
+	/**
+	 * 发票重量
+	 */
+	@ApiModelProperty(value = "发票重量")
+	private BigDecimal invoiceWeight;
+	/**
+	 * 码单重量
+	 */
+	@ApiModelProperty(value = "码单重量")
+	private BigDecimal billWeight;
+	/**
+	 * 币别
+	 */
+	@ApiModelProperty(value = "币别")
+	private String currency;
+	/**
+	 * 汇率
+	 */
+	@ApiModelProperty(value = "汇率")
+	private BigDecimal exchangeRate;
+	/**
+	 * 计划交货日期
+	 */
+	@ApiModelProperty(value = "计划交货日期")
+	private Date plannedDeliveryDate;
+	/**
+	 * 形式发票
+	 */
+	@ApiModelProperty(value = "形式发票")
+	private String proformInvoice;
+	/**
+	 * 装货港
+	 */
+	@ApiModelProperty(value = "装货港")
+	private String portOfLoad;
+	/**
+	 * 目的港
+	 */
+	@ApiModelProperty(value = "目的港")
+	private String portOfDestination;
+	/**
+	 * 海运费
+	 */
+	@ApiModelProperty(value = "海运费")
+	private BigDecimal oceanFreight;
+	/**
+	 * 版本
+	 */
+	@ApiModelProperty(value = "版本")
+	private String version;
 	/**
 	 * 租户id
 	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
 	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
 	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
 	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
 	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateUser;
 	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
 	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
+	 * 状态（0 正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0 正常 1停用）")
+	private Integer status;
 	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
 	/**
 	 * 到港日期
 	 */
-		@ApiModelProperty(value = "到港日期")
-		private Date dateOfArrival;
+	@ApiModelProperty(value = "到港日期")
+	private Date dateOfArrival;
 	/**
 	 * 是否到货
 	 */
-		@ApiModelProperty(value = "是否到货")
-		private Integer arrival;
+	@ApiModelProperty(value = "是否到货")
+	private Integer arrival;
 	/**
 	 * 首付比列
 	 */
-		@ApiModelProperty(value = "首付比列")
-		private BigDecimal downPayment;
+	@ApiModelProperty(value = "首付比列")
+	private BigDecimal downPayment;
 	/**
 	 * 人民币金额
 	 */
-		@ApiModelProperty(value = "人民币金额")
-		private BigDecimal rmbAmount;
+	@ApiModelProperty(value = "人民币金额")
+	private BigDecimal rmbAmount;
 
 	/**
 	 * 订单费用信息
 	 */
-		@ApiModelProperty(value = "订单费用信息")
-		@TableField(exist = false)
-		private List<OrderFees> orderFeesList;
+	@ApiModelProperty(value = "订单费用信息")
+	@TableField(exist = false)
+	private List<OrderFees> orderFeesList;
 	/**
 	 * 订单文件
 	 */
-		@ApiModelProperty(value = "订单文件")
-		@TableField(exist = false)
-		private List<OrderFiles> orderFilesList;
+	@ApiModelProperty(value = "订单文件")
+	@TableField(exist = false)
+	private List<OrderFiles> orderFilesList;
 	/**
 	 * 订单明细
 	 */
-		@ApiModelProperty(value = "订单明细")
-		@TableField(exist = false)
-		private List<OrderItems> orderItemsList;
+	@ApiModelProperty(value = "订单明细")
+	@TableField(exist = false)
+	private List<OrderItems> orderItemsList;
 	/**
 	 * 订单修改日志
 	 */
-		@ApiModelProperty(value = "订单修改日志")
-		@TableField(exist = false)
-		private List<OrderModify> orderModifyList;
+	@ApiModelProperty(value = "订单修改日志")
+	@TableField(exist = false)
+	private List<OrderModify> orderModifyList;
 	/**
 	 * 创建人中文名
 	 */
-		@ApiModelProperty(value = "创建人中文名")
-		@TableField(exist = false)
-		private String createUserName;
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+	private String createUserName;
 	/**
 	 * 修改人中文名
 	 */
-		@ApiModelProperty(value = "修改人中文名")
-		@TableField(exist = false)
-		private String updateUserName;
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+	private String updateUserName;
 	/**
 	 * 客户中文名
 	 */
-		@ApiModelProperty(value = "客户中文名")
-		@TableField(exist = false)
-		private String corpName;
-
+	@ApiModelProperty(value = "客户中文名")
+	@TableField(exist = false)
+	private String corpName;
 
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -7,7 +7,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -64,6 +63,11 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
 	private String billType;
 	/**
+	 * 贸易类型(枚举：国内、进口、出口)
+	 */
+	@ApiModelProperty(value = "贸易类型(枚举：国内、进口、出口)")
+	private String tradeType;
+	/**
 	 * 合同类型
 	 */
 	@ApiModelProperty(value = "合同类型")

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

@@ -76,6 +76,7 @@
         <result column="arrival" property="arrival"/>
         <result column="down_payment" property="downPayment"/>
         <result column="rmb_amount" property="rmbAmount"/>
+        <result column="trade_type" property="tradeType"/>
     </resultMap>
 
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/DomesticOrderController.java

@@ -0,0 +1,122 @@
+package com.trade.purchase.order.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.trade.purchase.order.dto.OrderSubmitDto;
+import com.trade.purchase.order.entity.Order;
+import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.service.IOrderService;
+import com.trade.purchase.order.vo.OrderVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 国内采购订单表 控制器
+ *
+ * @author BladeX
+ * @since 2021-09-26
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/domestic-order")
+@Api(value = "国内采购订单表", tags = "国内采购订单表接口")
+public class DomesticOrderController extends BladeController {
+
+	private final IOrderService orderService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/{id}")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入order")
+	public R<OrderVO> detail(@PathVariable(value = "id") String id) {
+		return orderService.getOrderMessage(id);
+	}
+
+	/**
+	 * 分页 销售或采购订单表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入order")
+	public R<IPage<Order>> list(Order order, Query query) {
+		order.setIsDeleted(0);
+		order.setTenantId(AuthUtil.getTenantId());
+		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 销售或采购订单表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入order")
+	public R<IPage<OrderVO>> page(OrderVO order, Query query) {
+		order.setIsDeleted(0);
+		order.setTenantId(AuthUtil.getTenantId());
+		IPage<OrderVO> pages = orderService.selectOrderPage(Condition.getPage(query), order);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 销售或采购订单表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入order")
+	public R<String> save(@Valid @RequestBody OrderSubmitDto submitDto) {
+		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		return orderService.saveOrderMessage(submitDto);
+	}
+
+	/**
+	 * 修改 销售或采购订单表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入order")
+	public R update(@Valid @RequestBody Order order) {
+		if (order.getId() == null) {
+			return R.fail(500, "请选择要删除的数据");
+		}
+		order.setIsDeleted(1);
+		return R.status(orderService.updateById(order));
+	}
+
+	/**
+	 * 新增或修改 销售或采购订单表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入order")
+	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
+		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		return orderService.submitOrderMessage(submitDto);
+	}
+
+
+	/**
+	 * 删除 销售或采购订单表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(orderService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/OrderController.java → blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/ExportOrderController.java

@@ -22,16 +22,16 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 /**
- * 销售或采购订单表 控制器
+ * 出口采购订单表 控制器
  *
  * @author BladeX
  * @since 2021-09-26
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/purchase-order")
-@Api(value = "采购订单表", tags = "销售或采购订单表接口")
-public class OrderController extends BladeController {
+@RequestMapping("/export-order")
+@Api(value = "出口采购订单表", tags = "出口采购订单表接口")
+public class ExportOrderController extends BladeController {
 
 	private final IOrderService orderService;
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/ImportOrderController.java

@@ -0,0 +1,122 @@
+package com.trade.purchase.order.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.trade.purchase.order.dto.OrderSubmitDto;
+import com.trade.purchase.order.entity.Order;
+import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.service.IOrderService;
+import com.trade.purchase.order.vo.OrderVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 进口采购订单表 控制器
+ *
+ * @author BladeX
+ * @since 2021-09-26
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/import-order")
+@Api(value = "进口采购订单表", tags = "进口采购订单表接口")
+public class ImportOrderController extends BladeController {
+
+	private final IOrderService orderService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/{id}")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入order")
+	public R<OrderVO> detail(@PathVariable(value = "id") String id) {
+		return orderService.getOrderMessage(id);
+	}
+
+	/**
+	 * 分页 销售或采购订单表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入order")
+	public R<IPage<Order>> list(Order order, Query query) {
+		order.setIsDeleted(0);
+		order.setTenantId(AuthUtil.getTenantId());
+		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 销售或采购订单表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入order")
+	public R<IPage<OrderVO>> page(OrderVO order, Query query) {
+		order.setIsDeleted(0);
+		order.setTenantId(AuthUtil.getTenantId());
+		IPage<OrderVO> pages = orderService.selectOrderPage(Condition.getPage(query), order);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 销售或采购订单表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入order")
+	public R<String> save(@Valid @RequestBody OrderSubmitDto submitDto) {
+		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		return orderService.saveOrderMessage(submitDto);
+	}
+
+	/**
+	 * 修改 销售或采购订单表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入order")
+	public R update(@Valid @RequestBody Order order) {
+		if (order.getId() == null) {
+			return R.fail(500, "请选择要删除的数据");
+		}
+		order.setIsDeleted(1);
+		return R.status(orderService.updateById(order));
+	}
+
+	/**
+	 * 新增或修改 销售或采购订单表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入order")
+	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
+		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		return orderService.submitOrderMessage(submitDto);
+	}
+
+
+	/**
+	 * 删除 销售或采购订单表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(orderService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -76,6 +76,7 @@
         <result column="arrival" property="arrival"/>
         <result column="down_payment" property="downPayment"/>
         <result column="rmb_amount" property="rmbAmount"/>
+        <result column="trade_type" property="tradeType"/>
     </resultMap>
 
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -77,14 +77,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			// 转VO
 			List<OrderVO> copy = BeanUtil.copy(records, OrderVO.class);
 			// 获取客户信息
-			R<List<CorpsDescVO>> listR = corpsDescClient.selCorpsDetails(AuthUtil.getTenantId());
+			/*R<List<CorpsDescVO>> listR = corpsDescClient.selCorpsDetails(AuthUtil.getTenantId());
 			if (!listR.isSuccess() || CollectionUtils.isEmpty(listR.getData())) {
 				throw new OrderException("找不到客户信息");
 			}
 			copy.forEach(li -> {
 				Optional<CorpsDescVO> first = listR.getData().stream().filter(corp -> Objects.equals(corp.getId(), li.getCorpId())).findFirst();
 				first.ifPresent(corpsDescVO -> li.setCorpName(corpsDescVO.getCname()));
-			});
+			});*/
 			// todo:: 整理好map 在改
 //			List<OrderVO> orderVOList = orderPage.getRecords().stream().map().collect(Collectors.toList());
 			page.setRecords(copy);