2023年7月14日18:30:16

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

@@ -1423,7 +1423,9 @@ public class ExportOrderController extends BladeController {
 		for (OrderParts orderParts : orderPartsList) {
 			OrderItems orderItems1 = new OrderItems();
 			orderItems1.setDetailType("PJ");
-			orderItems1.setId(orderParts.getPid());
+			orderItems1.setId(orderParts.getId());
+			orderItems1.setPid(orderParts.getSrcPid());
+			orderItems1.setSrcItemId(orderParts.getId());
 			if (orderItemsList1.size() > 0) {
 				orderItems1.setBillNo(orderItemsList1.get(0).getBillNo());
 				orderItems1.setBusinesDate(orderItemsList1.get(0).getBusinesDate());

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

@@ -5472,145 +5472,195 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<Order> orderListAll = new ArrayList<>();
 		Order order = null;
 		for (OrderItems items : itemsList) {
-			OrderItems orderItems = orderItemsMapper.selectById(items.getId());
-			if (ObjectUtils.isNotNull(orderItems)) {
-				order = baseMapper.selectById(orderItems.getPid());
-				if (ObjectUtils.isNotNull(order)) {
-					OrderItems orderItems_ = new OrderItems();
-					BeanUtil.copyProperties(orderItems, orderItems_);
-					orderItems_.setSrcOrderNo(order.getOrderNo());
-					orderItems_.setSrcId(order.getId());
-					orderItems_.setOrgOrderNo(order.getSysNo());
-					orderItems_.setSrcItemId(orderItems_.getId());
-					orderItems_.setPid(null);
-					orderItems_.setId(null);
-					orderItems_.setBillType("CG");
-					orderItems_.setOrderQuantity(items.getOrderQuantity());
-					orderItems_.setDetailType(OrderTypeEnum.ITEMTYPE.getType());//明细
-
-					if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
-						CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
-						if (ObjectUtils.isNotNull(corpsDesc)) {
-							orderItems_.setCorpName(corpsDesc.getCname());
+			if("MX".equals(items.getDetailType())){
+				OrderItems orderItems = orderItemsMapper.selectById(items.getId());
+				if (ObjectUtils.isNotNull(orderItems)) {
+					order = baseMapper.selectById(orderItems.getPid());
+					if (ObjectUtils.isNotNull(order)) {
+						OrderItems orderItems_ = new OrderItems();
+						BeanUtil.copyProperties(orderItems, orderItems_);
+						orderItems_.setSrcOrderNo(order.getOrderNo());
+						orderItems_.setSrcId(order.getId());
+						orderItems_.setOrgOrderNo(order.getSysNo());
+						orderItems_.setSrcItemId(orderItems_.getId());
+						orderItems_.setPid(null);
+						orderItems_.setId(null);
+						orderItems_.setBillType("CG");
+						orderItems_.setOrderQuantity(items.getOrderQuantity());
+						orderItems_.setDetailType(OrderTypeEnum.ITEMTYPE.getType());//明细
+
+						if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
+							CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
+							if (ObjectUtils.isNotNull(corpsDesc)) {
+								orderItems_.setCorpName(corpsDesc.getCname());
+							}
 						}
-					}
-					if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
-						GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
-						if (ObjectUtils.isNotNull(goodsDesc)) {
-							orderItems_.setCname(goodsDesc.getCname());
-							orderItems_.setCode(goodsDesc.getCode());
+						if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
+							GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
+							if (ObjectUtils.isNotNull(goodsDesc)) {
+								orderItems_.setCname(goodsDesc.getCname());
+								orderItems_.setCode(goodsDesc.getCode());
+							}
 						}
-					}
 
-					if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
-						orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
-					} else {
-						orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
-					}
-					if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
-						orderItems_.setPrice(orderItems_.getPurchasePrice());
-						orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
-					} else {
-						orderItems_.setPrice(orderItems_.getPrice());
-						orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
-					}
-					orderItemsListAll.add(orderItems_);
-
-					/*LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-					orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
-						.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
-						.eq(OrderParts::getPid, orderItems.getId());
-					List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
-					for (OrderParts orderParts : orderPartsList) {
-						OrderItems orderItems1 = new OrderItems();
-						orderItems1.setSrcOrderNo(order.getOrderNo());
-						orderItems1.setSrcId(order.getId());
-						orderItems1.setOrgOrderNo(order.getSysNo());
-						orderItems1.setSrcItemId(orderParts.getId());
-						orderItems1.setBillType("CG");
-						orderItems1.setOrderQuantity(orderParts.getGoodNumber());
-						orderItems1.setActualQuantity(orderParts.getGoodNumber());
-						orderItems1.setBillNo(orderItems_.getBillNo());
-						orderItems1.setBusinesDate(orderItems_.getBusinesDate());
-						orderItems1.setPlannedDeliveryDate(orderItems_.getPlannedDeliveryDate());
-						orderItems1.setCarry(orderItems_.getCarry());
-						orderItems1.setItemId(orderParts.getGoodId());
-						orderItems1.setCname(orderParts.getGoodName());
-						orderItems1.setPrice(orderParts.getPrice());
-						orderItems1.setAmount(orderParts.getAmout());
-						orderItems1.setPriceCategory(orderParts.getGoodTypeName());
-						orderItems1.setEname(orderParts.getEname());
-						orderItems1.setPartsCost(orderParts.getPartsCost());
-						orderItemsListAll.add(orderItems1);
-					}*/
-
-					orderListAll.add(order);
-				}
-			} else {
-				order = baseMapper.selectById(orderItems.getPid());
-				if (ObjectUtils.isNotNull(order)) {
-					OrderItems orderItems_ = new OrderItems();
-					BeanUtil.copyProperties(items, orderItems_);
-					orderItems_.setSrcOrderNo(order.getOrderNo());
-					orderItems_.setSrcId(order.getId());
-					orderItems_.setOrgOrderNo(order.getSysNo());
-					orderItems_.setSrcItemId(orderItems_.getId());
-					orderItems_.setPid(null);
-					orderItems_.setId(null);
-					orderItems_.setBillType("CG");
-					orderItems_.setOrderQuantity(items.getOrderQuantity());
-					orderItems_.setDetailType(OrderTypeEnum.PARTSTYPE.getType());//配件
-
-					if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
-						CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
-						if (ObjectUtils.isNotNull(corpsDesc)) {
-							orderItems_.setCorpName(corpsDesc.getCname());
+						if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
+						} else {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
 						}
-					}
-					if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
-						GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
-						if (ObjectUtils.isNotNull(goodsDesc)) {
-							orderItems_.setCname(goodsDesc.getCname());
-							orderItems_.setCode(goodsDesc.getCode());
+						if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
+							orderItems_.setPrice(orderItems_.getPurchasePrice());
+							orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+						} else {
+							orderItems_.setPrice(orderItems_.getPrice());
+							orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
 						}
+						orderItemsListAll.add(orderItems_);
+						orderListAll.add(order);
 					}
+				} else {
+					order = baseMapper.selectById(orderItems.getPid());
+					if (ObjectUtils.isNotNull(order)) {
+						OrderItems orderItems_ = new OrderItems();
+						BeanUtil.copyProperties(items, orderItems_);
+						orderItems_.setSrcOrderNo(order.getOrderNo());
+						orderItems_.setSrcId(order.getId());
+						orderItems_.setOrgOrderNo(order.getSysNo());
+						orderItems_.setSrcItemId(orderItems_.getId());
+						orderItems_.setPid(null);
+						orderItems_.setId(null);
+						orderItems_.setBillType("CG");
+						orderItems_.setOrderQuantity(items.getOrderQuantity());
+						orderItems_.setDetailType(OrderTypeEnum.PARTSTYPE.getType());//配件
+
+						if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
+							CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
+							if (ObjectUtils.isNotNull(corpsDesc)) {
+								orderItems_.setCorpName(corpsDesc.getCname());
+							}
+						}
+						if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
+							GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
+							if (ObjectUtils.isNotNull(goodsDesc)) {
+								orderItems_.setCname(goodsDesc.getCname());
+								orderItems_.setCode(goodsDesc.getCode());
+							}
+						}
 
-					if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
-						orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
-					} else {
-						orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
+						if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
+						} else {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
+						}
+						if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
+							orderItems_.setPrice(orderItems_.getPurchasePrice());
+							orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+						} else {
+							orderItems_.setPrice(orderItems_.getPrice());
+							orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
+						}
+						orderItemsListAll.add(orderItems_);
+						orderListAll.add(order);
+					}
+				}
+			}else{
+				OrderParts orderItems = orderPartsMapper.selectById(items.getId());
+				if (ObjectUtils.isNotNull(orderItems)) {
+					order = baseMapper.selectById(orderItems.getSrcPid());
+					if (ObjectUtils.isNotNull(order)) {
+						OrderItems orderItems_ = new OrderItems();
+						BeanUtil.copyProperties(orderItems, orderItems_);
+						orderItems_.setSrcOrderNo(order.getOrderNo());
+						orderItems_.setSrcId(order.getId());
+						orderItems_.setOrgOrderNo(order.getSysNo());
+						orderItems_.setSrcItemId(orderItems_.getId());
+						orderItems_.setPid(null);
+						orderItems_.setId(null);
+						orderItems_.setBillType("CG");
+						orderItems_.setOrderQuantity(items.getOrderQuantity());
+						orderItems_.setDetailType(OrderTypeEnum.ITEMTYPE.getType());//明细
+
+						if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
+							CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
+							if (ObjectUtils.isNotNull(corpsDesc)) {
+								orderItems_.setCorpName(corpsDesc.getCname());
+							}
+						}
+						if (ObjectUtils.isNotNull(orderItems.getGoodId())) {
+							GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems.getGoodId());
+							if (ObjectUtils.isNotNull(goodsDesc)) {
+								orderItems_.setCname(orderItems.getGoodName());
+								orderItems_.setEname(orderItems.getEname());
+								orderItems_.setCode(goodsDesc.getCode());
+								orderItems_.setItemDescription(goodsDesc.getCnameDescription());
+								orderItems_.setPriceCategoryNames(orderItems.getGoodTypeName());
+								orderItems_.setPriceCategory(orderItems.getGoodTypeName());
+								orderItems_.setItemId(goodsDesc.getId());
+							}
+						}
+
+						if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
+						} else {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
+						}
+						if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
+							orderItems_.setPrice(orderItems_.getPurchasePrice());
+							orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+						} else {
+							orderItems_.setPrice(orderItems_.getPrice());
+							orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
+						}
+						orderItemsListAll.add(orderItems_);
+						orderListAll.add(order);
 					}
