2023年7月18日14:31:11

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

@@ -1366,12 +1366,12 @@ public class ExportOrderController extends BladeController {
 		//0代表不显示全部
 		if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
 			//采购状态
-			lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");
+//			lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");
 			//销售数量大于采购数量
 			lambdaQueryWrapper.apply("order_quantity > purchase_quantity");
 		} else {
 			//采购状态
-			lambdaQueryWrapper.ne(OrderItems::getFudaPurchaseStatus, "待采购");
+//			lambdaQueryWrapper.ne(OrderItems::getFudaPurchaseStatus, "待采购");
 			//销售数量大于采购数量
 			lambdaQueryWrapper.ne(OrderItems::getPurchaseQuantity, new BigDecimal("0.00"));
 		}

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

@@ -596,14 +596,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					parts.setTenantId(SecureUtil.getTenantId());
 					parts.setCreateTime(new Date());
 					parts.setCreateUser(SecureUtil.getUserId());
-					parts.setPid(orderId);
-					parts.setSrcPid(itemId);
+					parts.setPid(itemId);
+					parts.setSrcPid(orderId);
 					orderPartsMapper.insert(parts);
 				} else {
 					parts.setUpdateTime(new Date());
 					parts.setUpdateUser(SecureUtil.getUserId());
-					parts.setPid(orderId);
-					parts.setSrcPid(itemId);
+					parts.setPid(itemId);
+					parts.setSrcPid(orderId);
 					orderPartsMapper.updateById(parts);
 				}
 			});
@@ -5531,7 +5531,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size()>0){
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))){
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
-								orderItems_.setAmount(orderItems_.getPurchaseQuantity().multiply(priceBankList.get(0).getPrice()));
+								orderItems_.setAmount(orderItems_.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
 							}else{
 								orderItems_.setPrice(new BigDecimal("0.00"));
 								orderItems_.setAmount(new BigDecimal("0.00"));
@@ -5580,7 +5580,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size()>0){
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))){
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
-								orderItems_.setAmount(orderItems_.getPurchaseQuantity().multiply(priceBankList.get(0).getPrice()));
+								orderItems_.setAmount(orderItems_.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
 							}else{
 								orderItems_.setPrice(new BigDecimal("0.00"));
 								orderItems_.setAmount(new BigDecimal("0.00"));
@@ -5622,7 +5622,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (ObjectUtils.isNotNull(orderItems.getGoodId())) {
 							GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems.getGoodId());
 							if (ObjectUtils.isNotNull(goodsDesc)) {
-								orderItems_.setCname(orderItems.getGoodName());
+								orderItems_.setCname(goodsDesc.getCname());
 								orderItems_.setEname(orderItems.getEname());
 								orderItems_.setCode(goodsDesc.getCode());
 								orderItems_.setItemDescription(goodsDesc.getCnameDescription());
@@ -5641,7 +5641,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size()>0){
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))){
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
-								orderItems_.setAmount(orderItems_.getPurchaseQuantity().multiply(priceBankList.get(0).getPrice()));
+								orderItems_.setAmount(orderItems_.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
 							}else{
 								orderItems_.setPrice(new BigDecimal("0.00"));
 								orderItems_.setAmount(new BigDecimal("0.00"));
@@ -5694,7 +5694,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size()>0){
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))){
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
-								orderItems_.setAmount(orderItems_.getPurchaseQuantity().multiply(priceBankList.get(0).getPrice()));
+								orderItems_.setAmount(orderItems_.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
 							}else{
 								orderItems_.setPrice(new BigDecimal("0.00"));
 								orderItems_.setAmount(new BigDecimal("0.00"));