编号生成修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/Serial.java

@@ -117,6 +117,11 @@ public class Serial implements Serializable {
 	 */
 	@ApiModelProperty(value = "贸易类型(枚举：国内、进口、出口)")
 	private String tradeType;
+	/**
+	 * 模块类型
+	 */
+	@ApiModelProperty(value = "模块类型")
+	private String serialType;
 
 
 }

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

@@ -22,8 +22,9 @@ public interface ISerialClient {
 	 * 生成系统编号
 	 * @param type 编号类型
 	 * @param tradeType 贸易类型(枚举：国内、进口、出口)
+	 * @param serialType 模块类型
 	 * @return
 	 */
 	@GetMapping(billNO)
-	R getBillNo(@RequestParam("type") String type,@RequestParam("tradeType") String tradeType);
+	R getBillNo(@RequestParam("type") String type,@RequestParam("tradeType") String tradeType,@RequestParam("serialType")String serialType);
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/feign/SerialClient.java

@@ -20,11 +20,12 @@ public class SerialClient implements ISerialClient {
 	 * 生成系统编号
 	 * @param type 编号类型
 	 * @param tradeType 贸易类型(枚举：国内、进口、出口)
+	 * @param serialType 模块类型
 	 * @return
 	 */
 	@Override
 	@GetMapping(billNO)
-	public R getBillNo(String type,String tradeType) {
-		return R.data(serialService.getBillNo(type,tradeType));
+	public R getBillNo(String type,String tradeType,String serialType) {
+		return R.data(serialService.getBillNo(type,tradeType,serialType));
 	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/mapper/SerialMapper.xml

@@ -18,6 +18,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="trade_type" property="tradeType"/>
+        <result column="serial_type" property="serialType"/>
     </resultMap>
 
 

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/ISerialService.java

@@ -42,7 +42,8 @@ public interface ISerialService extends IService<Serial> {
 	 * 生成系统编号
 	 * @param type 编号类型
 	 * @param tradeType 贸易类型(枚举：国内、进口、出口)
+	 * @param serialType 模块类型
 	 * @return
 	 */
-	public String getBillNo(String type,String tradeType);
+	public String getBillNo(String type,String tradeType,String serialType);
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/SerialServiceImpl.java

@@ -46,10 +46,11 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 	 * 生成系统编号
 	 * @param type 编号类型
 	 * @param tradeType 贸易类型(枚举：国内、进口、出口)
+	 * @param serialType 模块类型
 	 * @return
 	 */
 	@Override
-	public synchronized String getBillNo(String type,String tradeType) {
+	public synchronized String getBillNo(String type,String tradeType,String serialType) {
 		Date date = new Date();
 		String billNo = null;
 		String yyyyMM = null;
@@ -64,6 +65,7 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 		billNoSerial.setBillPrefix(yyyyMM);
 		billNoSerial.setTenantId(SecureUtil.getTenantId());
 		billNoSerial.setIsDeleted(0);
+		billNoSerial.setSerialType(serialType);
 		Serial serial = baseMapper.selectOne(new QueryWrapper<Serial>().setEntity(billNoSerial));
 		if (tradeType.equals("CK")){
 			if (serial != null) {

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -88,7 +88,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	@Transactional
 	public R submitDelivery(Delivery delivery) {
 		if (delivery.getId() == null){
-			R billNo = serialClient.getBillNo(delivery.getBillType(),delivery.getTradeType());
+			R billNo = serialClient.getBillNo(delivery.getBillType(),delivery.getTradeType(),delivery.getBillType());
 			if (billNo.isSuccess() && billNo.getData() != null){
 				delivery.setSysNo((String) billNo.getData());
 			}else {
@@ -184,7 +184,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			billStatus = DeliveryStatusEnum.REPEAL.getType();
 		}
 		if (delivery.getId() == null){
-			R billNo = serialClient.getBillNo(delivery.getBillType(),delivery.getTradeType());
+			R billNo = serialClient.getBillNo(delivery.getBillType(),delivery.getTradeType(),delivery.getBillType());
 			if (billNo.isSuccess() && billNo.getData() != null){
 				delivery.setSysNo((String) billNo.getData());
 			}else {

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -61,7 +61,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
           {
              throw new RuntimeException("已收金额+未收金额≠合同总金额,请确认后提交");
 		  }
-		  R billNo = serialClient.getBillNo("ZY", "ZY");
+		  R billNo = serialClient.getBillNo("ZY", "ZY","ZY");
           if(billNo.isSuccess())
           {
 			  serviceProject.setSysNo(billNo.getData().toString());
@@ -278,7 +278,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 	@Transactional
 	public synchronized R getSysNo()
 	{
-		R billNo = serialClient.getBillNo("XM","XM");
+		R billNo = serialClient.getBillNo("XM","XM","XM");
 		if (billNo.getCode() != 200){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			throw new RuntimeException("生成系统编号失败");

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -131,7 +131,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//保存订单主表信息
 		if (order.getId() == null){
 			//获取系统编号
-			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
+			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType(),order.getBillType());
 			if (billNo.getCode() != 200){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成系统编号失败");
@@ -140,7 +140,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			if (!order.getTradeType().equals(OrderTypeEnum.IMPORT.getType()) && StringUtils.isBlank(order.getOrderNo())){
 				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
 				if (corpMessage.isSuccess()){
-					R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
+					R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType(),order.getBillType());
 					if (!clientBillNo.isSuccess()){
 						TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 						return R.fail(500,"生成订单编号失败");
@@ -329,7 +329,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//保存订单主表信息
 		if (order.getId() == null){
 			//获取系统编号
-			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
+			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType(),order.getBillType());
 			if (billNo.getCode() != 200){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成系统编号失败");
@@ -379,7 +379,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 				//保存订单主表信息
 				//获取系统编号
-				R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
+				R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType(),order.getBillType());
 				if (billNo.getCode() != 200){
 					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 					throw  new RuntimeException("生成系统编号失败");
@@ -387,7 +387,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				selectById.setSrcOrderNo(selectById.getSysNo());
 				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
 				if (corpMessage.isSuccess()){
-					R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
+					R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType(),order.getBillType());
 					if (!clientBillNo.isSuccess()){
 						TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 						throw  new RuntimeException("生成订单编号失败");
@@ -444,14 +444,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		//保存订单主表信息
 		//获取系统编号
-		R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
+		R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType(),order.getBillType());
 		if (billNo.getCode() != 200){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			throw  new RuntimeException("生成系统编号失败");
 		}
 		R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(selectById.getCorpId());
 		if (corpMessage.isSuccess()){
-			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
+			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType(),order.getBillType());
 			if (!clientBillNo.isSuccess()){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成订单编号失败");

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

@@ -121,7 +121,7 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		if (Objects.isNull(order.getId()))
 		{
 			//生成系统编号
-			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
+			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType(),order.getBillType());
 			if (billNo.getCode() != 200){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new SecurityException("生成系统编号失败");

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

@@ -241,7 +241,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			throw  new RuntimeException("已询价,请勿重复提交");
 		}
 		//获取系统编号
-		R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
+		R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType(),order.getBillType());
 		if (!billNo.isSuccess()){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			return R.fail(500,"生成系统编号失败");
@@ -416,7 +416,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Transactional
 	public synchronized R getSysNo(String prefix,String tradeType)
 	{
-		R billNo = serialClient.getBillNo(prefix,tradeType);
+		R billNo = serialClient.getBillNo(prefix,tradeType,prefix);
 		if (billNo.getCode() != 200){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			throw new RuntimeException("生成系统编号失败");
@@ -572,7 +572,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	public R<OrderSubmitDto> savePurchase(OrderSubmitDto submitDto) {
 		//获取系统编号
-		R billNo = serialClient.getBillNo(submitDto.getBillType(),submitDto.getTradeType());
+		R billNo = serialClient.getBillNo(submitDto.getBillType(),submitDto.getTradeType(),submitDto.getBillType());
 		if (!billNo.isSuccess()){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			return R.fail(500,"生成系统编号失败");