Merge branch 'fix-bug-20231211' into dev

# Conflicts:
#	blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataContactDTO.java

@@ -27,7 +27,7 @@ public class SignPushDataContactDTO {
 	/**
 	 * 配送id
 	 */
-	private Long distribution_id;
+	private Long distributionId;
 	/**
 	 * 计划装车数
 	 */
@@ -54,11 +54,22 @@ public class SignPushDataContactDTO {
 	/**
 	 * 创建时间
 	 */
-	private Date create_time;
+	private Date createTime;
 	/**
 	 * 更新时间
 	 */
-	private Date update_time;
+	private Date updateTime;
+
+	/**
+	 * 备注
+	 */
+	private String content;
+
+
+	/**
+	 *  签收图片集合 逗号分割
+	 */
+	private String image;
 
 
 	/**

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java

@@ -17,12 +17,12 @@ public class SignPushDataDTO {
 	/**
 	 * 仓库名称
 	 */
-	private String warehouse_name;
+	private String warehouseName;
 
 	/**
 	 * 仓库id
 	 */
-	private Integer warehouse_id;
+	private Long warehouseId;
 	/**
 	 * 出库方式：1=市配，2=商配，3=自提
 	 */
@@ -34,38 +34,38 @@ public class SignPushDataDTO {
 	/**
 	 * 车次号
 	 */
-	private String trans_no;
+	private String transNo;
 	/**
 	 * 出库人ID
 	 */
-	private Long out_to_id;
+	private Long outToId;
 
 	/**
 	 * 出库人
 	 */
-	private String out_to_name;
+	private String outToName;
 
 	/**
 	 * 出库时间
 	 */
-	private Date out_to_time;
+	private Date outToTime;
 	/**
 	 * 配送时间
 	 */
-	private Date out_time;
+	private Date outTime;
 	/**
 	 * 配送人id
 	 */
-	private long out_id;
+	private long outId;
 
 	/**
 	 * 配送人
 	 */
-	private String out_name;
+	private String outName;
 	/**
 	 * 配送人电话
 	 */
-	private String out_phone;
+	private String outPhone;
 
 	/**
 	 * 状态：0=未发车，1=已发车【无效，已取消装车概念】
@@ -80,12 +80,12 @@ public class SignPushDataDTO {
 	/**
 	 * 实际装车数
 	 */
-	private int actual_plan;
+	private int actualPlan;
 
 	/**
 	 * 备货数
 	 */
-	private int make_num;
+	private int makeNum;
 	/**
 	 * 配送数
 	 */
@@ -98,7 +98,7 @@ public class SignPushDataDTO {
 	/**
 	 * 完成状态：1=待配送；2=部分签收；3=已签收
 	 */
-	private int finish_state;
+	private int finishState;
 
 	/**
 	 * 创建时间
@@ -108,12 +108,12 @@ public class SignPushDataDTO {
 	/**
 	 * 操作人
 	 */
-	private Long administrators_id;
+	private Long administratorsId;
 
 	/**
 	 * 操作人
 	 */
-	private String administrators_name;
+	private String administratorsName;
 
 	/**
 	 * 操作人

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java

@@ -23,17 +23,17 @@ public class SignPushDataUnitDTO {
 	/**
 	 * 配送ID
 	 */
-	private long distribution_id;
+	private long distributionId;
 
 	/**
 	 * 配送车次号
 	 */
-	private String trans_no;
+	private String transNo;
 
 	/**
 	 * 运单号
 	 */
-	private String waybill_no;
+	private String waybillNo;
 
 	/**
 	 * 订单自编号
@@ -54,16 +54,16 @@ public class SignPushDataUnitDTO {
 	/**
 	 * 是否装车:0=未装车,1=已装车
 	 */
-	private int is_loading;
+	private int isLoading;
 
 	/**
 	 * 装车时间
 	 */
-	private Date loading_time;
+	private Date loadingTime;
 	/**
 	 * 签收时间
 	 */
-	private Date sign_time;
+	private Date signTime;
 
 	/**
 	 * 0未下架;1已下架
@@ -96,7 +96,7 @@ public class SignPushDataUnitDTO {
 	/**
 	 * 签收数量
 	 */
-	private int sign_num;
+	private int signNum;
 
 	/**
 	 * 创建人

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

@@ -1748,20 +1748,20 @@
         SELECT
         lddl.id AS id,
         lddl.kind AS kind,
-        lddl.warehouse_id AS warehouse_id,
-        lddl.warehouse_name AS warehouse_name,
+        lddl.warehouse_id AS warehouseId,
+        lddl.warehouse_name AS warehouseName,
         CASE lddl.type
         WHEN 1 THEN 2
         WHEN 2 THEN 1
         END type,
         lddl.vehicle_name   AS car,
-        lddl.task_time   AS out_time,
-        lddl.train_number  AS trans_no,
+        lddl.task_time   AS outTime,
+        lddl.train_number  AS transNo,
         lddl.create_time  AS createTime,
         1 AS status ,
         lddl.delivery_number AS plan,
         lddl.delivery_number AS delivery,
-        lddl.create_user AS administrators_id,
+        lddl.create_user AS administratorsId,
         (lds.loaded_number + lds.loadedin_number) AS plan,
         (lds.received_quantity + lds.receivedin_quantity) AS sign
         FROM

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

@@ -271,8 +271,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	/**
 	 * 查询推送老系统客户
 	 * @param reservationId
-	 * @param deliveryId
-	 * @return
+	reservationId	 * @return
 	 */
 	List<SignPushDataContactDTO>  selectPushOldCustomer(@Param("reservationId") Long reservationId);
 

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

@@ -1222,12 +1222,12 @@
         ldr.delivery_address AS address,
         ldr.delivery_phone AS  phone,
         (ldr.reservation_num + ldr.reservation_stock_list_num) AS plan,
-        (lds.loaded_number + lds.loadedin_number) AS actual_plan,
+        (lds.loaded_number + lds.loadedin_number) AS actualPlan,
         lddl.delivery_number AS delivery,
         (lds.received_quantity + lds.receivedin_quantity) AS sign,
         lds.signing_status AS state,
-        lds.create_time AS create_time,
-        lds.update_time AS update_time
+        lds.create_time AS createTime,
+        lds.update_time AS updateTime
         FROM
         logpm_distribution_signfor AS lds
         LEFT JOIN	logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id AND ldr.is_deleted = 0

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

@@ -1159,20 +1159,20 @@
         SELECT
         ldpl.id AS id,
         ldpl.warehouse_id AS warehouse_id,
-        lddl.id AS distribution_id,
-        lddl.train_number AS trans_no,
-        ldpl.waybill_number AS waybill_no,
+        lddl.id AS distributionId,
+        lddl.train_number AS transNo,
+        ldpl.waybill_number AS waybillNo,
         ldpl.order_code AS orderSelfNum,
         ldpl.order_package_code AS unitNo,
         ldpl.quantity AS num,
         ldl.signfor_state AS type,
-        ldl.scan_time AS loading_time,
-        ldl.signing_time AS sign_time,
+        ldl.scan_time AS loadingTime,
+        ldl.signing_time AS signTime,
         IF
         ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
         1 is_out,
         ldpl.conditions AS goods_type,
-        ldl.received_quantity AS sign_num,
+        ldl.received_quantity AS signNum,
         5 AS broke_state
         FROM
         logpm_distribution_loadscan AS ldl

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java

@@ -2,16 +2,22 @@ package com.logpm.distribution.receiver;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basicdata.entity.BasicdataTripartiteWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataTripartiteWarehouseClient;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.mapper.*;
 import com.logpm.distribution.service.IDistributionStockService;
+import com.logpm.distribution.vo.DistributionSignPrintVO;
 import com.logpm.distribution.vo.DistributionStockupStockListVO;
 import com.logpm.oldproject.dto.SignPushDataContactDTO;
 import com.logpm.oldproject.dto.SignPushDataDTO;
 import com.logpm.oldproject.dto.SignPushDataUnitDTO;
+import com.logpm.oldproject.entity.WarehouseEntity;
 import com.logpm.oldproject.feign.IOldSystemDataPushClient;
+import com.logpm.oldproject.feign.IWarehouseClient;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
@@ -33,6 +39,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -41,7 +48,7 @@ import java.util.Map;
  * @author zhy
  */
 @Slf4j
-@RabbitListener(queues = RabbitConstant.TEST_RECEIVE_INFO_QUEUE)
+@RabbitListener(queues = RabbitConstant.CLERK_CHECK_PUSH_DATA_QUEUE)
 @Component
 public class ClerkCheckPushDataQueueHandler {
 
@@ -64,11 +71,17 @@ public class ClerkCheckPushDataQueueHandler {
 	@Autowired
 	private IUserClient userClient;
 
+	@Autowired
+	private IBasicdataTripartiteWarehouseClient basicdataTripartiteWarehouseClient;
+
+	@Autowired
+	private IWarehouseClient warehouseClient;
+
 
 	@RabbitHandler
 	public void clerkCheckPushDataHandler(Map map, Message message, Channel channel) {
 
-		try{
+		try {
 			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列");
 			//得到审核的任务ＩＤ
 			DistributionSignforDTO distributionStockEntity = (DistributionSignforDTO) map.get("messageData");
@@ -102,67 +115,86 @@ public class ClerkCheckPushDataQueueHandler {
 			}
 
 
-
 			//组合配送信息
-			SignPushDataDTO delivery =	distributionDeliveryListMapper.selectPushOldDelivery(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
+			SignPushDataDTO delivery = distributionDeliveryListMapper.selectPushOldDelivery(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
+
+			WarehouseEntity warehouseEntity = warehouseClient.findByName(distributionReservationEntity.getWarehouseName());
+			if (ObjectUtils.isNotNull(warehouseEntity)) {
+				// 需要增加老系统的仓库ID
+				delivery.setWarehouseId(Long.parseLong(warehouseEntity.getId()+""));
+				delivery.setWarehouseName(warehouseEntity.getTitle());
+			}
+
+
 			//还需要配送的出库人、配送人、操作人信息
-			if (Func.isNotEmpty(delivery)){
-				if (delivery.getKind().equals("1")){
+			if (Func.isNotEmpty(delivery)) {
+				if (delivery.getKind().equals("1")) {
 					//自主配送
 					DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(Wrappers.<DistributionDeliverySelfEntity>query().lambda()
 						.eq(DistributionDeliverySelfEntity::getDeliveryId, delivery.getId())
 						.eq(DistributionDeliverySelfEntity::getIsMaster, delivery.getId())
 					);
-					if (Func.isNotEmpty(distributionDeliverySelfEntity)){
-						delivery.setOut_id(Long.parseLong(distributionDeliverySelfEntity.getDriverId()));
-						delivery.setOut_name(distributionDeliverySelfEntity.getDriverName());
-						delivery.setOut_phone(distributionDeliverySelfEntity.getDriverPhone());
+					if (Func.isNotEmpty(distributionDeliverySelfEntity)) {
+						delivery.setOutId(Long.parseLong(distributionDeliverySelfEntity.getDriverId()));
+						delivery.setOutName(distributionDeliverySelfEntity.getDriverName());
+						delivery.setOutPhone(distributionDeliverySelfEntity.getDriverPhone());
 					}
-				}else {
+				} else {
 					//外协
 					DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, delivery.getId()));
-					if (Func.isNotEmpty(distributionDeliveryTripartiteEntity)){
-						delivery.setOut_name(distributionDeliveryTripartiteEntity.getDriverName());
-						delivery.setOut_phone(distributionDeliveryTripartiteEntity.getDriverPhone());
+					if (Func.isNotEmpty(distributionDeliveryTripartiteEntity)) {
+						delivery.setOutName(distributionDeliveryTripartiteEntity.getDriverName());
+						delivery.setOutPhone(distributionDeliveryTripartiteEntity.getDriverPhone());
 					}
 				}
-				R<User> userR = userClient.userInfoById(delivery.getAdministrators_id());
-				if (Func.isNotEmpty(userR)){
+				R<User> userR = userClient.userInfoById(delivery.getAdministratorsId());
+				if (Func.isNotEmpty(userR)) {
 					User user = userR.getData();
-//					delivery.setAdministrators_name(user.getName());
+					delivery.setAdministratorsName(user.getName());
 				}
 				DistributionStockupEntity distributionStockupEntity = distributionReservationMapper.selectStockup(distributionSignforEntity.getReservationId());
-				if (Func.isNotEmpty(distributionStockupEntity)){
-					if (distributionStockupEntity.getAssignStatus().equals(StockAssignStatusConstant.yizhipai.getValue())){
-						delivery.setOut_to_id(distributionStockupEntity.getStockupUserId());
-						delivery.setOut_to_name(distributionStockupEntity.getStockupUser());
+				if (Func.isNotEmpty(distributionStockupEntity)) {
+					if (distributionStockupEntity.getAssignStatus().equals(StockAssignStatusConstant.yizhipai.getValue())) {
+						delivery.setOutToId(distributionStockupEntity.getStockupUserId());
+						delivery.setOutToName(distributionStockupEntity.getStockupUser());
 					}
 
 				}
 
 				//查询客户信息
 				List<SignPushDataContactDTO> customer = distributionReservationMapper.selectPushOldCustomer(distributionSignforEntity.getReservationId());
-				if (Func.isNotEmpty(customer)){
+				if (Func.isNotEmpty(customer)) {
 					//查询客户订单
 					List<SignPushDataUnitDTO> signPushDataUnitDTOS = new ArrayList<>();
-					if(distributionReservationEntity.getReservationNum()>0){
+					if (distributionReservationEntity.getReservationNum() > 0) {
 						//查询包件扫描签收
-						List<SignPushDataUnitDTO> pushOldPackage =  distributionSignforMapper.selectPushOldPackage(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
-						if (Func.isNotEmpty(pushOldPackage)){
+						List<SignPushDataUnitDTO> pushOldPackage = distributionSignforMapper.selectPushOldPackage(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
+						if (Func.isNotEmpty(pushOldPackage)) {
 							signPushDataUnitDTOS.addAll(pushOldPackage);
 						}
 					}
 
-					if (distributionReservationEntity.getReservationStockListNum() > 0){
+					if (distributionReservationEntity.getReservationStockListNum() > 0) {
 						//查询库存品扫描签收
-						List<SignPushDataUnitDTO> pushOldInventory =	distributionSignforMapper.selectPushOldInventory(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
-						if (Func.isNotEmpty(pushOldInventory)){
+						List<SignPushDataUnitDTO> pushOldInventory = distributionSignforMapper.selectPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
+						if (Func.isNotEmpty(pushOldInventory)) {
 							signPushDataUnitDTOS.addAll(pushOldInventory);
 						}
 					}
-					if (Func.isNotEmpty(signPushDataUnitDTOS)){
+					//查询签收图片
+					List<DistributionSignPrintVO> distributionSignPrintVOS = distributionSignforMapper.selectSignImgsUrl(distributionReservationEntity.getId());
+
+
+					if (Func.isNotEmpty(signPushDataUnitDTOS)) {
 						SignPushDataContactDTO signPushDataContactDTO = customer.get(0);
 						signPushDataContactDTO.setSignPushDataUnitDTOs(signPushDataUnitDTOS);
+						if (Func.isNotEmpty(distributionSignPrintVOS)){
+							String urls = distributionSignPrintVOS.stream().map(DistributionSignPrintVO::getUrlRoute).collect(Collectors.joining(","));
+							signPushDataContactDTO.setImage(urls);
+						}
+						if (Func.isNotEmpty(distributionSignforEntity.getClerkSignRemarks())){
+							signPushDataContactDTO.setContact(distributionSignforEntity.getClerkSignRemarks());
+						}
 					}
 
 					//完成客户信息添加
@@ -172,12 +204,11 @@ public class ClerkCheckPushDataQueueHandler {
 
 
 			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
-		}catch (Exception e){
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 
 
-
 	}
 
 }

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

@@ -1274,8 +1274,26 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		String roleId = user.getRoleId();
 		//判断当前登录人是否为司机
 		List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = new ArrayList<>();
-		R<String> value = dictBizClient.getValue("role_class", roleId);
-		if (value.getData().equals("delivery_driver")) {
+		R<String> value = dictBizClient.getValue("role_class", "delivery_driver_new");
+
+		log.info(">>>>>> 获取配置的司机角色 {}",value.getData());
+
+		// 得到配置的多个配送角色
+		String[] split = value.getData().split(",");
+
+		boolean isDriver = false;
+		for (String s : split) {
+			String[] roleIds = roleId.split(",");
+			for (String id : roleIds) {
+				if(id.equals(s)){
+					log.info(">>>>> 匹配司机 角色 用户 :{}",user.getUserName());
+					isDriver = true;
+					break;
+				}
+			}
+		}
+
+		if (isDriver) {
 			//查询当前登录人的配送任务
 			BasicdataDriverArteryEntity driverArtery = iBasicdataDriverArteryClient.getDriverArtery(user.getUserId());
 			if (null == driverArtery) {
@@ -1283,7 +1301,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				return page.setRecords(distributionAppDeliveryListVOS);
 			}
 			List<Long> deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId());
-			if (deliveryIds.size() > 0) {
+			if (!deliveryIds.isEmpty()) {
 				distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds);
 			} else {
 				return page.setRecords(distributionAppDeliveryListVOS);
@@ -3015,7 +3033,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 		try{
 			log.info(">>>>>>>>>>>>>>>>>>> 推送老系统 的签收数据  {} ",mapState);
-			rabbitTemplate.convertAndSend(RabbitConstant.TEST_RECEIVE_INFO_EXCHANGE, RabbitConstant.TEST_RECEIVE_INFO_ROUTING, mapState);
+			rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, mapState);
 
 		}catch (Exception customerException){
 			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ {}",customerException.getMessage());

blade-service/logpm-distribution/src/test/java/com/logpm/distribution/TestService.java

@@ -61,7 +61,7 @@ public class TestService {
 	@Test
 	public void test5(){
 		DistributionSignforDTO dto = new DistributionSignforDTO();
-		dto.setId(1724584676191997953L);
+		dto.setId(1728618333252620289L);
 		iDistributionSignforService.buildArgsToPushMq(dto);
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -953,8 +953,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 							}
 						}
 					} else {
-						log.info("############handleData: 包件码已存在 packageCode={}", packageCode);
-						throw new CustomerException(403, "包件码已存在");
+
+						log.error("############handleData: 包件码已存在 packageCode={} 收货单号 {}", packageCode,code);
+
+						//throw new CustomerException(403, "包件码已存在");
 					}
 				}
 			} else {

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java

@@ -30,7 +30,7 @@ public class SignPushClient implements IOldSystemDataPushClient {
 
 		//todo  这里存在调用老系统的接口 将数据会写给老系统
 
-		String authCode = oldLogin(signPushDataDTO.getWarehouse_id());
+		String authCode = oldLogin(signPushDataDTO.getWarehouseId()+"");
 
 		log.info("##################pushOldSystemSignInfo: 请求老系统接口 start  map {}", signPushDataDTO);
 
@@ -57,7 +57,7 @@ public class SignPushClient implements IOldSystemDataPushClient {
 		// 构建请求头
 		Object o = dataMap.get("warehouse_id");
 		Integer warehouse_id = (Integer) o;
-		String authCode = oldLogin(warehouse_id);
+		String authCode = oldLogin(warehouse_id+"");
 
 		log.info("##################sendPackageData: 请求老系统接口 start  map {}", dataMap);
 
@@ -82,7 +82,7 @@ public class SignPushClient implements IOldSystemDataPushClient {
 	 * @param warhouseId 仓库ID
 	 * @return 成功token
 	 */
-	private String oldLogin(Integer warhouseId) {
+	private String oldLogin(String warhouseId) {
 		String o = bladeRedis.get(oldSystemProperties.getUserId() + "_" + warhouseId);
 		if (StringUtil.isBlank(o)) {
 			String url = oldSystemProperties.getUrl() + "api/fakeLogin";

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WarehouseServiceImpl.java

@@ -60,7 +60,7 @@ public class WarehouseServiceImpl implements IWarehouseService {
 	@Override
 	public WarehouseEntity findByName(String destinationWarehouse) {
 		QueryWrapper<WarehouseEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("name",destinationWarehouse);
+		queryWrapper.eq("title",destinationWarehouse);
 
 		return warehouseMapper.selectOne(queryWrapper);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

@@ -192,7 +192,7 @@ public class WarehouseWarehousingEntryController extends BladeController {
 	 */
 	@GetMapping("/export-warehouseWarehousingTemplate")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据模版", notes = "传入warehouseWarehousingEntry")
+	@ApiOperation(value = "导出数据", notes = "传入warehouseWarehousingEntry")
 	public void exportWarehouseWarehousingEntry(@ApiIgnore @RequestParam Map<String, Object> warehouseWarehousingEntry, BladeUser bladeUser, HttpServletResponse response) {
 
 		List<WarehousingEntryDetailExcel> list = new ArrayList<>();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -447,6 +447,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				entryEntity.setTrainNumber(Optional.ofNullable(o.getTrainNumber()).orElse(null)); //仓库名称
 				entryEntity.setLicensePlate(Optional.ofNullable(o.getLicensePlate()).orElse(null)); //仓库名称
 				entryEntity.setOrderNumber(Optional.ofNullable(o.getOrderNumber()).orElse(null)); //仓库名称
+				entryEntity.setRemark(Optional.ofNullable(o.getRemark()).orElse(null)); //备注
 				entryEntity.setSource("导入");
 				R<List<DictBiz>> distriType = dictBizClient.getList("distribution_type");
 				if(ObjectUtils.isNotNull(distriType)){