Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderFeesClient.java

@@ -27,4 +27,7 @@ public interface IOrderFeesClient {
 	@PostMapping("/orderfees/submit")
 	R submit(@RequestBody OrderFees orderFees);
 
+	@GetMapping("/orderfees/getById")
+	OrderFees getById(@RequestParam("id") Long id);
+
 }

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

@@ -21,6 +21,10 @@ import java.util.Map;
 public class OrderDTO extends OrderItems {
 	private static final long serialVersionUID = 1L;
 
+	private String cornNo;
+
+	private BigDecimal orderQuantity;
+
 	private String orderNo;
 
 	private String billNo;

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -50,6 +50,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -80,6 +81,7 @@ public class AuditProecessController extends BladeController {
 	@ApiOperation(value = "列表-用户审批记录", notes = "传入auditProecess")
 	public R list(AuditProecess auditProecess, Query query) {
 		LambdaQueryWrapper<AuditProecess> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(AuditProecess::getIsDelete,0);
 		lambdaQueryWrapper.like(AuditProecess::getAuditUserId, String.valueOf(AuthUtil.getUserId()));
 		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditProecess.getAuditStatus()),AuditProecess::getAuditStatus, auditProecess.getAuditStatus());
 		IPage pages = auditProecessService.page(Condition.getPage(query), lambdaQueryWrapper);
@@ -130,6 +132,44 @@ public class AuditProecessController extends BladeController {
 		}
 	}
 
+	@PostMapping("cancelCheck")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "撤回审核", notes = " ")
+	public R cancelCheck(@ApiParam(value = "申请表主键", required = true) @RequestParam Long id)
+	{
+		auditProecessService.cancelCheck(id);
+		return R.success("操作成功");
+	}
+	@GetMapping("findAuditProcessList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查看审核记录", notes = " ")
+	public R findAuditProcessList(@ApiParam(value = "申请表主键", required = true) @RequestParam Long id)
+	{
+		//查询最大批次号
+		LambdaQueryWrapper<AuditProecess> countMaxWrapper=new LambdaQueryWrapper<>();
+		countMaxWrapper
+			.eq(AuditProecess::getSrcBillId,id)
+			.eq(AuditProecess::getIsDelete,0)
+			.eq(AuditProecess::getTenantId,AuthUtil.getTenantId());
+		List<AuditProecess> proecessList = auditProecessService.list(countMaxWrapper);
+		if(CollectionUtils.isEmpty(proecessList))
+		{
+			return R.data(Collections.EMPTY_LIST);
+		}
+		//获取此付费申请下的最大批次号
+		int max = proecessList.stream().max(Comparator.comparing(AuditProecess::getBatchNo)).get().getBatchNo();
+		//根据最大批次号, 查询最新的审批记录
+		LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		auditProecessLambdaQueryWrapper
+			.eq(AuditProecess::getBatchNo,max)
+			.orderByAsc(AuditProecess::getLevelId)
+			.eq(AuditProecess::getSrcBillId,id)
+		.eq(AuditProecess::getIsDelete,0)
+		.eq(AuditProecess::getTenantId,AuthUtil.getTenantId());
+		return R.data(auditProecessService.list(auditProecessLambdaQueryWrapper));
+
+	}
+
 	@PostMapping("createFinanceProcess")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "开启-财务审批流记录", notes = "传入auditProecessDTO")

blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -141,4 +141,8 @@ public class AuditProecess implements Serializable {
 
 	    private String url;
 
+	    private Integer isDelete;
+
+	    private int batchNo;
+
 }

blade-service/blade-check/src/main/java/org/springblade/check/service/IAuditProecessService.java

@@ -47,4 +47,6 @@ public interface IAuditProecessService extends IService<AuditProecess> {
 
 	void batchOperation(List<AuditProecess> processLis,Integer operate);
 
+	void cancelCheck(Long srcBillId);
+
 }

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -17,6 +17,7 @@
 package org.springblade.check.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import org.springblade.client.entity.Message;
 import org.springblade.client.feign.IMessageClient;
 import org.springblade.core.tool.api.R;
