Merge branch 'dev' into pre-production

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalRecordEntity.java

@@ -42,10 +42,10 @@ public class AftersalesAbnormalRecordEntity extends TenantEntity {
 	private String carType;
 
 	@ApiModelProperty(name = "上报仓库id",notes = "")
-	private Long upWarehouseId;
+	private Long warehouseId;
 
 	@ApiModelProperty(name = "上报仓库名称",notes = "")
-	private String upWarehouseName;
+	private String warehouseName;
 
 	@ApiModelProperty(name = "车次号",notes = "")
 	private String carsNo;

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java

@@ -1,16 +1,19 @@
 package com.logpm.trunkline.dto;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Data
 public class OpenOrderDTO implements Serializable {
 
+	private Integer pageSize;
+	private Integer pageNum;
+
 	private Long waybillId;
 
 	private Long brandId;//品牌id
@@ -115,4 +118,35 @@ public class OpenOrderDTO implements Serializable {
 
 	private String pickupVehicleType;//提货车型
 
+	private Integer checkStatus;
+
+	private String agent;
+
+	private String createUserName;
+
+	private String refer;
+
+	private String openWarehouseName;
+	private String applyWarehouseName;
+
+	private String openTimeStartStr;
+	private String openTimeEndStr;
+
+	private Date openTimeStart;
+	private Date openTimeEnd;
+
+	private String applyTimeStartStr;
+	private String applyTimeEndStr;
+
+	private Date applyTimeStart;
+	private Date applyTimeEnd;
+
+	private String checkTimeStartStr;
+	private String checkTimeEndStr;
+
+	private Date checkTimeStart;
+	private Date checkTimeEnd;
+
+	private List<Long> warehouseIds;
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillJsonEntity.java

@@ -0,0 +1,38 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_waybill_json")
+@ApiModel(value = "TrunklineWaybillJson对象", description = "更新运单记录表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineWaybillJsonEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+
+	@ApiModelProperty(name = "日志id",notes = "")
+	private Long trackId;
+
+	@ApiModelProperty(name = "运单更新json",notes = "")
+	private String waybillJson;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineWaybillTrackEntity.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
+
 @Data
 @TableName("logpm_trunkline_waybill_track")
 @ApiModel(value = "TrunklineWaybillTrack对象", description = "运单跟踪记录表")
@@ -52,5 +54,11 @@ public class TrunklineWaybillTrackEntity extends TenantEntity {
 	/** 操作人名称 */
 	@ApiModelProperty(name = "操作人名称",notes = "")
 	private String createUserName ;
+	/** 审核状态 */
+	@ApiModelProperty(name = "审核状态0未审核 1已通过",notes = "")
+	private Integer checkStatus;
 
+	/** 审核时间 */
+	@ApiModelProperty(name = "审核时间",notes = "")
+	private Date checkTime;
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java

@@ -20,6 +20,7 @@ public class OrderDetailInfoVO implements Serializable {
 	private String thirdPackName;
 	private String materialCode;
 	private String materialName;
+	private String orderCode;
 	private String orderPackageCode;
 	private String brand;
 	private String serviceNumber;

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineWaybillTrackVO.java

@@ -3,7 +3,21 @@ package com.logpm.trunkline.vo;
 import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class TrunklineWaybillTrackVO extends TrunklineWaybillTrackEntity {
 
+	private String openWarehouseName;
+
+	private String waybillType;
+
+	private String agent;
+
+	private Date openTime;
+
+	private Date applyTime;
+
+	private String applyWarehouseName;
+
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AbnormalRecordDTO.java

@@ -7,7 +7,6 @@ import lombok.Data;
 public class AbnormalRecordDTO extends AftersalesAbnormalRecordEntity {
 
 	private Long abnormalRecordId;
-	private Long warehouseId;
 
 	private Integer pageNum;
 	private Integer pageSize;

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml

@@ -15,8 +15,8 @@
         <if test="param.carType !=null and param.carType != ''">
             and car_type = #{param.carType}
         </if>
-        <if test="param.upWarehouseName !=null and param.upWarehouseName != ''">
-            and Locate(#{param.upWarehouseName},up_warehouse_name) > 0
+        <if test="param.warehouseName !=null and param.warehouseName != ''">
+            and Locate(#{param.warehouseName},warehouse_name) > 0
         </if>
         <if test="param.carsNo !=null and param.carsNo != ''">
             and Locate(#{param.carsNo},cars_no) > 0
@@ -47,7 +47,7 @@
                IFNULL(sum(IF(abnormal_status = 1,1,0)),0) noDealwithNum
         from logpm_aftersales_abnormal_record
         where cars_no = #{carsNo}
-        and up_warehouse_id = #{warehouseId}
+        and warehouse_id = #{warehouseId}
     </select>
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -1589,13 +1590,20 @@ public class OpenOrderController {
 		log.info(method + "请求参数{}", openOrderDTO);
 		Long waybillId = openOrderDTO.getWaybillId();
 		try{
-
-			if(Objects.isNull(waybillId)){
-				log.warn(method+"运单id为空 waybillId={}",waybillId);
-				return R.fail(405,"运单id为空");
+			List<Long> warehouseIds = new ArrayList<>();
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+				//循环myWatchWarehouse，把id存入warehouseIds中
+				myWatchWarehouse.forEach(basicdataWarehouseEntity -> {
+					warehouseIds.add(basicdataWarehouseEntity.getId());
+				});
+			}else{
+				warehouseIds.add(myCurrentWarehouse.getId());
 			}
+			openOrderDTO.setWarehouseIds(warehouseIds);
 
-			return openOrderService.findWaybillReturnList(waybillId);
+			return openOrderService.findUpdateWaybillList(openOrderDTO);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
@@ -1605,6 +1613,4 @@ public class OpenOrderController {
 		}
 	}
 
-
-
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -227,6 +227,7 @@
             ltad.third_pack_name thirdPackName,
             ltad.material_code materialCode,
             ltad.material_name materialName,
+            ltad.order_code orderCode,
             ltad.order_package_code orderPackageCode,
             ltad.brand brand,
             lta.service_num serviceNumber,

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillJsonMapper.java

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.trunkline.entity.TrunklineWaybillJsonEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TrunklineWaybillJsonMapper extends BaseMapper<TrunklineWaybillJsonEntity> {
+
+
+
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.java

@@ -1,7 +1,10 @@
 package com.logpm.trunkline.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.trunkline.dto.OpenOrderDTO;
 import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
+import com.logpm.trunkline.vo.TrunklineWaybillTrackVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,4 +14,7 @@ import java.util.List;
 public interface TrunklineWaybillTrackMapper extends BaseMapper<TrunklineWaybillTrackEntity> {
 
     List<TrunklineWaybillTrackEntity> findWaybillLog(@Param("waybillId") Long waybillId, @Param("trackType") String trackType);
+
+    IPage<TrunklineWaybillTrackVO> findUpdateWaybillList(IPage<Object> page, @Param("param") OpenOrderDTO openOrderDTO);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml

@@ -19,5 +19,70 @@
 
     </select>
 
+    <select id="findUpdateWaybillList" resultType="com.logpm.trunkline.vo.TrunklineWaybillTrackVO">
+        select ltwt.waybill_no waybillNo,
+               lww.departure_warehouse_name openWarehouseName,
+               ltwt.check_status checkStatus,
+               lww.waybill_type waybillType,
+               lww.agent agent,
+               lww.document_making_time openTime,
+               ltwt.create_time applyTime,
+               ltwt.warehouse_name applyWarehouseName,
+               ltwt.create_user_name createUserName,
+               ltwt.refer refer,
+               ltwt.operation_remark operationRemark,
+               ltwt.check_time checkTime
+        from logpm_trunkline_waybill_track ltwt
+        left join logpm_warehouse_waybill lww on lww.id = ltwt.waybill_id
+        where 1=1
+        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.waybillNo != null and param.waybillNo != ''">
+            and Locate(#{param.waybillNo},ltwt.waybill_no) > 0
+        </if>
+        <if test="param.openWarehouseName != null and param.openWarehouseName != ''">
+            and Locate(#{param.openWarehouseName},lww.departure_warehouse_name) > 0
+        </if>
+        <if test="param.checkStatus != null ">
+            and ltwt.check_status = #{param.checkStatus}
+        </if>
+        <if test="param.waybillType != null ">
+            and lww.waybill_type = #{param.waybillType}
+        </if>
+        <if test="param.agent != null and param.agent != ''">
+            and Locate(#{param.agent},lww.agent) > 0
+        </if>
+        <if test="param.applyWarehouseName != null and param.applyWarehouseName != ''">
+            and Locate(#{param.applyWarehouseName},ltwt.warehouse_name) > 0
+        </if>
+        <if test="param.createUserName != null and param.createUserName != ''">
+            and Locate(#{param.createUserName},ltwt.create_user_name) > 0
+        </if>
+        <if test="param.refer != null and param.refer != ''">
+            and Locate(#{param.refer},ltwt.refer) > 0
+        </if>
+        <if test="param.applyTimeStart != null">
+            and ltwt.create_time &gt;= #{param.applyTimeStart}
+        </if>
+        <if test="param.applyTimeEnd != null">
+            and ltwt.create_time &lt;= #{param.applyTimeEnd}
+        </if>
+        <if test="param.openTimeStart != null">
+            and lww.document_making_time &gt;= #{param.openTimeStart}
+        </if>
+        <if test="param.openTimeEnd != null">
+            and lww.document_making_time &lt;= #{param.openTimeEnd}
+        </if>
+        <if test="param.checkTimeStart != null">
+            and ltwt.check_time &gt;= #{param.checkTimeStart}
+        </if>
+        <if test="param.checkTimeEnd != null">
+            and ltwt.check_time &lt;= #{param.checkTimeEnd}
+        </if>
+
+    </select>
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderAsyncService.java

@@ -1,6 +1,7 @@
 package com.logpm.trunkline.service;
 
 import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 
 import java.util.List;
 
@@ -18,4 +19,6 @@ public interface IOpenOrderAsyncService {
 	void saveUnloadStartCarLog(TrunklineCarsLoadLineEntity currentCarsLoadLineEntity, String nickName,Long userId);
 
 	void incomingPackageBatch(List<Long> advanceIds, Long userId, Long deptId, String tenantId, String nickName,Integer incomingType,Long warehouseId);
+
+	void saveUpdateLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java

@@ -80,6 +80,9 @@ public interface IOpenOrderService {
 
 	R findWaybillReturnList(Long waybillId);
 
+	R findUpdateWaybillList(OpenOrderDTO openOrderDTO);
+
+
 
 //	R findWaybillInfo(String waybillNo);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillJsonService.java

@@ -0,0 +1,7 @@
+package com.logpm.trunkline.service;
+
+import com.logpm.trunkline.entity.TrunklineWaybillJsonEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface ITrunklineWaybillJsonService extends BaseService<TrunklineWaybillJsonEntity> {
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillTrackService.java

@@ -1,10 +1,15 @@
 package com.logpm.trunkline.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.trunkline.dto.OpenOrderDTO;
 import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
+import com.logpm.trunkline.vo.TrunklineWaybillTrackVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
 
 public interface ITrunklineWaybillTrackService extends BaseService<TrunklineWaybillTrackEntity> {
     List<TrunklineWaybillTrackEntity> findWaybillLog(Long waybillId, String trackType);
+
+    IPage<TrunklineWaybillTrackVO> findUpdateWaybillList(IPage<Object> page, OpenOrderDTO openOrderDTO);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java

@@ -11,6 +11,8 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.TenantNum;
 import org.springblade.common.utils.CommonUtil;
+import org.springblade.system.cache.UserCache;
+import org.springblade.system.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
@@ -53,6 +55,8 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		waybillTrackEntity.setTenantId(TenantNum.HUITONGCODE);
 		waybillTrackEntity.setCreateUser(userId);
 		waybillTrackEntity.setUpdateUser(userId);
+		waybillTrackEntity.setCheckStatus(1);
+		waybillTrackEntity.setCheckTime(new Date());
 		trunklineWaybillTrackService.save(waybillTrackEntity);
 	}
 
@@ -236,4 +240,27 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		inComingDTO.setIncomingType(incomingType);
 		inComingService.incomingBatchOrder(inComingDTO);
 	}
+
+	@Override
+	public void saveUpdateLog(Long waybillId, String waybillNo, String trackType, String refer, String operationRemark, String nickName, Long userId, Long warehouseId, String warehouseName, WarehouseWaybillEntity waybillEntity) {
+		User user = UserCache.getUser(userId);
+		TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
+		waybillTrackEntity.setWarehouseId(warehouseId);
+		waybillTrackEntity.setWarehouseName(warehouseName);
+		waybillTrackEntity.setWaybillId(waybillId);
+		waybillTrackEntity.setWaybillNo(waybillNo);
+		waybillTrackEntity.setTrackType(trackType);
+		waybillTrackEntity.setRefer(refer);
+		waybillTrackEntity.setOperationRemark(operationRemark);
+		waybillTrackEntity.setCreateUserName(nickName);
+		waybillTrackEntity.setTenantId(user.getTenantId());
+		waybillTrackEntity.setCreateUser(userId);
+		waybillTrackEntity.setUpdateUser(userId);
+		waybillTrackEntity.setCheckStatus(1);
+		waybillTrackEntity.setCheckTime(new Date());
+		trunklineWaybillTrackService.save(waybillTrackEntity);
+
+		//存入运单json
+
+	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1476,7 +1476,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 //		String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg;
 		//异步存入日志
-		openOrderAsyncService.saveLog(waybillId, waybillNo, "888", "修改运单", editReson + "  " + remark, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
+		openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, remark+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity);
 
 		return R.success("改单成功");
 	}
@@ -2149,6 +2149,29 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		return R.data(list);
 	}
 
+	@Override
+	public R findUpdateWaybillList(OpenOrderDTO openOrderDTO) {
+		Integer pageNum = openOrderDTO.getPageNum();
+		Integer pageSize = openOrderDTO.getPageSize();
+
+		IPage<Object> page = new Page<>();
+		page.setCurrent(pageNum);
+		page.setSize(pageSize);
+
+		openOrderDTO.setOpenTimeStart(CommonUtil.getStartByDateStr(openOrderDTO.getOpenTimeStartStr()));
+		openOrderDTO.setOpenTimeEnd(CommonUtil.getEndByDateStr(openOrderDTO.getOpenTimeEndStr()));
+
+		openOrderDTO.setApplyTimeStart(CommonUtil.getStartByDateStr(openOrderDTO.getApplyTimeStartStr()));
+		openOrderDTO.setApplyTimeEnd(CommonUtil.getEndByDateStr(openOrderDTO.getApplyTimeEndStr()));
+
+		openOrderDTO.setCheckTimeStart(CommonUtil.getStartByDateStr(openOrderDTO.getCheckTimeStartStr()));
+		openOrderDTO.setCheckTimeEnd(CommonUtil.getEndByDateStr(openOrderDTO.getCheckTimeEndStr()));
+
+		IPage<TrunklineWaybillTrackVO> pageList = trunklineWaybillTrackService.findUpdateWaybillList(page,openOrderDTO);
+
+		return R.data(pageList);
+	}
+
 	private List<EditOrderMsgVO> verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {
 		log.info("###################verifyData: 验证改单数据");
 		StringBuilder stringBuilder = new StringBuilder();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillJsonServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineWaybillJsonEntity;
+import com.logpm.trunkline.mapper.TrunklineWaybillJsonMapper;
+import com.logpm.trunkline.service.ITrunklineWaybillJsonService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineWaybillJsonServiceImpl extends BaseServiceImpl<TrunklineWaybillJsonMapper, TrunklineWaybillJsonEntity> implements ITrunklineWaybillJsonService {
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java

@@ -1,8 +1,11 @@
 package com.logpm.trunkline.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.trunkline.dto.OpenOrderDTO;
 import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
 import com.logpm.trunkline.mapper.TrunklineWaybillTrackMapper;
 import com.logpm.trunkline.service.ITrunklineWaybillTrackService;
+import com.logpm.trunkline.vo.TrunklineWaybillTrackVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -18,4 +21,9 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 	public List<TrunklineWaybillTrackEntity> findWaybillLog(Long waybillId, String trackType) {
 		return baseMapper.findWaybillLog(waybillId,trackType);
 	}
+
+	@Override
+	public IPage<TrunklineWaybillTrackVO> findUpdateWaybillList(IPage<Object> page, OpenOrderDTO openOrderDTO) {
+		return baseMapper.findUpdateWaybillList(page,openOrderDTO);
+	}
 }