暂存修改

blade-ops/blade-swagger/src/main/resources/application-dev.yml

@@ -19,3 +19,7 @@ knife4j:
       - name: 订单-发货
         uri: 127.0.0.1:1080
         location: /blade-deliver-goods/v2/api-docs
+      - name: 订单-收付款
+        uri: 127.0.0.1:1080
+        location: /trade-finance/v2/api-docs
+

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

@@ -247,7 +247,7 @@ public class DeliveryItems implements Serializable {
 	 * 规格型号
 	 */
 		@ApiModelProperty(value = "规格型号")
-		@TableField(exist = false)
+		/*@TableField(exist = false)*/
 		private String specificationAndModel;
 
 	/**
@@ -260,4 +260,13 @@ public class DeliveryItems implements Serializable {
 	 */
 		@ApiModelProperty(value = "采购数量")
 		private BigDecimal purchaseQuantity;
+
+	    @ApiModelProperty(value = "计价单位")
+		private String  unit;
+
+	    @ApiModelProperty(value = "产品描述")
+	    private String productDesc;
+
+
+
 }

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/dto/SettlementDTO.java

@@ -0,0 +1,47 @@
+/*
+ *      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 com.trade.finance.dto;
+
+
+import com.trade.finance.entity.Files;
+import com.trade.finance.entity.Items;
+import com.trade.finance.entity.Settlement;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 结算表提交表单数据
+ *
+ * @author BladeX
+ * @since 2021-11-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "结算表表单提交对象", description = "结算表表单提交对象")
+public class SettlementDTO extends Settlement {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "收付款文件列表")
+	private List<Files> filesList;
+
+	@ApiModelProperty(value = "收付款明细列表")
+	private List<Items> itemsList;
+}

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Files.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -89,7 +91,7 @@ public class Files implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人
 	*/
@@ -99,7 +101,7 @@ public class Files implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 状态（0 正常 1停用）
 	*/
@@ -112,5 +114,8 @@ public class Files implements Serializable {
 		@TableLogic
 		private Integer isDeleted;
 
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+
 
 }

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Items.java

@@ -24,6 +24,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -134,7 +136,7 @@ public class Items implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人
 	*/
@@ -144,7 +146,7 @@ public class Items implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 状态（0 正常 1停用）
 	*/
@@ -167,5 +169,8 @@ public class Items implements Serializable {
 		@ApiModelProperty(value = "修改人姓名")
 		private String updateUserName;
 
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+
 
 }

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Settlement.java

@@ -24,10 +24,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 结算表实体类
@@ -38,7 +41,7 @@ import io.swagger.annotations.ApiModelProperty;
 @Data
 @TableName("finance_settlement")
 @ApiModel(value = "Settlement对象", description = "结算表")