@@ -37,8 +38,11 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 审批流记录 服务实现类
@@ -66,8 +70,26 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 	@Transactional
 	public void createFinanceProcess(AuditProecessDTO auditProecessDTO)
 	{
+		//查询最大批次号
+		int current=0;
+		LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		auditProecessLambdaQueryWrapper.eq(AuditProecess::getSrcBillId,auditProecessDTO.getSrcBillId());
+		List<AuditProecess> auditProecesses = baseMapper.selectList(auditProecessLambdaQueryWrapper);
+		if(CollectionUtils.isNotEmpty(auditProecesses))
+		{
+			int max = auditProecesses.stream().max(Comparator.comparing(AuditProecess::getBatchNo)).get().getBatchNo();
+			current=max+1;
+
+		}
+		else
+		{
+			current=1;
+		}
+		int finalCurrent = current;
+
 		List<AuditPathsLevels> pathsLevelsList = auditProecessDTO.getPathsLevelsList();
 		//根据审批级次 生成 有多少调就生成多条审批流
+
 		pathsLevelsList.forEach(e->{
 			AuditProecess auditProecess=new AuditProecess();
 			auditProecess.setActId(auditProecessDTO.getActId());
@@ -86,7 +108,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			auditProecess.setIffinalItem(e.getIffinalItem());
 			auditProecess.setProcessType(auditProecessDTO.getProcessType());
 			auditProecess.setUrl(auditProecessDTO.getUrl());
-
+			auditProecess.setBatchNo(finalCurrent);
 			//除了第一级是待审,其他都N
 			if(e.getLevelId()==1)
 			{
@@ -247,4 +269,49 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		});
 	}
 
+	@Override
+	@Transactional
+	@GlobalTransactional
+	public void cancelCheck(Long srcBillId)
+	{
+		//查询最大批次号
+		LambdaQueryWrapper<AuditProecess> countMaxWrapper=new LambdaQueryWrapper<>();
+		countMaxWrapper
+			.eq(AuditProecess::getSrcBillId,srcBillId)
+			.eq(AuditProecess::getIsDelete,0)
+			.eq(AuditProecess::getTenantId,AuthUtil.getTenantId());
+		List<AuditProecess> proecessList = baseMapper.selectList(countMaxWrapper);
+		if(CollectionUtils.isEmpty(proecessList))
+		{
+			throw new SecurityException("无审批记录,禁止撤回");
+		}
+		//获取此申请表下的最大批次号
+		int max = proecessList.stream().max(Comparator.comparing(AuditProecess::getBatchNo)).get().getBatchNo();
+        //获取最新的审批记录
+		List<AuditProecess> auditProecessList = proecessList.stream().filter(e -> e.getBatchNo() == max).collect(Collectors.toList());
+		//如果最新审批记录 第一级已经操作,就禁止撤回
+		long count = auditProecessList.stream().filter(
+			e -> e.getBatchNo() == max &&
+				 e.getLevelId() == 1 &&
+				(e.getAuditStatus().equals("A") || e.getAuditStatus().equals("B")))
+			.count();
+		if(count>0)
+		{
+			throw new SecurityException("第一级审批已经开始,禁止撤回");
+		}
+		//撤回开始,删除审批记录
+		auditProecessList.forEach(e->{
+                e.setIsDelete(1);
+			    baseMapper.updateById(e);
+		});
+		// 修改原申请表状态
+		R r = financeClient.passCancel(srcBillId);
+		if(!r.isSuccess())
+		{
+			throw new SecurityException("撤回失败,修改原申请表出错");
+		}
+
+
+	}
+
 }

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

@@ -27,6 +27,7 @@ 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.springblade.purchase.sales.entity.Order;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.purchase.sales.entity.OrderFees;
@@ -59,6 +60,12 @@ public class OrderFeesController extends BladeController {
 		return R.data(detail);
 	}
 
+	@GetMapping("/getById")
+	OrderFees getById(@RequestParam("id") Long id)
+	{
+		return  orderFeesService.getById(id);
+	}
+
 	/**
 	 * 分页 订单费用明细表
 	 */

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/scheduled/OrderCreditDateCheckTimer.java

@@ -65,11 +65,14 @@ public class OrderCreditDateCheckTimer
 					targetCalendar.setTime(simpleDateFormat.parse(creditDateStr));
 					//开始比较
 					int day = DateUtils.dateDiff('d', targetCalendar, todayCalendar);