-					if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
-						orderItems_.setPrice(orderItems_.getPurchasePrice());
-						orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
-					} else {
-						orderItems_.setPrice(orderItems_.getPrice());
-						orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
+				} else {
+					order = baseMapper.selectById(orderItems.getSrcPid());
+					if (ObjectUtils.isNotNull(order)) {
+						OrderItems orderItems_ = new OrderItems();
+						BeanUtil.copyProperties(items, orderItems_);
+						orderItems_.setSrcOrderNo(order.getOrderNo());
+						orderItems_.setSrcId(order.getId());
+						orderItems_.setOrgOrderNo(order.getSysNo());
+						orderItems_.setSrcItemId(orderItems_.getId());
+						orderItems_.setPid(null);
+						orderItems_.setId(null);
+						orderItems_.setBillType("CG");
+						orderItems_.setOrderQuantity(items.getOrderQuantity());
+						orderItems_.setDetailType(OrderTypeEnum.PARTSTYPE.getType());//配件
+
+						if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
+							CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
+							if (ObjectUtils.isNotNull(corpsDesc)) {
+								orderItems_.setCorpName(corpsDesc.getCname());
+							}
+						}
+						if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
+							GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
+							if (ObjectUtils.isNotNull(goodsDesc)) {
+								orderItems_.setCname(goodsDesc.getCname());
+								orderItems_.setCode(goodsDesc.getCode());
+							}
+						}
+
+						if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
+						} else {
+							orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
+						}
+						if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
+							orderItems_.setPrice(orderItems_.getPurchasePrice());
+							orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+						} else {
+							orderItems_.setPrice(orderItems_.getPrice());
+							orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
+						}
+						orderItemsListAll.add(orderItems_);
+						orderListAll.add(order);
 					}
-					orderItemsListAll.add(orderItems_);
-					orderListAll.add(order);
 				}
 			}
-			/*Order order = baseMapper.selectById(Long.parseLong(arr));
-			if (ObjectUtils.isNotNull(order)) {
-				srcIds.append(order.getId()).append(",");
-				srcOrderNos.append(order.getSysNo()).append(",");
-				LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-				lambdaQueryWrapper.eq(OrderItems::getIsDeleted, 0)
-					.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
-					.eq(OrderItems::getPid, order.getId());
-				List<OrderItems> orderItemsList = orderItemsMapper.selectList(lambdaQueryWrapper);
-				for (OrderItems orderItems : orderItemsList) {
-					OrderItems orderItems_ = new OrderItems();
-					BeanUtil.copyProperties(orderItems, orderItems_);
-					orderItems_.setSrcOrderNo(order.getOrderNo());
-					orderItems_.setSrcId(order.getId());
-					orderItems_.setOrgOrderNo(order.getSysNo());
-					orderItems_.setPid(null);
-					orderItems_.setId(null);
-					orderItemsListAll.add(orderItems_);
-				}
-			}*/
+
 		}
 
 		if (ObjectUtils.isNotNull(orderListAll) && orderListAll.size() > 0) {