-public class Settlement implements Serializable {
+public class Settlement  implements Serializable {
 
 	private static final long serialVersionUID = 1L;
     @TableId
@@ -78,12 +81,12 @@ public class Settlement implements Serializable {
 	*/
 		@ApiModelProperty(value = "预计结算日期")
 		@TableField("Plan_settlement_date")
-	private LocalDateTime planSettlementDate;
+	private Date planSettlementDate;
 	/**
 	* 结算日期
 	*/
 		@ApiModelProperty(value = "结算日期")
-		private LocalDateTime settlementDate;
+		private Date settlementDate;
 	/**
 	* 币别
 	*/
@@ -151,7 +154,7 @@ public class Settlement implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人
 	*/
@@ -161,7 +164,7 @@ public class Settlement implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 状态（0 正常 1停用）
 	*/
@@ -184,5 +187,15 @@ public class Settlement implements Serializable {
 		@ApiModelProperty(value = "修改人姓名")
 		private String updateUserName;
 
+	/**
+	 * 收付款状态
+	 */
+	@ApiModelProperty(value = "收付款状态")
+	private String financeStatus;
+
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+
+
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/dto/OrderSubmitDto.java

@@ -29,13 +29,13 @@ public class OrderSubmitDto extends Order {
 	/**
 	 * 订单类型
 	 */
-	@ApiModelProperty(value = "订单类型")
+
 	private OrderTypeEnum orderTypeEnum;
 
 	/**
 	 * 贸易类型
 	 */
-	@ApiModelProperty(value = "贸易类型")
+
 	private OrderTypeEnum tradeTypeEnum;
 
 	/**

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

@@ -58,7 +58,7 @@ public class Order extends OrderBase {
 	/**
 	 * 来源id
 	 */
-	@ApiModelProperty(value = "来源id")
+	@ApiModelProperty(value = "来源id",required = true)
 	private Long srcId;
 	/**
 	 * 订单类型 销售订单 XS 采购订单 CG
@@ -68,7 +68,7 @@ public class Order extends OrderBase {
 	/**
 	 * 贸易类型(枚举：国内、进口、出口)
 	 */
-	@ApiModelProperty(value = "贸易类型(枚举：国内、进口、出口)")
+	@ApiModelProperty(value = "贸易类型(国内:GN、进口:JK、出口:CK)",required = true)
 	private String tradeType;
 	/**
 	 * 合同类型
@@ -78,7 +78,7 @@ public class Order extends OrderBase {
 	/**
 	 * 订单日期
 	 */
-	@ApiModelProperty(value = "订单日期")
+	@ApiModelProperty(value = "订单日期",required = true)
 	private Date businesDate;
 	/**
 	 * 客户或供应商id(全称)

blade-service/trade-finance/src/main/java/com/trade/finance/FinanceApplication.java

@@ -0,0 +1,39 @@
+/*
+ *      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 com.trade.finance;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.launch.constant.AppConstant;
+import org.springframework.cloud.client.SpringCloudApplication;
+
+/**
+ * 用户启动器
+ *
+ * @author Chill
+ */
+@EnableBladeFeign
+@SpringCloudApplication
+@MapperScan({"com.trade.finance.**.mapper.**"})
+public class FinanceApplication {
+
+	public static void main(String[] args) {
+		BladeApplication.run("trade-finance", FinanceApplication.class, args);
+	}
+
+}

blade-service/trade-finance/src/main/java/com/trade/finance/controller/FilesController.java

@@ -43,7 +43,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/files")
-@Api(value = "结算文件", tags = "结算文件接口")
+@Api(value = "收付款文件", tags = "收付款文件接口")
 public class FilesController extends BladeController {
 
 	private final IFilesService filesService;

blade-service/trade-finance/src/main/java/com/trade/finance/controller/ItemsController.java

@@ -43,7 +43,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/items")
-@Api(value = "结算明细", tags = "结算明细接口")
+@Api(value = "收付款明细", tags = "收付款明细接口")
 public class ItemsController extends BladeController {
 
 	private final IItemsService itemsService;

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -16,6 +16,7 @@
  */
 package com.trade.finance.controller;
 
+import com.trade.finance.dto.SettlementDTO;
 import com.trade.finance.entity.Settlement;
 import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
@@ -43,7 +44,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/settlement")
-@Api(value = "结算表", tags = "结算表接口")
+@Api(value = "收款付款", tags = "收款付款-接口")
 public class SettlementController extends BladeController {
 
 	private final ISettlementService settlementService;
@@ -81,9 +82,16 @@ public class SettlementController extends BladeController {
 		return R.data(pages);
 	}
 
+	@PostMapping("modify")
+	@ApiOperation(value = "修改新增收付款信息", notes = "传入修改新增收付款信息对象")
+	public R modify(@RequestBody SettlementDTO dto)
+	{
+		settlementService.modify(dto);
+		return R.success("操作成功");
+	}
+
 	/**
 	 * 新增 结算表
-	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入settlement")
@@ -91,15 +99,15 @@ public class SettlementController extends BladeController {
 		return R.status(settlementService.save(settlement));
 	}
 
-	/**
+	*//**
 	 * 修改 结算表
-	 */
+	 *//*
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入settlement")
 	public R update(@Valid @RequestBody Settlement settlement) {
 		return R.status(settlementService.updateById(settlement));
-	}
+	}*/
 
 	/**
 	 * 新增或修改 结算表

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/ItemsMapper.xml

@@ -1,6 +1,6 @@
 <?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.finance.mapper.ItemsMapper">
+<mapper namespace="com.trade.finance.mapper.ItemsMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="itemsResultMap" type="com.trade.finance.entity.Items">

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/SettlementMapper.xml

@@ -1,6 +1,6 @@
 <?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.finance.mapper.SettlementMapper">
+<mapper namespace="com.trade.finance.mapper.SettlementMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="settlementResultMap" type="com.trade.finance.entity.Settlement">

blade-service/trade-finance/src/main/java/com/trade/finance/service/ISettlementService.java

@@ -19,6 +19,7 @@ package com.trade.finance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.trade.finance.dto.SettlementDTO;
 import com.trade.finance.entity.Settlement;
 import com.trade.finance.vo.SettlementVO;
 
@@ -39,4 +40,7 @@ public interface ISettlementService extends IService<Settlement> {
 	 */
 	IPage<SettlementVO> selectSettlementPage(IPage<SettlementVO> page, SettlementVO settlement);
 
+	/**修改新增收付款信息 */
+	void modify(SettlementDTO settlementDTO);
+
 }

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -17,13 +17,25 @@
 package com.trade.finance.service.impl;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trade.finance.dto.SettlementDTO;
+import com.trade.finance.entity.Files;
+import com.trade.finance.entity.Items;
 import com.trade.finance.entity.Settlement;
+import com.trade.finance.mapper.ItemsMapper;
 import com.trade.finance.mapper.SettlementMapper;
 import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 结算表 服务实现类
@@ -34,9 +46,85 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 @Service
 public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlement> implements ISettlementService {
 
+   @Autowired
+   private ItemsMapper itemsMapper;
+
 	@Override
 	public IPage<SettlementVO> selectSettlementPage(IPage<SettlementVO> page, SettlementVO settlement) {
 		return page.setRecords(baseMapper.selectSettlementPage(page, settlement));
 	}
 
+	@Override
+	@Transactional
+	public void modify(SettlementDTO settlementDTO)
+	{
+		Settlement model=new Settlement();
+		BeanUtils.copyProperties(settlementDTO,model);
+		List<Files> filesList = settlementDTO.getFilesList();
+		List<Items> itemsList = settlementDTO.getItemsList();
+		//如果id=null, 无论主表还是从表, 必然都是新增
+		Long id = settlementDTO.getId();
+		if(id==null)
+		{
+
+
+            model.setTenantId(AuthUtil.getTenantId());
+			model.setCreateTime(new Date());
+			model.setCreateUser(AuthUtil.getUserId());
+			model.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+			baseMapper.insert(model);
+			if(CollectionUtils.isNotEmpty(itemsList))
+			{
+				itemsList.forEach(e->{
+
+					e.setPid(model.getId());
+					e.setTenantId(AuthUtil.getTenantId());
+					e.setCreateTime(new Date());
+					e.setCreateUser(AuthUtil.getUserId());
+					e.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+					itemsMapper.insert(e);
+				});
+			}
+		}
+		//主表更新, 从表视情况更新新增
+		else
+		{
+
+			model.setUpdateTime(new Date());
+			model.setUpdateUser(AuthUtil.getUserId());
+			model.setUpdateUserName(AuthUtil.getUser().getRoleName());
+			baseMapper.updateById(model);
+
+			if(CollectionUtils.isNotEmpty(itemsList))
+			{
+
+				itemsList.forEach(e->{
+
+					if(e.getId()==null)
+					{
+						e.setPid(model.getId());
+						e.setTenantId(AuthUtil.getTenantId());
+						e.setCreateTime(new Date());
+						e.setCreateUser(AuthUtil.getUserId());
+						e.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+						itemsMapper.insert(e);
+					}
+					else
+					{
+
+						e.setUpdateTime(new Date());
+						e.setUpdateUser(AuthUtil.getUserId());
+						e.setUpdateUserName(AuthUtil.getUser().getRoleName());
+						itemsMapper.updateById(e);
+					}
+
+
+				});
+			}
+
+		}
+
+
+	}
+
 }

blade-service/trade-finance/src/main/resources/application-dev.yml

@@ -11,4 +11,4 @@ spring:
 #swagger文档
 swagger:
   base-packages:
-    - com.trade.purchase
+    - com.trade.finance

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

@@ -68,7 +68,7 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 	 * @param order
 	 */
 	private Order saveOrder(OrderSubmitDto order) {
-		order.setBillType(order.getOrderTypeEnum().getType());
+		order.setBillType(order.getBillType());
 		order.setTradeType(order.getTradeType());
 		if (Func.isBlank(order.getSysNo())) {
 			orderCodeMaker.generate(order);

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

@@ -25,11 +25,13 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.exception.ServiceException;
 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.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -45,8 +47,8 @@ import java.util.Map;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/purchase-order")
-@Api(value = "采购订单表", tags = "采购订单表接口")
-public class ImportOrderController extends BladeController {
+@Api(value = "进口、出口、内贸采购订单", tags = "进口、出口、内贸采购订单")
+public class PurchaseOrderController extends BladeController {
 
 	private final IOrderService orderService;
 
@@ -64,7 +66,7 @@ public class ImportOrderController extends BladeController {
 	 */
 	@GetMapping("/{id}")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入order")
+	@ApiOperation(value = "采购订单查看详情", notes = "传入order")
 	public R<OrderVO> detail(@PathVariable(value = "id") String id) {
 		return orderService.getOrderMessage(id);
 	}
@@ -74,16 +76,16 @@ public class ImportOrderController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "查询所有", notes = "传入order")
+	@ApiOperation(value = "采购订单表列表(内贸 外贸 出口)", notes = "传入order")
 	public R<IPage<Order>> list(@RequestParam(name = "current", defaultValue = "1") Integer current,
 								@RequestParam(name = "size", defaultValue = "10") Integer size,
-								@RequestParam(name = "businesStartDate",  required = false) String businesStartDate,
-								@RequestParam(name = "businesEndDate",  required = false) String businesEndDate,
-								@RequestParam(name = "accountsCollectionStartDate",  required = false) String accountsCollectionStartDate,
-								@RequestParam(name = "accountsCollectionEndDate",  required = false) String accountsCollectionEndDate,
-								@RequestParam(name = "dateOfStartArrival",  required = false) String dateOfStartArrival,
-								@RequestParam(name = "dateOfEndArrival",  required = false) String dateOfEndArrival,
-								@RequestParam(name = "tradeType",  required = true) String tradeType
+								 @RequestParam(value = "businesStartDate",required = false) String businesStartDate,//订单开始时间
+								 @RequestParam(value = "businesEndDate",required = false) String businesEndDate,//订单结束时间
+								 @RequestParam(value = "accountsCollectionStartDate",required = false) String accountsCollectionStartDate,//付款开始时间
+								 @RequestParam(value = "accountsCollectionEndDate",required = false) String accountsCollectionEndDate,//付款结束时间
+								 @RequestParam(value = "dateOfStartArrival",required = false) String dateOfStartArrival,//付款开始时间
+								 @RequestParam(value = "dateOfEndArrival",required = false) String dateOfEndArrival,//付款开始时间
+								 @RequestParam(value = "tradeType",required = false) String tradeType//采购订单类型 GN JK CK
 								)
 	{
 
@@ -107,9 +109,9 @@ public class ImportOrderController extends BladeController {
 		return R.data(pages);
 	}
 
-	/**
+/*	*//**
 	 * 自定义分页 销售或采购订单表
-	 */
+	 *//*
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入order")
@@ -120,24 +122,22 @@ public class ImportOrderController extends BladeController {
 		order.setTradeType(OrderTypeEnum.IMPORT.getType());
 		IPage<OrderVO> pages = orderService.selectOrderPage(Condition.getPage(query), order);
 		return R.data(pages);
-	}
+	}*/
 
 	/**
 	 * 新增 销售或采购订单表
 	 */
-	@PostMapping("/save")
+	/*@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入order")
 	public R<String> save(@Valid @RequestBody OrderSubmitDto submitDto) {
-		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
-		submitDto.setTradeTypeEnum(OrderTypeEnum.IMPORT);
 		return orderService.saveOrderMessage(submitDto);
-	}
+	}*/
 
 	/**
 	 * 修改 销售或采购订单表
 	 */
-	@PostMapping("/update")
+	/*@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入order")
 	public R<String> update(@Valid @RequestBody Order order) {
@@ -146,7 +146,7 @@ public class ImportOrderController extends BladeController {
 		}
 		order.setIsDeleted(1);
 		return R.status(orderService.updateById(order));
-	}
+	}*/
 
 	/**
 	 * 新增或修改 销售或采购订单表
@@ -154,7 +154,12 @@ public class ImportOrderController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入order")
-	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
+	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto)
+	{
+		if(ObjectUtil.isEmpty(submitDto.getBillType())||ObjectUtil.isEmpty(submitDto.getSrcId())||ObjectUtil.isEmpty(submitDto.getBusinesDate()))
+		{
+			throw new ServiceException("来源、合同日期、贸易类型不能为空!");
+		}
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
 		return orderService.submitOrderMessage(submitDto);
 	}
@@ -215,6 +220,7 @@ public class ImportOrderController extends BladeController {
 	}
 
     @GetMapping("getItemByPid")
+	@ApiOperation(value = "查询采购订单的子明细", notes = "通过采购订单的id查询")
 	public R getItemByPid(@RequestParam(value = "id",required = true)Long id)
 	{
 		LambdaQueryWrapper<OrderItems> lambdaQueryWrapper=new LambdaQueryWrapper<>();