系统编号、订单编号修改

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

@@ -112,6 +112,11 @@ public class Serial implements Serializable {
 	//@TableLogic
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
 	private Integer isDeleted;
+	/**
+	 * 贸易类型(枚举：国内、进口、出口)
+	 */
+	@ApiModelProperty(value = "贸易类型(枚举：国内、进口、出口)")
+	private String tradeType;
 
 
 }

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

@@ -18,6 +18,12 @@ public interface ISerialClient {
 	String API_PREFIX = "/client";
 	String billNO = API_PREFIX + "/billNO";
 
+	/**
+	 * 生成系统编号
+	 * @param type 编号类型
+	 * @param tradeType 贸易类型(枚举：国内、进口、出口)
+	 * @return
+	 */
 	@GetMapping(billNO)
-	R getBillNo(@RequestParam("type") String type);
+	R getBillNo(@RequestParam("type") String type,@RequestParam("tradeType") String tradeType);
 }

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

@@ -15,9 +15,16 @@ import springfox.documentation.annotations.ApiIgnore;
 @AllArgsConstructor
 public class SerialClient implements ISerialClient {
 	private ISerialService serialService;
+
+	/**
+	 * 生成系统编号
+	 * @param type 编号类型
+	 * @param tradeType 贸易类型(枚举：国内、进口、出口)
+	 * @return
+	 */
 	@Override
 	@GetMapping(billNO)
-	public R getBillNo(String type) {
-		return R.data(serialService.getBillNo(type));
+	public R getBillNo(String type,String tradeType) {
+		return R.data(serialService.getBillNo(type,tradeType));
 	}
 }

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

@@ -17,6 +17,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="trade_type" property="tradeType"/>
     </resultMap>
 
 

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

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

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

@@ -42,13 +42,20 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 	public IPage<SerialVO> selectSerialPage(IPage<SerialVO> page, SerialVO serial) {
 		return page.setRecords(baseMapper.selectSerialPage(page, serial));
 	}
+	/**
+	 * 生成系统编号
+	 * @param type 编号类型
+	 * @param tradeType 贸易类型(枚举：国内、进口、出口)
+	 * @return
+	 */
 	@Override
-	public synchronized String getBillNo(String type) {
+	public synchronized String getBillNo(String type,String tradeType) {
 		Date date = new Date();
 		String billNo = null;
 		String yyyyMM = DateFormatUtils.format(date, "yyyyMM");
 		Serial billNoSerial = new Serial();
 		billNoSerial.setBillType(type);
+		billNoSerial.setTradeType(tradeType);
 		billNoSerial.setBillPrefix(yyyyMM);
 		billNoSerial.setTenantId(SecureUtil.getTenantId());
 		billNoSerial.setIsDeleted(0);

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

@@ -90,7 +90,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());
+			R billNo = serialClient.getBillNo(delivery.getBillType(),delivery.getTradeType());
 			if (billNo.isSuccess() && billNo.getData() != null){
 				delivery.setSysNo((String) billNo.getData());
 			}else {
@@ -183,7 +183,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			billStatus = "录入";
 		}
 		if (delivery.getId() == null){
-			R billNo = serialClient.getBillNo(delivery.getBillType());
+			R billNo = serialClient.getBillNo(delivery.getBillType(),delivery.getTradeType());
 			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

@@ -214,7 +214,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 	@Transactional
 	public synchronized R getSysNo()
 	{
-		R billNo = serialClient.getBillNo("XM");
+		R billNo = serialClient.getBillNo("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

@@ -96,7 +96,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//保存订单主表信息
 		if (order.getId() == null){
 			//获取系统编号
-			R billNo = serialClient.getBillNo(order.getBillType());
+			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
 			if (billNo.getCode() != 200){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成系统编号失败");
@@ -104,7 +104,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setSysNo((String) billNo.getData());
 			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
 			if (corpMessage.isSuccess()){
-				R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode());
+				R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
 				if (!clientBillNo.isSuccess()){
 					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 					return R.fail(500,"生成订单编号失败");
@@ -239,7 +239,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//保存订单主表信息
 		if (order.getId() == null){
 			//获取系统编号
-			R billNo = serialClient.getBillNo(order.getBillType());
+			R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
 			if (billNo.getCode() != 200){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成系统编号失败");
@@ -291,7 +291,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		//保存订单主表信息
 		//获取系统编号
-		R billNo = serialClient.getBillNo(order.getBillType());
+		R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
 		if (billNo.getCode() != 200){
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			throw  new RuntimeException("生成系统编号失败");
@@ -299,7 +299,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		selectById.setOrgOrderNo(selectById.getOrderNo());
 		R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(selectById.getCorpId());
 		if (corpMessage.isSuccess()){
-			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode());
+			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
 			if (!clientBillNo.isSuccess()){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成订单编号失败");

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

@@ -295,9 +295,10 @@ public class PurchaseOrderController extends BladeController {
 
 	@GetMapping("getSysNo")
 	@ApiOperation(value = "采购订单获取系统编号prefix=GN JK CK", notes = "采购订单获取系统编号prefix=GN JK CK")
-	public R  getSysNo(@RequestParam(value = "prefix",required = true)String prefix)
+	public R  getSysNo(@RequestParam(value = "prefix",required = true)String prefix,
+					   @RequestParam(value = "tradeType",required = true)String tradeType)
 	{
-		return orderService.getSysNo(prefix);
+		return orderService.getSysNo(prefix,tradeType);
 	}
 
 	@GetMapping("getItemListByConditions")

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

@@ -80,7 +80,13 @@ public interface IOrderService extends IService<Order> {
 	 */
 	R<OrderVO> getShippingMessage(String id);
 
-	R  getSysNo(String prefix);
+	/**
+	 * 生成系统编号
+	 * @param prefix  业务类型
+	 * @param tradeType 贸易类型
+	 * @return
+	 */
+	R  getSysNo(String prefix,String tradeType);
 
 
 	/**

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

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