Merge remote-tracking branch 'origin/dev' into dev

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

@@ -296,7 +296,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		{
 			throw new SecurityException("未查到相关数据,操作失败");
 		}
-		if(select.getDeliveryStatus()==null||!select.getDeliveryStatus().equals("已收货"))
+		if(select.getDeliveryStatus()==null||select.getDeliveryStatus().equals("已收货"))
 		{
 			throw new SecurityException("此单据已收货或者不存在,禁止重复操作");
 		}

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

@@ -42,6 +42,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.finance.vojo.Settlement;
 import org.springblade.purchase.sales.entity.*;
+import org.springblade.purchase.sales.mapper.OrderItemsMapper;
 import org.springblade.purchase.sales.vo.OrderItemBillNoVO;
 import org.springblade.purchase.sales.vo.OrderStatisticAnalysisVO;
 import org.springblade.purchase.sales.vo.OrderVO;
@@ -80,6 +81,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	private IUserClient userClient;//获取用户信息
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private OrderMapper orderMapper;
+	private OrderItemsMapper orderItemsMapper;
 	private final ICheckClient iCheckClient;
 	private ICorpsProfitChangeClient corpsProfitChangeClient;
 	@Override
@@ -603,6 +605,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@GlobalTransactional
 	public void passCheck(Long id)
 	{
+		/**===========================start 审核通过修改销售订单信息==========================*/
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper
 			.eq(Order::getId,id)
@@ -614,7 +617,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		order.setStatus(3);
 		baseMapper.updateById(order);
+		/**===========================end 审核通过修改销售订单信息==========================*/
 
+
+
+		/**===========================start 审核通过操作返利信息=============================*/
 		//不需要计算返利
 		if((order.getThisUsedProfit()==null|| order.getThisUsedProfit().compareTo(new BigDecimal("0"))==0) && (order.getCreateProfit()==null|| order.getCreateProfit().compareTo(new BigDecimal("0"))==0))
 		{
@@ -684,9 +691,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		{
 			throw new SecurityException("更新客户返利信息失败");
 		}
+		/**===========================End审核通过操作返利信息=============================*/
+
+
 
+		/**===========================Start 审核通过锁定库存=============================*/
+		 //获取此销售订单下,所有明细的库存
+		LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		orderItemsLambdaQueryWrapper
+			.eq(OrderItems::getPid,id)
+			.eq(OrderItems::getIsDeleted,0);
+		List<OrderItems> orderItems = orderItemsMapper.selectList(orderItemsLambdaQueryWrapper);
+		if(CollectionUtils.isNotEmpty(orderItems))
+		{
+			orderItems.forEach(e->{
+               //todo
+			});
+		}
 
 
+		/**===========================End 审核通过锁定库存=============================*/
 
 	}
 

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

@@ -566,9 +566,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		settlement.setSysNo(String.valueOf(System.currentTimeMillis()));
 		settlement.setCreateTime(new Date());
 		//人民币总金额
-		settlement.setAmount(total);
+		//settlement.setAmount(total);
 		//外币总金额
-		settlement.setForeignAmount(foreignTotal);
+		//settlement.setForeignAmount(foreignTotal);
 		settlement.setTenantId(AuthUtil.getTenantId());
 		settlement.setCreateUser(AuthUtil.getUserId());
 		settlement.setStatus(0);
@@ -617,21 +617,24 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Override
 	@Transactional
 	public void applyList(List<Items> itemsList, String billType, String url) {
+		Settlement settlement = new Settlement();
+		settlement.setBillType(billType);
+		settlement.setCorpId(itemsList.get(0).getCorpId());
+		settlement.setSrcOrderno(itemsList.get(0).getSrcOrderno());
+		//todo 系统编号暂时按时间戳, 后续按正式
+		settlement.setSysNo(String.valueOf(System.currentTimeMillis()));
+		settlement.setCreateTime(new Date());
+		settlement.setTenantId(AuthUtil.getTenantId());
+		settlement.setCreateUser(AuthUtil.getUserId());
+		settlement.setStatus(0);
+		settlement.setCheckStatus("未请核");
+		baseMapper.insert(settlement);
+
+
+
 		itemsList.forEach(e -> {
 
-			Settlement settlement = new Settlement();
-			settlement.setBillType(billType);
-			settlement.setCorpId(e.getCorpId());
-			settlement.setSrcOrderno(e.getSrcOrderno());
-			//todo 系统编号暂时按时间戳, 后续按正式
-			settlement.setSysNo(String.valueOf(System.currentTimeMillis()));
-			settlement.setCreateTime(new Date());
-			settlement.setAmount(e.getAmount());
-			settlement.setTenantId(AuthUtil.getTenantId());
-			settlement.setCreateUser(AuthUtil.getUserId());
-			settlement.setStatus(0);
-			settlement.setCheckStatus("未请核");
-			baseMapper.insert(settlement);
+
 
 			e.setPid(settlement.getId());
 			e.setCreateTime(new Date());