1.bug修复

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/DistributionReservationEntity.java

@@ -1,231 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.logpm.warehouse.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 预约列表 实体类
- *
- * @author TJJ
- * @since 2023-06-12
- */
-@Data
-@TableName("logpm_distribution_reservation")
-@ApiModel(value = "reservation对象", description = "预约列表")
-@EqualsAndHashCode(callSuper = true)
-public class DistributionReservationEntity extends TenantEntity {
-
-	/**
-	 * 订单自编号;展示使用
-	 */
-	@ApiModelProperty(value = "订单自编号;订单自编号，关联订单表")
-	private String stockArticleId;
-	/**
-	 * 收货人
-	 */
-	@ApiModelProperty(value = "收货人")
-	private String consignee;
-	/**
-	 * 收件地址
-	 */
-	@ApiModelProperty(value = "收件地址")
-	private String deliveryAddress;
-	/**
-	 * 预约时间
-	 */
-	@ApiModelProperty(value = "预约时间")
-	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
-	private Date reservationDate;
-	/**
-	 * 服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；
-	 */
-	@ApiModelProperty(value = "服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；")
-	private String serveType;
-	/**
-	 * 配送类型;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装
-	 */
-	@ApiModelProperty(value = "配送类型;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装")
-	private String deliveryWay;
-	/**
-	 * 配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装
-	 */
-	@ApiModelProperty(value = "配送类型;1-商配、2-市配")
-	private String deliveryType;
-	/**
-	 * 到付运费
-	 */
-	@ApiModelProperty(value = "到付运费")
-	private BigDecimal collectFee;
-	/**
-	 * 其他费用
-	 */
-	@ApiModelProperty(value = "其他费用")
-	private BigDecimal otherFee;
-	/**
-	 * 代付运费
-	 */
-	@ApiModelProperty(value = "代付运费")
-	private BigDecimal replaceFee;
-	/**
-	 * 收件人电话
-	 */
-	@ApiModelProperty(value = "收件人电话")
-	private String deliveryPhone;
-	/**
-	 * 预约信息状态;预约列表信息状态；1-待确认、2-已确认
-	 */
-	@ApiModelProperty(value = "预约信息状态;预约列表信息状态；1-待确认、2-已确认")
-	private String reservationStatus;
-	/**
-	 * 订单来源
-	 */
-	@ApiModelProperty(value = "订单来源")
-	private String orderSource;
-	/**
-	 * 备货状态;备货状态；1-未备货、2-待备货、3-已备货
-	 */
-	@ApiModelProperty(value = "备货状态;备货状态；1-未备货、2-待备货、3-已备货")
-	private String stockupStatus;
-	/**
-	 * 备货区编号
-	 */
-	@ApiModelProperty(value = "备货区编号")
-	private Long goodsAreaId;
-	/**
-	 * 备货区名称
-	 */
-	@ApiModelProperty(value = "备货区名称")
-	private String goodsAreaName;
-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remarks;
-	/**
-	 * 预约单编号，系统构建生成
-	 */
-	@ApiModelProperty(value = "预约单编号")
-	private String reservationCode;
-	/**
-	 * 时段
-	 */
-	@ApiModelProperty(value = "时段;1-上午、2-下午、3-全天")
-	private String periodOfTime;
-
-	/**
-	 * 预约数量
-	 */
-	@ApiModelProperty(value = "预约数量")
-	private Integer reservationNum;
-
-	/**
-	 * 预约数量
-	 */
-	@ApiModelProperty(value = "预约数量")
-	private Integer reservationStockListNum;
-	/**
-	 * 商场编号
-	 */
-	@ApiModelProperty(value = "商场编号")
-	private Long mallId;
-	/**
-	 * 门店编号
-	 */
-	@ApiModelProperty(value = "门店编号")
-	private Long storeId;
-
-	/**
-	 * 商场名称
-	 */
-	@ApiModelProperty(value = "商场名称")
-	private String mallName;
-
-	/**
-	 * 门店名称
-	 */
-	@ApiModelProperty(value = "门店名称")
-	private String storeName;
-
-	/**
-	 * 费用汇总
-	 */
-	@ApiModelProperty(value = "费用汇总")
-	private BigDecimal fee;
-	/**
-	 * 服务类型
-	 */
-	@TableField(exist = false)
-	@ApiModelProperty(value = "服务类型")
-	private Integer typeService;
-
-	/**
-	 * 服务号
-	 */
-	@TableField(exist = false)
-	@ApiModelProperty(value = "服务号")
-	private String serviceNumber;
-
-	/**
-	 * 预约取消原因
-	 */
-	@ApiModelProperty(value = "预约取消原因")
-	private String cancelReason;
-
-	/**
-	 * 是否加急
-	 */
-	@ApiModelProperty(value = "是否加急")
-	private Integer isUrgent;
-	/**
-	/**
-	 * 预留1
-	 */
-	@ApiModelProperty(value = "预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ApiModelProperty(value = "预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ApiModelProperty(value = "预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ApiModelProperty(value = "预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ApiModelProperty(value = "预留5")
-	private String reserve5;
-
-}

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

@@ -277,7 +277,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			distributionStockArticleEntity.setBrand(warehouseWaybill.getBrand());
 			distributionStockArticleEntity.setResource("零担");
 			if (!Objects.isNull(basicdataWarehouseEntity)) {
- 				distributionStockArticleEntity.setCreateDept(StringUtil.isBlank(basicdataWarehouseEntity.getDepartment())?null:Long.parseLong(basicdataWarehouseEntity.getDepartment()));
+ 				distributionStockArticleEntity.setCreateDept(Objects.isNull(basicdataWarehouseEntity.getDepartment())?null:basicdataWarehouseEntity.getDepartment());
 			}
 
 			String customerName = warehouseWaybill.getConsignee();//客户名称