创融峻合 2023年6月9日18:15:01

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

@@ -1052,7 +1052,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			temp.setCreateDeliver(1);
 			temp.setCreateDeliverUser(AuthUtil.getUserId().toString());
 			temp.setCreateDeliverTime(date);
-			temp.setActualDeliveryDate(select.getBusinessDate());
+			temp.setActualDeliveryDate(date);
 			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
 				temp.setDeliverQuantity(select.getTotalQuantity());
 			} else {
@@ -1064,7 +1064,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			Order orderTemp = new Order();
 			orderTemp.setId(select.getOrgId());//采购主表id
 			orderTemp.setOrderStatus("待收货");
-			orderTemp.setActualDeliveryDate(select.getBusinessDate());
+			orderTemp.setActualDeliveryDate(date);
 			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
 				orderTemp.setDeliverQuantity(select.getTotalQuantity());
 			} else {
@@ -1091,7 +1091,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				temp.setCreateDeliver(1);
 				temp.setCreateDeliverUser(AuthUtil.getUserId().toString());
 				temp.setCreateDeliverTime(date);
-				temp.setActualDeliveryDate(select.getBusinessDate());
+				temp.setActualDeliveryDate(date);
 				if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					temp.setDeliverQuantity(select.getTotalQuantity());
 				} else {
@@ -1103,7 +1103,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				Order orderTemp = new Order();
 				orderTemp.setId(select.getOrgId());//采购主表id
 				orderTemp.setOrderStatus("待收货");
-				orderTemp.setActualDeliveryDate(select.getBusinessDate());
+				orderTemp.setActualDeliveryDate(date);
 				if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					orderTemp.setDeliverQuantity(select.getTotalQuantity());
 				} else {
@@ -1121,7 +1121,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				Order temp = new Order();
 				temp.setId(select.getOrgId());//采购主表id
 				temp.setOrderStatus("待发货");
-				temp.setActualDeliveryDate(select.getBusinessDate());
+				temp.setActualDeliveryDate(date);
 				if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					temp.setDeliverQuantity(select.getTotalQuantity());
 				} else {
@@ -1133,7 +1133,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				Order orderTemp = new Order();
 				orderTemp.setId(select.getSrcId());//销售主表id
 				orderTemp.setOrderStatus("已发货");
-				orderTemp.setActualDeliveryDate(select.getBusinessDate());
+				orderTemp.setActualDeliveryDate(date);
 				if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					orderTemp.setDeliverQuantity(select.getTotalQuantity());
 				} else {

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

@@ -80,7 +80,6 @@ public class OrderDescClient implements IOrderDescClient {
 				if (order.getDeliverQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					iOrderService.update(null, new LambdaUpdateWrapper<Order>()
 						.set(Order::getDeliverTime, null)
-						.set(Order::getActualDeliveryDate, null)
 						.eq(Order::getId, order.getId())
 					);
 				}
@@ -89,7 +88,6 @@ public class OrderDescClient implements IOrderDescClient {
 				if (order.getReceiveQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					iOrderService.update(null, new LambdaUpdateWrapper<Order>()
 						.set(Order::getReceiveTime, null)
-						.set(Order::getActualDeliveryDate, null)
 						.eq(Order::getId, order.getId())
 					);
 				}

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

@@ -3566,7 +3566,6 @@ ORDER BY
     </select>
     <select id="orderInventoryList" resultType="org.springblade.purchase.sales.vo.OrderVO">
         SELECT
-        DISTINCT
         bo.id,
         bo.order_no,
         bo.busines_date,
@@ -3595,6 +3594,11 @@ ORDER BY
             and bo.actual_delivery_date is NULL
             AND bo.order_status NOT IN ('录入')
         </if>
+        GROUP BY bo.id,
+        bo.actual_delivery_date,
+        bo.order_no,
+        bo.busines_date,
+        item.corp_id
     </select>
     <select id="turnoverAnalysisDWT" resultType="java.util.Map">
         SELECT

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

@@ -507,7 +507,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 				List<OrderFees> feeList = orderFeesService.list(new LambdaQueryWrapper<OrderFees>().eq(OrderFees::getPid, order.getId()).ne(OrderFees::getItemId, feeId).eq(OrderFees::getIsDeleted, 0));
 				BigDecimal totalFee = feeList.stream().map(OrderFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				if ("681169".equals(AuthUtil.getTenantId())){
+				if ("681169".equals(AuthUtil.getTenantId()) || "941197".equals(AuthUtil.getTenantId())){
 					grossProfit = grossProfit.add(totalFee);
 				}else{
 					grossProfit = grossProfit.subtract(totalFee);

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -1060,6 +1060,10 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			order1.setId(acc.getSrcId());
 			order1.setSettlmentAmount(receivedAmount);
 			order1.setBalanceAmount(amount);
+			if("YPJ".equals(settlementDTO.getItemType())){
+				order1.setStatus(3);
+				order1.setActualPaymentStatus(2);
+			}
 			orderDescClient.updateOrder(order1);
 			acc.setSettlementAmount(receivedAmount);
 			accMapper.updateById(acc);