修改提交

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/OrderItemBillNoVO.java

@@ -16,5 +16,7 @@ public class OrderItemBillNoVO
 
   private Long itemId;
 
+  private String cntrNo;
+
   private List<Map<String,Object>> itemName;
 }

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

@@ -156,7 +156,7 @@ public class AuditProecessController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "批量审批", notes = "传入auditProecessDTOList")
 	public R batchOperation(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,
-							@ApiParam(value = "操作状态", required = true) @RequestParam String auditStatus)
+							@ApiParam(value = "操作状态", required = true) @RequestParam Integer operate)
 	{
               LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		      auditProecessLambdaQueryWrapper.in(AuditProecess::getId, Func.toLongList(ids));
@@ -165,7 +165,7 @@ public class AuditProecessController extends BladeController {
 		      {
 		      	throw new SecurityException("未查询相关数据,禁止操作");
 			  }
-		      auditProecessService.batchOperation(proecessList,auditStatus);
+		      auditProecessService.batchOperation(proecessList,operate);
 		      return R.success("操作成功");
 	}
 

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

@@ -45,6 +45,6 @@ public interface IAuditProecessService extends IService<AuditProecess> {
 
 	void operationFinanceProcess(AuditProecess auditProecess);
 
-	void batchOperation(List<AuditProecess> processLis,String auditStatus);
+	void batchOperation(List<AuditProecess> processLis,Integer operate);
 
 }

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

@@ -239,10 +239,10 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 	@Override
 	@Transactional
 	@GlobalTransactional
-	public void batchOperation(List<AuditProecess> processLis, String auditStatus)
+	public void batchOperation(List<AuditProecess> processLis, Integer operate)
 	{
 		processLis.forEach(e->{
-			e.setAuditStatus(auditStatus);
+			e.setOperate(operate);
 			this.operationFinanceProcess(e);
 		});
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -372,6 +372,7 @@
 
     <select id="findContractNoByBillNo" resultType="org.springblade.purchase.sales.vo.OrderItemBillNoVO">
         SELECT
+        b.cntr_no as cntrNo,
         a.order_no as orderNo,
         b.bill_no as billNo,
         b.item_id as itemId

blade-service/pom.xml

@@ -31,6 +31,7 @@
         <module>trade-finance</module>
         <module>store-goods</module>
         <module>blade-check</module>
+        <module>blade-rocket-mq</module>
     </modules>
 
     <dependencies>