|
|
|
|
@ -947,7 +947,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
} |
|
|
|
|
String planContent = user.getNickName() + "在" + warehouse.getName() |
|
|
|
|
+ "修改自提计划;自提计划编号:" + oldEntity.getPickupBatch() |
|
|
|
|
+ ";收货单位:" + (oldEntity.getConsigneeUnit().equals(newEntity.getConsigneeUnit()) ? oldEntity.getConsigneeUnit() : "由" + oldEntity.getConsigneeUnit() + "变更为-->" + newEntity.getConsigneeUnit()) |
|
|
|
|
+ ";收货单位:" + ((Objects.isNull(oldEntity.getConsigneeUnit())?"未填写":oldEntity.getConsigneeUnit()).equals((Objects.isNull(newEntity.getConsigneeUnit())?"未填写":newEntity.getConsigneeUnit())) ? oldEntity.getConsigneeUnit() : "由" + oldEntity.getConsigneeUnit() + "变更为-->" + newEntity.getConsigneeUnit()) |
|
|
|
|
+ ",提货人:" + (oldEntity.getConsignee().equals(newEntity.getConsignee()) ? oldEntity.getConsignee() : "由" + oldEntity.getConsignee() + "变更为-->" + newEntity.getConsignee()) |
|
|
|
|
+ ",提货车牌:" + (oldEntity.getPickUpPlate().equals(newEntity.getPickUpPlate()) ? oldEntity.getPickUpPlate() : "由" + oldEntity.getPickUpPlate() + "变更为-->" + newEntity.getPickUpPlate()) |
|
|
|
|
+ ",提货证件:" + (oldEntity.getDeliveryDocument().equals(newEntity.getDeliveryDocument()) ? oldEntity.getDeliveryDocument() : "由" + oldEntity.getDeliveryDocument() + "变更为-->" + newEntity.getDeliveryDocument()) |
|
|
|
|
|
