达沃特修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

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

@@ -48,6 +48,9 @@ import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.feign.IOrderCheckClient;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.school.feign.ISalaryClient;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -90,6 +93,10 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	private final IHandoverClient handoverClient;
 
+	private final ISysClient sysClient;
+
+	private final IUserClient userClient;
+
 	@Override
 	public IPage<AuditProecessVO> selectAuditProecessPage(IPage<AuditProecessVO> page, AuditProecessVO auditProecess) {
 		return page.setRecords(baseMapper.selectAuditProecessPage(page, auditProecess));
@@ -760,6 +767,33 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				if (!save.isSuccess()) {
 					throw new SecurityException("发送消息失败");
 				}
+
+				if ("销售特批审批".equals(proecessTemp.getProcessType())) {
+					// 给角色为助理的人发送消息
+					R<String> roleId = sysClient.getRoleIds(AuthUtil.getTenantId(), "助理");
+					if (roleId.isSuccess() && roleId.getData() != null) {
+						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(roleId.getData()));
+						if (userList.isSuccess() && userList.getData() != null) {
+							userList.getData().forEach(user -> {
+								// 推送消息提醒助理生成采购
+								Message message = new Message();
+								message.setUserName(AuthUtil.getUserName());
+								message.setUserId(AuthUtil.getUserId());
+								message.setToUserId(user.getId());
+								message.setMessageType(1);
+								message.setTenantId(AuthUtil.getTenantId());
+								message.setCreateUser(AuthUtil.getUserId());
+								message.setCreateTime(new Date());
+								message.setParameter(String.valueOf(auditProecess.getBillId()));
+								message.setPageLabel(auditProecess.getPageLabel());
+								message.setPageStatus(auditProecess.getPageStatus());
+								message.setMessageBody("销售订单“" + proecessTemp.getBillNo() + "“已完成收费，请尽快生成采购。");
+								message.setPageLabel("销售订单(N)");
+								messageClient.save(message);
+							});
+						}
+					}
+				}
 			}
 			//不通过
 			else if (operate == 2) {

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

@@ -642,7 +642,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@GlobalTransactional(rollbackFor = Exception.class)
 	public void checkOrder(Order order) {
 		Order salesOrder = baseMapper.selectById(order.getId());
-		if (salesOrder.getStatus() != 0) {
+		if (order.getCheckFlag() != 3 && salesOrder.getStatus() != 0) {
 			throw new SecurityException("订单已开启审核,请勿重复提交");
 		}
 		// 判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过