修改自提订单扫描人

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml

@@ -186,7 +186,7 @@
         LEFT JOIN logpm_distrilbution_bill_package ldbp on ldbl.id = ldbp.bill_lading_id
         LEFT JOIN logpm_distribution_parcel_list ldpl ON ldbp.parce_list_id = ldpl.id
         LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id
-        LEFT JOIN logpm_distribution_bill_lading_scan ldbls on ldbls.packet_bar_code = lds.coding
+        LEFT JOIN logpm_distribution_bill_lading_scan ldbls on ldbls.packet_bar_code = ldpl.order_package_code
         LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id  AND lwtg.association_type = '3'
         LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id  AND lwug.association_type = '3'
         <where>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java

@@ -19,6 +19,7 @@ package com.logpm.distribution.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.DistrilbutionBillStockEntity;
@@ -26,9 +27,13 @@ import com.logpm.distribution.excel.DistrilbutionBillStockExcel;
 import com.logpm.distribution.mapper.DistrilbutionBillStockMapper;
 import com.logpm.distribution.service.IDistrilbutionBillStockService;
 import com.logpm.distribution.vo.*;
+import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
 import org.springblade.system.cache.DictBizCache;
+import org.springblade.system.entity.User;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -41,8 +46,11 @@ import java.util.Map;
  * @since 2023-07-25
  */
 @Service
+@AllArgsConstructor
 public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<DistrilbutionBillStockMapper, DistrilbutionBillStockEntity> implements IDistrilbutionBillStockService {
 
+	private final IUserClient userClient;
+
 	@Override
 	public IPage<DistrilbutionBillStockVO> selectDistrilbutionBillStockPage(IPage<DistrilbutionBillStockVO> page, DistrilbutionBillStockVO distrilbutionBillStock) {
 		return page.setRecords(baseMapper.selectDistrilbutionBillStockPage(page, distrilbutionBillStock));
@@ -80,7 +88,14 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 	@Override
 	public IPage<DistributionBillOrderPackVO> getBillOrderPack(Map<String, Object> distrilbutionBillStock, IPage<Object> page) {
 		DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class);
-		return baseMapper.getBillOrderPack(page,billStock);
+		IPage<DistributionBillOrderPackVO> billOrderPack = baseMapper.getBillOrderPack(page, billStock);
+		billOrderPack.getRecords().forEach(i -> {
+			R<User> userR = userClient.userInfoById(Long.valueOf(i.getStockupCreateUser()));
+			if(userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())){
+				i.setStockupCreateUser(userR.getData().getRealName());
+			}
+		});
+		return billOrderPack;
 	}
 
 	@Override