+					log.info("今天:"+todayCalendar.toString()+",到期日:"+targetCalendar.toString()+",相差天数==>"+day);
 					//只关注还有2天到期的, 之前的不在处理
 					if(day ==2 )
 					{
 
 						Message message=new Message();
+						message.setUserId(1L);
+						message.setUserName("系统定时任务");
 						message.setCreateTime(new Date());
 						message.setToUserId(e.getCreateUser());
 						message.setToUserName(e.getCreateUserName());

blade-service/blade-rocket-mq/pom.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blade-service</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.8.2.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+
+    <artifactId>blade-rocket-mq</artifactId>
+    <name>${project.artifactId}</name>
+    <version>2.8.2.RELEASE</version>
+    <dependencies>
+    <dependency>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-core-boot</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-starter-swagger</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-purchase-sales-api</artifactId>
+        <version>2.8.2.RELEASE</version>
+    </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-client-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>trade-purchase-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-transaction</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-mocha-item-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-deliver-goods-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-stock-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!--rocketMQ -->
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

blade-service/blade-rocket-mq/src/main/java/org/springblade/rocket/RocketMQpplication.java

@@ -0,0 +1,45 @@
+/*
+ *      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.purchase.sales;
+
+import okio.Sink;
+import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.transaction.annotation.SeataCloudApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+
+/**
+ * Desk启动器
+ *
+ * @author Chill
+ */
+
+/**
+ * 销售订单模块
+ */
+@EnableBladeFeign
+@SpringCloudApplication
+@SeataCloudApplication
+public class RocketMQpplication {
+
+	public static void main(String[] args) {
+		BladeApplication.run("blade-rocket", RocketMQpplication.class, args);
+	}
+
+}
+

blade-service/blade-rocket-mq/src/main/java/org/springblade/rocket/controller/TestRocketConsumer.java

@@ -0,0 +1,20 @@
+package org.springblade.rocket.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@RocketMQMessageListener(consumerGroup = "consumer-group", topic = "test-msg")
+public class TestRocketConsumer implements RocketMQListener<String>
+{
+
+	@Override
+	public void onMessage(String str)
+	{
+       //监听消息
+		log.info("监听到主题为'test-msg'的消息：" + str);
+	}
+}

blade-service/blade-rocket-mq/src/main/java/org/springblade/rocket/producer/TestRocketProducer.java

@@ -0,0 +1,24 @@
+package org.springblade.rocket.producer;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class TestRocketProducer
+{
+
+	private final RocketMQTemplate rocketMQTemplate;
+
+	@PostMapping("/rocketmq/producer")
+	public String test() {
+		rocketMQTemplate.convertAndSend(
+			"test-msg",
+			"发送测试rocketMQ");
+
+		return "success";
+	}
+}

blade-service/blade-rocket-mq/src/main/resources/application-dev.yml

@@ -0,0 +1,24 @@
+#服务器端口
+server:
+  port: 7719
+  profile: D:/ruoyi/uploadPath
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
+#mybatis-plus:
+#  mapper-locations: classpath:com/yh/project/mapper/*Mapper.xml
+#  type-aliases-package: com.yh.project.*.entity
+#swagger文档
+swagger:
+  base-packages:
+    - org.springblade.purchase.sales
+
+
+rocketmq:
+  name-server: 127.0.0.1:9876
+  producer:
+    group: producer-group

blade-service/blade-rocket-mq/src/main/resources/application-prod.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 7719
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.prod.url}
+    username: ${blade.datasource.prod.username}
+    password: ${blade.datasource.prod.password}

blade-service/blade-rocket-mq/src/main/resources/application-test.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 7719
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.test.url}
+    username: ${blade.datasource.test.username}
+    password: ${blade.datasource.test.password}

blade-service/blade-rocket-mq/src/main/resources/mapper.xmk

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<!--
+    注意: 这个配置文件并不会被实际使用到, 写这个文件仅仅是为了让 IDEA 的 Mybatis 插件找到实体类的位置
+ -->
+<configuration>
+    <typeAliases>
+        <package name="org.springblade.purchase.sales.entity"/> <!--替换成你的项目的实体类的路径-->
+    </typeAliases>
+</configuration>

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

@@ -295,22 +295,24 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			{
 				throw new SecurityException("撤销账单失败,未获取到原业务信息");
 			}
-			OrderFees orderFees=new OrderFees();
-			orderFees.setId(srcFeesId);
-			orderFees.setTenantId(AuthUtil.getTenantId());
-			R<OrderFees> detail = orderFeesClient.detail(orderFees);
-			if(detail==null)
+
+			OrderFees orderFees = orderFeesClient.getById(srcFeesId);
+			if(orderFees==null)
 			{
 				throw new SecurityException("修改原单据失败");
 			}
