变更

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

@@ -832,6 +832,11 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "生成采购")
 	private Integer createPurchase;
 	/**
+	 * 是否生成采购
+	 */
+	@TableField(exist = false)
+	private String createPurchaseName;
+	/**
 	 * 生成采购用户
 	 */
 	@ApiModelProperty(value = "生成采购用户")
@@ -848,6 +853,11 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "生成收发货")
 	private Integer createFreight;
 	/**
+	 * 是否生成收货
+	 */
+	@TableField(exist = false)
+	private String createFreightName;
+	/**
 	 * 生成收发货用户
 	 */
 	@ApiModelProperty(value = "生成收发货用户")
@@ -889,6 +899,11 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "是否特批")
 	private Integer specialCheck;
 	/**
+	 * 是否特批名称
+	 */
+	@TableField(exist = false)
+	private String specialCheckName;
+	/**
 	 * 特批状态
 	 */
 	@ApiModelProperty(value = "特批状态")

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/excel/SaleOrderExcel.java

@@ -22,14 +22,14 @@ public class SaleOrderExcel {
 	/**
 	 * 销售订单号
 	 */
-	@ExcelProperty(value = "客户名称")
+	@ExcelProperty(value = "销售订单号")
 	private String orderNo;
 
 	/**
 	 * 客户名称
 	 */
 	@ExcelProperty(value = "客户名称")
-	private String corpId;
+	private String corpsName;
 
 	/**
 	 * 合同日期
@@ -110,22 +110,22 @@ public class SaleOrderExcel {
 	private Date createTime;
 
 	/**
-	 * 是否生成采购
+	 * 是否生成采购 0否 1是
 	 */
 	@ExcelProperty(value = "是否生成采购")
-	private String createPurchase;
+	private String createPurchaseName;
 
 	/**
 	 * 是否生成收货
 	 */
 	@ExcelProperty(value = "是否生成收货")
-	private String createFreight;
+	private String createFreightName;
 
 	/**
 	 * 是否特批
 	 */
 	@ExcelProperty(value = "是否特批")
-	private String specialCheck;
+	private String specialCheckName;
 
 	/**
 	 * 备注

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -247,6 +247,21 @@ public class OrderController extends BladeController {
 		List<Order> list = orderService.list(lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(list)) {
 			list.forEach(item -> {
+				if (item.getCreatePurchase() == 0){
+					item.setCreatePurchaseName("否");
+				}else if (item.getCreatePurchase() == 1){
+					item.setCreatePurchaseName("是");
+				}
+				if (item.getCreateFreight() == 0){
+					item.setCreateFreightName("否");
+				}else if (item.getCreateFreight() == 1){
+					item.setCreateFreightName("是");
+				}
+				if (item.getSpecialCheck() == 0){
+					item.setSpecialCheckName("否");
+				}else if (item.getSpecialCheck() == 1){
+					item.setSpecialCheckName("是");
+				}
 				if (item.getCorpId() != null) {
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());//客户
 					if (corpMessage.isSuccess() && corpMessage.getData() != null) {