修改提交

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

@@ -907,7 +907,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);
 		if(jdTenant==null)
 		{
-
 			return;
 		}
 		//2.收货,组装model,保存凭证
@@ -929,6 +928,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		item2.setDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
 		List<JDYentries> entriesList1 = new ArrayList<>();
 		List<JDYentries> entriesList2 = new ArrayList<>();
+		List<JDYentries> entriesList3 = new ArrayList<>();
 
 
 
@@ -1001,7 +1001,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		c.setCreditamount(deliveryAmount);
 		entriesList1.add(c);
 		item1.setEntries(entriesList1);
-		jdYitems.add(item1);
+
 
 		/**======================第一个凭证==================== */
 
@@ -1046,7 +1046,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		}
 		c2.setExplanation(purchaseOrder + "-结转成本");
 		c2.setAccount_number(cModule2.getProjectCode());
-		c2.setDebitamount(purchaseTotalAmount);
+		c2.setCreditamount(purchaseTotalAmount);
 
 		//===========辅助核算=================
 		List<JDYassist> cList2=new ArrayList<>();
@@ -1071,9 +1071,12 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		cList2.add(jdYassist2);
 		c2.setAssist(cList2);
 		entriesList2.add(c2);
-		item2.setEntries(entriesList2);
+		entriesList3.addAll(entriesList1);
+		entriesList3.addAll(entriesList2);
+		item1.setEntries(entriesList3);
 		//===========辅助核算=================
-		jdYitems.add(item2);
+		/*jdYitems.add(item2);*/
+		jdYitems.add(item1);
 		/**======================第二个凭证==================== */
 
 		//组装数据,生成凭证

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

@@ -82,9 +82,10 @@ public class OrderDescClient implements IOrderDescClient {
 	}
 
 	@Override
-	@GetMapping(GET_BY_CG_LIST)
+	@PostMapping(GET_BY_CG_LIST)
 	public R<List<Order>> getByCgList(Order order)
 	{
+		//不要修改此方法,可以复制重新写一个
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId());
 		orderLambdaQueryWrapper.eq(Order::getIsDeleted, 0);