Merge remote-tracking branch 'origin/master'

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

@@ -808,7 +808,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 						submit = orderCheckClient.underReview(auditProecess.getSrcBillId());
 					}
 					if (!submit.isSuccess()) {
-						throw new SecurityException("审批开始修改审核状态失败");
+						throw new SecurityException(submit.getMsg());
 					}
 				}
 
@@ -895,7 +895,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 					r = orderCheckClient.passCancel(auditProecess.getSrcBillId());
 				}
 				if (!r.isSuccess()) {
-					throw new SecurityException("修改财务数据失败");
+					throw new SecurityException(r.getMsg());
 				}
 
 				if ("销售审批".equals(proecessTemp.getProcessType())) {
@@ -980,7 +980,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 					r = orderCheckClient.passCancel(auditProecess.getSrcBillId());
 				}
 				if (!r.isSuccess()) {
-					throw new SecurityException("修改财务数据失败");
+					throw new SecurityException(r.getMsg());
 				}
 				if ("销售审批".equals(proecessTemp.getProcessType())) {
 					sendMessage.setMessageBody("您的销售请核未通过" + ",销售订单号:" + proecessTemp.getBillNo() + ",驳回原因:" + auditProecess.getAuditMsg());

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/feign/DeliveryClient.java

@@ -120,11 +120,11 @@ public class DeliveryClient implements IDeliveryClient {
 			.eq(Delivery::getSrcId, order.getId())
 			.eq(Delivery::getBillType, "FH")
 			.eq(Delivery::getTradeType, "CK")
-			.eq(Delivery::getSrcOrderNo, order.getOrderNo())
-			.eq(Delivery::getOrgOrderNo, order.getOrderNo())
 			.eq(Delivery::getOrgId, order.getId());
 		Delivery delivery1 = deliveryService.getOne(lambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(delivery1)) {
+			delivery1.setSrcOrderNo(order.getOrderNo());
+			delivery1.setOrgOrderNo(order.getOrderNo());
 			delivery1.setCorpId(order.getCorpId());
 			delivery1.setCorpName(order.getCorpName());
 			delivery1.setClientMessage(order.getClientMessage());

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/controller/AmendsController.java

@@ -90,8 +90,8 @@ public class AmendsController extends BladeController {
 			.and(ObjectUtils.isNotNull(amends.getVesselCnName()), i -> i.like(Amends::getVesselCnName, amends.getVesselCnName()).or()
 				.like(Amends::getVesselEnName, amends.getVesselCnName()))
 			.like(ObjectUtils.isNotNull(amends.getVoyageNo()), Amends::getVoyageNo, amends.getVoyageNo())
-			.ge(ObjectUtils.isNotNull(amends.getBillDateStart()), Amends::getStatus, amends.getBillDateStart())
-			.le(ObjectUtils.isNotNull(amends.getBillDateEnd()), Amends::getStatus, amends.getBillDateEnd())
+			.ge(ObjectUtils.isNotNull(amends.getBillDateStart()), Amends::getEtd, amends.getBillDateStart())
+			.le(ObjectUtils.isNotNull(amends.getBillDateEnd()), Amends::getEtd, amends.getBillDateEnd())
 			.ge(ObjectUtils.isNotNull(amends.getEtdStart()), Amends::getEtd, amends.getEtdStart())
 			.le(ObjectUtils.isNotNull(amends.getEtdEnd()), Amends::getEtd, amends.getEtdEnd())
 			.ge(ObjectUtils.isNotNull(amends.getEtaStart()), Amends::getEta, amends.getEtaStart())

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -582,10 +582,10 @@
         WHERE
         acc.is_deleted = '0'
         <if test='fee.dc != null and fee.dc != "" and fee.dc == "D"'>
-            and acc.stl_amount_dr_loc != acc.amount_dr_loc
+            and IF(acc.cur_code!='CNY',acc.amount_dr_usd != acc.stl_amount_dr_usd,acc.amount_dr != acc.stl_amount_dr)
         </if>
         <if test='fee.dc != null and fee.dc != "" and fee.dc == "C"'>
-            and acc.stl_amount_cr_loc != acc.amount_cr_loc
+            and IF(acc.cur_code!='CNY',acc.amount_cr_usd != acc.stl_amount_cr_usd,acc.amount_cr != acc.stl_amount_cr)
         </if>
         <if test='fee.tenantId != null and fee.tenantId != ""'>
             and acc.tenant_id = #{fee.tenantId}
@@ -692,10 +692,10 @@
         WHERE
         acc.is_deleted = '0'
         <if test='fee.dc != null and fee.dc != "" and fee.dc == "D"'>
-            and acc.stl_amount_dr_loc != acc.amount_dr_loc
+            and IF(acc.cur_code!='CNY',acc.amount_dr_usd != acc.stl_amount_dr_usd,acc.amount_dr != acc.stl_amount_dr)
         </if>
         <if test='fee.dc != null and fee.dc != "" and fee.dc == "C"'>
-            and acc.stl_amount_cr_loc != acc.amount_cr_loc
+            and IF(acc.cur_code!='CNY',acc.amount_cr_usd != acc.stl_amount_cr_usd,acc.amount_cr != acc.stl_amount_cr)
         </if>
         <if test='fee.tenantId != null and fee.tenantId != ""'>
             and acc.tenant_id = #{fee.tenantId}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -165,9 +165,8 @@ public class ExportOrderController extends BladeController {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "已取消");
 		} else if ("4".equals(order.getTabType())) {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "录入");
-		} else {
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getOrderStatus()),Order::getOrderStatus, order.getOrderStatus());
 		}
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getOrderStatus()),Order::getOrderStatus, order.getOrderStatus());
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {