修改字段

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

@@ -39,6 +39,12 @@ public class OrderSubmitDto extends Order {
 	private OrderTypeEnum orderTypeEnum;
 
 	/**
+	 * 贸易类型
+	 */
+	@ApiModelProperty(value = "贸易类型")
+	private OrderTypeEnum tradeTypeEnum;
+
+	/**
 	 * 删除的子订单id
 	 */
 	@ApiModelProperty(value = "删除的子订单id")

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/enums/OrderTypeEnum.java

@@ -33,6 +33,27 @@ public enum OrderTypeEnum {
 	 */
 	RECEIPT("SH"),
 
+
+
+	// 贸易方式
+
+	/**
+	 *  国内
+	 */
+	DOMESTIC("GN"),
+
+	/**
+	 *  进口
+	 */
+	IMPORT("JK"),
+
+	/**
+	 *  出口
+	 */
+	EXPORT("CK"),
+
+
+
 	;
 
 	private final String type;

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/vo/OrderVO.java

@@ -18,6 +18,7 @@ import java.util.List;
  * @since 2021-09-26
  */
 @Data
+@Builder
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "OrderVO对象", description = "销售或采购订单表")
 public class OrderVO extends Order {

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/assemble/mapstruct/OrderMapstructMapper.java

@@ -5,18 +5,17 @@ import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.Order;
 import com.trade.purchase.order.vo.OrderVO;
 import org.mapstruct.Mapper;
-
-import java.math.BigDecimal;
+import org.mapstruct.factory.Mappers;
 
 /**
  * @author caifc
  * @date 2021-10-20 15:06
  */
-@Mapper(componentModel = "spring", imports = {
-	BigDecimal.class
-})
+@Mapper
 public interface OrderMapstructMapper {
 
+	OrderMapstructMapper INSTANCE = Mappers.getMapper(OrderMapstructMapper.class);
+
 	/**
 	 * 实体转vo
 	 *

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

@@ -70,6 +70,7 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 	private Order saveOrder(OrderSubmitDto order) {
 		order.setStatus(order.getOrderStatus().getStatus());
 		order.setBillType(order.getOrderTypeEnum().getType());
+		order.setTradeType(order.getTradeTypeEnum().getType());
 		if (Func.isBlank(order.getSysNo())) {
 			orderCodeMaker.generate(order);
 		}

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

@@ -54,6 +54,8 @@ public class DomesticOrderController extends BladeController {
 	public R<IPage<Order>> list(Order order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
+		order.setBillType(OrderTypeEnum.PURCHASE.getType());
+		order.setTradeType(OrderTypeEnum.DOMESTIC.getType());
 		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
 		return R.data(pages);
 	}
@@ -67,6 +69,8 @@ public class DomesticOrderController extends BladeController {
 	public R<IPage<OrderVO>> page(OrderVO order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
+		order.setBillType(OrderTypeEnum.PURCHASE.getType());
+		order.setTradeType(OrderTypeEnum.DOMESTIC.getType());
 		IPage<OrderVO> pages = orderService.selectOrderPage(Condition.getPage(query), order);
 		return R.data(pages);
 	}
@@ -79,6 +83,7 @@ public class DomesticOrderController extends BladeController {
 	@ApiOperation(value = "新增", notes = "传入order")
 	public R<String> save(@Valid @RequestBody OrderSubmitDto submitDto) {
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		submitDto.setTradeTypeEnum(OrderTypeEnum.DOMESTIC);
 		return orderService.saveOrderMessage(submitDto);
 	}
 
@@ -104,6 +109,7 @@ public class DomesticOrderController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入order")
 	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		submitDto.setTradeTypeEnum(OrderTypeEnum.DOMESTIC);
 		return orderService.submitOrderMessage(submitDto);
 	}
 

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

@@ -54,6 +54,8 @@ public class ExportOrderController extends BladeController {
 	public R<IPage<Order>> list(Order order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
+		order.setBillType(OrderTypeEnum.PURCHASE.getType());
+		order.setTradeType(OrderTypeEnum.EXPORT.getType());
 		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
 		return R.data(pages);
 	}
@@ -67,6 +69,8 @@ public class ExportOrderController extends BladeController {
 	public R<IPage<OrderVO>> page(OrderVO order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
+		order.setBillType(OrderTypeEnum.PURCHASE.getType());
+		order.setTradeType(OrderTypeEnum.EXPORT.getType());
 		IPage<OrderVO> pages = orderService.selectOrderPage(Condition.getPage(query), order);
 		return R.data(pages);
 	}
@@ -79,6 +83,7 @@ public class ExportOrderController extends BladeController {
 	@ApiOperation(value = "新增", notes = "传入order")
 	public R<String> save(@Valid @RequestBody OrderSubmitDto submitDto) {
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		submitDto.setTradeTypeEnum(OrderTypeEnum.EXPORT);
 		return orderService.saveOrderMessage(submitDto);
 	}
 
@@ -104,6 +109,7 @@ public class ExportOrderController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入order")
 	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		submitDto.setTradeTypeEnum(OrderTypeEnum.EXPORT);
 		return orderService.submitOrderMessage(submitDto);
 	}
 

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

@@ -54,6 +54,8 @@ public class ImportOrderController extends BladeController {
 	public R<IPage<Order>> list(Order order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
+		order.setBillType(OrderTypeEnum.PURCHASE.getType());
+		order.setTradeType(OrderTypeEnum.IMPORT.getType());
 		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
 		return R.data(pages);
 	}
@@ -67,6 +69,8 @@ public class ImportOrderController extends BladeController {
 	public R<IPage<OrderVO>> page(OrderVO order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
+		order.setBillType(OrderTypeEnum.PURCHASE.getType());
+		order.setTradeType(OrderTypeEnum.IMPORT.getType());
 		IPage<OrderVO> pages = orderService.selectOrderPage(Condition.getPage(query), order);
 		return R.data(pages);
 	}
@@ -79,6 +83,7 @@ public class ImportOrderController extends BladeController {
 	@ApiOperation(value = "新增", notes = "传入order")
 	public R<String> save(@Valid @RequestBody OrderSubmitDto submitDto) {
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		submitDto.setTradeTypeEnum(OrderTypeEnum.IMPORT);
 		return orderService.saveOrderMessage(submitDto);
 	}
 
@@ -104,6 +109,7 @@ public class ImportOrderController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入order")
 	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
 		submitDto.setOrderTypeEnum(OrderTypeEnum.PURCHASE);
+		submitDto.setTradeTypeEnum(OrderTypeEnum.IMPORT);
 		return orderService.submitOrderMessage(submitDto);
 	}
 

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

@@ -106,6 +106,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		lambdaQuery.eq(Func.isNotBlank(order.getPackageRemarks()), Order::getPackageRemarks, order.getPackageRemarks());
 		lambdaQuery.eq(Func.notNull(order.getOceanFreight()), Order::getOceanFreight, order.getOceanFreight());
 		lambdaQuery.eq(Order::getTenantId, AuthUtil.getTenantId());
+		lambdaQuery.eq(Order::getBillType, order.getBillType());
+		lambdaQuery.eq(Order::getTradeType, order.getTradeType());
 		lambdaQuery.like(Func.isNotBlank(order.getSysNo()), Order::getSysNo, order.getSysNo());
 		lambdaQuery.like(Func.isNotBlank(order.getBanks()), Order::getBanks, order.getBanks());
 		lambdaQuery.like(Func.isNotBlank(order.getSrcOrderNo()), Order::getSrcOrderNo, order.getSrcOrderNo());