-			OrderFees fees = detail.getData();
 			//回退原业务表数据
-			if(fees.getSettlmentAmount() == null)
+			if(orderFees.getSettlmentAmount() == null)
 			{
 				throw new SecurityException("撤销账单失败,原业务表已收金额为空");
 			}
-			fees.setSettlmentAmount(fees.getSettlmentAmount().subtract(items.getThisAmount()));
-			orderFeesClient.submit(fees);
+			BigDecimal decimal = orderFees.getSettlmentAmount().subtract(items.getThisAmount());
+			if(decimal.compareTo(BigDecimal.ZERO)==-1)
+			{
+				throw new SecurityException("撤销账单失败,剩余已收金额不够本次扣款");
+			}
+			orderFees.setSettlmentAmount(decimal);
+			orderFeesClient.submit(orderFees);
 		}
 
 	}
@@ -372,17 +374,14 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			{
 				throw new SecurityException("操作失败,未获取到原业务信息");
 			}
-			OrderFees orderFees=new OrderFees();
-			orderFees.setId(srcFeesId);
-			orderFees.setTenantId(AuthUtil.getTenantId());
-			R<OrderFees> detail = orderFeesClient.detail(orderFees);
-			if(detail==null)
+
+			OrderFees orderFees = orderFeesClient.getById(srcFeesId);
+			if(orderFees==null)
 			{
 				throw new SecurityException("修改原单据失败");
 			}
-			OrderFees fees = detail.getData();
-			fees.setSettlmentAmount(fees.getSettlmentAmount()!=null?fees.getSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
-			orderFeesClient.submit(fees);
+			orderFees.setSettlmentAmount(orderFees.getSettlmentAmount()!=null?orderFees.getSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+			orderFeesClient.submit(orderFees);
 		}
 		else
 		{
@@ -676,8 +675,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Override
 	public void passCancel(Long settlementId)
 	{
-		//todo 删除申请记录
-        LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper=new LambdaQueryWrapper<>();
+
+       LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		settlementLambdaQueryWrapper
 			.eq(Settlement::getId,settlementId)
 			.eq(Settlement::getTenantId,AuthUtil.getTenantId());
@@ -686,7 +685,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		{
 			throw new SecurityException("审批取消失败");
 		}
-
+		settlement.setCheckStatus("未请核");
+		baseMapper.updateById(settlement);
+		/*
 		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		itemsLambdaQueryWrapper.eq(Items::getPid,settlementId);
 		List<Items> itemsList = itemsMapper.selectList(itemsLambdaQueryWrapper);
@@ -698,7 +699,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			});
 		}
 		//删除财务申请主表
-		baseMapper.deleteById(settlementId);
+		baseMapper.deleteById(settlementId);*/
 	}
 
 

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

@@ -141,17 +141,17 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 				order.setOrgOrderNo(order.getOrderNo());
 			}
 			//订单编号转大写
-			order.setOrderNo(order.getOrderNo().toUpperCase());
-			order.setSysNo(order.getSysNo().toUpperCase());
-			order.setBillNo(order.getBillNo().toUpperCase());
+			//order.setOrderNo(order.getOrderNo().toUpperCase());
+			//order.setSysNo(order.getSysNo().toUpperCase());
+			//order.setBillNo(order.getBillNo().toUpperCase());
 			order.setCreateTime(new Date());
 			order.setCreateUser(AuthUtil.getUserId());
 			orderService.insert(order);
 		} else {
 			//防止有人改成小写的字母
-			order.setOrderNo(order.getOrderNo().toUpperCase());
-			order.setSysNo(order.getSysNo().toUpperCase());
-			order.setBillNo(order.getBillNo().toUpperCase());
+			//order.setOrderNo(order.getOrderNo().toUpperCase());
+			//order.setSysNo(order.getSysNo().toUpperCase());
+			//order.setBillNo(order.getBillNo().toUpperCase());
 			order.setUpdateTime(new Date());
 			order.setUpdateUser(AuthUtil.getUserId());
 			orderService.updateById(order);

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

@@ -67,6 +67,8 @@
 
     <select id="listOrderItem" resultType="com.trade.purchase.order.vo.OrderDTO">
         SELECT
+        b.order_quantity as orderQuantity,
+        b.cntr_no as cntrNo,
         a.order_no as orderNo,
         b.bill_no as billNo,
         a.corp_id as corpId,