2023年1月5日17:03:55

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

@@ -252,4 +252,16 @@ public class AuditProecess implements Serializable {
 	@ApiModelProperty(value = "提单号")
 	private String morderNo;
 
+	/**
+	 * 参考号
+	 */
+	@ApiModelProperty(value = "参考号")
+	private String referenceNo;
+
+	/**
+	 * 运费
+	 */
+	@TableField(exist = false)
+	private BigDecimal amountFreight;
+
 }

blade-service/blade-check/pom.xml

@@ -117,6 +117,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-land-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

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

@@ -53,6 +53,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Settlement;
+import org.springblade.land.entity.LandOrder;
+import org.springblade.land.feign.ILandClient;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderFiles;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
@@ -62,10 +64,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
+
+import static org.springblade.common.constant.TenantConstant.OFFSET_RATIO;
 
 /**
  * 审批流记录 控制器
@@ -97,6 +98,8 @@ public class AuditProecessController extends BladeController {
 
 	private final IClaimClient claimClient;//费用报销
 
+	private final ILandClient landClient;
+
 	/**
 	 * 分页 审批流记录
 	 */
@@ -181,6 +184,17 @@ public class AuditProecessController extends BladeController {
 						}
 					}
 				}
+				if ("234557".equals(AuthUtil.getTenantId())) {
+					LandOrder landOrder = new LandOrder();
+					landOrder.setCorpId(e.getCorpId());
+					R<List<LandOrder>> r = landClient.listLandOrder(landOrder);
+					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
+						List<LandOrder> landOrderList = r.getData();
+						BigDecimal freightPay = landOrderList.stream().map(LandOrder::getFreightPay).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+						BigDecimal freight = landOrderList.stream().map(LandOrder::getFreight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+						e.setAmountFreight(freightPay.add(freight));
+					}
+				}
 				//财务明细表相关数据
 				if (e.getSrcBillId() != null) {
 					R<Settlement> detail = financeClient.getById(e.getSrcBillId());

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

@@ -201,6 +201,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			auditProecess.setReceivableAmount(auditProecessDTO.getReceivableAmount());
 			auditProecess.setPayAmount(auditProecessDTO.getPayAmount());
 			auditProecess.setTimes(auditProecessDTO.getTimes());
+			auditProecess.setReferenceNo(auditProecessDTO.getReferenceNo());
 			//除了第一级是待审,其他都N
 			if (e.getLevelId() == 1) {
 				SimpleDateFormat simpleDateFormat = new SimpleDateFormat();

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderController.java

@@ -364,7 +364,7 @@ public class OrderController extends BladeController {
 	/**
 	 * 分页 陆运订单表
 	 */
-	@GetMapping("/listLandOrder")
+	@PostMapping("/listLandOrder")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入order")
 	public R<List<LandOrder>> listLandOrder(@RequestBody LandOrder order) {

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

@@ -94,7 +94,7 @@ public class OrderDescClient implements IOrderDescClient {
 			}
 		}
 		if (ObjectUtil.isNotEmpty(order.getStatus())) {
-			if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") && 6 == order.getStatus()) {
+			if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") || 6 == order.getStatus()) {
 				iOrderService.collectHairGoods(order);
 			} else {
 				iOrderService.updateById(order);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/partsapp/AppPartsController.java

@@ -186,7 +186,11 @@ public class AppPartsController extends BladeController {
 				lambdaQueryWrapper.orderByDesc(Order::getConfirmStatus);
 			}
 		} else {
-			lambdaQueryWrapper.orderByDesc(Order::getStatus);
+			if ("234557".equals(AuthUtil.getTenantId())){
+				lambdaQueryWrapper.orderByAsc(Order::getStatus);
+			}else{
+				lambdaQueryWrapper.orderByAsc(Order::getId);
+			}
 		}
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 

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

@@ -2426,6 +2426,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						auditProecessDTO.setSendUserId(AuthUtil.getUserId());
 						auditProecessDTO.setSendName(AuthUtil.getUserName());
 						auditProecessDTO.setSendTime(new Date());
+						auditProecessDTO.setReferenceNo(order.getBillNo());
 						R financeProcess = iCheckClient.createFinanceProcess(auditProecessDTO);
 						if (!financeProcess.isSuccess()) {
 							throw new SecurityException("操作失败,请联系管理员");
@@ -3055,6 +3056,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						auditProecessDTO.setSendUserId(AuthUtil.getUserId());
 						auditProecessDTO.setSendName(AuthUtil.getUserName());
 						auditProecessDTO.setSendTime(new Date());
+						auditProecessDTO.setReferenceNo(order.getBillNo());
 						R financeProcess = iCheckClient.createFinanceProcess(auditProecessDTO);
 						if (!financeProcess.isSuccess()) {
 							throw new SecurityException("操作失败,请联系管理员");
@@ -4051,7 +4053,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (order.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
 		}
-		if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") && ObjectUtils.isNotNull(order.getStatus()) && 6 == order.getStatus()) {
+		if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") || ObjectUtils.isNotNull(order.getStatus()) && 6 == order.getStatus()) {
 			if (ObjectUtils.isNotNull(order.getSpecial()) && "1".equals(order.getSpecial())) {
 				Order selectOrder = baseMapper.selectById(order.getId());
 				LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -4371,7 +4373,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					return R.data("订单单号：" + selectOrder.getSysNo() + "金额小于运费金额，确定要审核通过吗？");
 				}
 			} else {
-				return R.data("未查到陆运订单信息");
+				 throw new  RuntimeException("运费余额不足，审核失败");
 			}
 		} else {
 			return R.data("未查到订单信息");

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -208,9 +208,11 @@ public class AccController extends BladeController {
 			}
 			//录入人
 			acc_.setCreateUserName(iUserClient.userInfoById(acc_.getCreateUser()).getData().getRealName());
-			//业务员
-			if(ObjectUtils.isNotNull(acc_.getShipName())){
-				acc_.setShipName(iUserClient.userInfoById(Long.parseLong(acc_.getShipName())).getData().getRealName());
+			if (!"064132".equals(AuthUtil.getTenantId())){
+				//业务员
+				if(ObjectUtils.isNotNull(acc_.getShipName())){
+					acc_.setShipName(iUserClient.userInfoById(Long.parseLong(acc_.getShipName())).getData().getRealName());
+				}
 			}
 			//费用名称
 			if (StringUtils.isNotBlank(acc_.getCostType())) {
@@ -835,9 +837,11 @@ public class AccController extends BladeController {
 			}
 			//录入人
 			acc_.setCreateUserName(iUserClient.userInfoById(acc_.getCreateUser()).getData().getRealName());
-			//业务员
-			if (ObjectUtils.isNotNull(acc_.getShipName())){
-				acc_.setShipName(iUserClient.userInfoById(Long.parseLong(acc_.getShipName())).getData().getRealName());
+			if (!"064132".equals(AuthUtil.getTenantId())){
+				//业务员
+				if(ObjectUtils.isNotNull(acc_.getShipName())){
+					acc_.setShipName(iUserClient.userInfoById(Long.parseLong(acc_.getShipName())).getData().getRealName());
+				}
 			}
 			//费用名称
 			if (StringUtils.isNotBlank(acc_.getCostType())) {