预约调整

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -88,6 +88,9 @@ public class DistributionReservationController extends BladeController {
 		return R.data(DistributionReservationWrapper.build().pageVO(pages));
 	}
 
+
+
+
 	/**
 	 * 预约列表 自定义分页
 	 */
@@ -130,8 +133,8 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入distrbutionReservation")
 	public R update(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) {
-		boolean result = reservationService.updateReservation(distributionReservationDTO);
-		return R.status(result);
+		R result = reservationService.updateReservation(distributionReservationDTO);
+		return result;
 	}
 
 	/**
@@ -141,7 +144,6 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入distrbutionReservation")
 	public R updateClient(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) {
-
 		boolean result = reservationService.updateById(distributionReservationDTO);
 		return R.status(result);
 	}
@@ -321,4 +323,7 @@ public class DistributionReservationController extends BladeController {
 		page.setTotal(stockArticleVOS.size());
 		return R.data(page);
 	}
+
+
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java

@@ -18,6 +18,7 @@ package com.logpm.distribution.controller;
 
 import com.logpm.distribution.dto.DistributionStockListDTO;
 import com.logpm.distribution.excel.StockListImporter;
+import com.logpm.distribution.vo.DistributionReservationVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -205,4 +206,16 @@ public class DistributionStockListController extends BladeController  {
 		return result;
 	}
 
+//	/**
+//	 * 查询库存品详情
+//	 */
+//	@GetMapping("/selectInventoryDetail")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "分页", notes = "传入distrbutionReservation")
+//	public R selectInventoryDetail(@ApiIgnore @RequestParam Map<String, Object> params, Query query) {
+//		R result = distributionStockListService.selectInventoryDetail(params,Condition.getPage(query));
+////		IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query), Condition.getQueryWrappenullr(params, DistributionReservationEntity.class));
+//		return result;
+//	}
+
 }

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

@@ -51,4 +51,9 @@ public interface DisStockListDetailMapper extends BaseMapper<DisStockListDetailE
 	 */
 	List<DisStockListDetailExcel> exportDisStockListDetail(@Param("ew") Wrapper<DisStockListDetailEntity> queryWrapper);
 
+	/**
+	 * 删除该客户下的库存品包件信息
+	 * @param id
+	 */
+    void deleteByReservationStockListId(@Param("reservationStockListId") Long id);
 }

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

@@ -29,6 +29,9 @@
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
     </resultMap>
+    <delete id="deleteByReservationStockListId">
+        DELETE  FROM  logpm_dis_stock_list_teail WHERE reservation_stock_list_id = #{reservationStockListId}
+    </delete>
 
 
     <select id="selectDisStockListDetailPage" resultMap="disStockListDetailResultMap">

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

@@ -504,8 +504,8 @@
             lds.clerk_sign_pictures clerkSignPictures,
             lds.delivery_sign_pictures deliverySignPictures,
             ldr.reservation_date reservationDate,
+            lds.positioning_adr positioningAdr,
             CASE
-
                 WHEN ldr.delivery_type = '1' THEN
                     '商配'
                 WHEN ldr.delivery_type = '2' THEN

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -119,7 +119,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @param distributionReservationDTO
 	 * @return
 	 */
-	boolean updateReservation(DistributionReservationDTO distributionReservationDTO);
+	R updateReservation(DistributionReservationDTO distributionReservationDTO);
 
 	/**
 	 * 商配配送计划添加

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java

@@ -130,4 +130,11 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
     DistributionStockupStockListInfoVO selectStockListInfoSelf(Long reservationId, Long stockListId);
 
+//	/**
+//	 * 查询库存品详情
+//	 * @param params
+//	 * @param page
+//	 * @return
+//	 */
+//    R selectInventoryDetail(Map<String, Object> params, IPage<Object> page);
 }

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

@@ -48,6 +48,7 @@ import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.serviceConstant.ServiceConstant;
+import org.springblade.common.utils.GaoDeApiUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -570,11 +571,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (null != distributionSignforEntity.getPositioning() || null != distributionSignforEntity.getPositioningAdr()) {
 			return R.fail(3008, "已打卡");
 		}
+		String positioning = distributionSignfor.getPositioning();
+		String add = GaoDeApiUtil.getAdd(positioning);
 		boolean update = this.update(new UpdateWrapper<DistributionSignforEntity>().lambda()
 			.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
 			.eq(DistributionSignforEntity::getDeliveryId, distributionSignfor.getDeliveryId())
 			.set(StringUtils.isNotBlank(distributionSignfor.getPositioning()), DistributionSignforEntity::getPositioning, distributionSignfor.getPositioning())
-			.set(StringUtils.isNotBlank(distributionSignfor.getPositioningAdr()), DistributionSignforEntity::getPositioningAdr, distributionSignfor.getPositioningAdr())
+			.set(StringUtils.isNotBlank(add), DistributionSignforEntity::getPositioningAdr, add)
 		);
 		return R.status(update);
 	}

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

@@ -26,11 +26,13 @@ import com.logpm.basic.feign.IBasicMaterialClient;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.distribution.dto.DistributionStockListDTO;
+import com.logpm.distribution.entity.DistributionReservationStocklistEntity;
 import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.entity.DistributionStockListInfoEntity;
 import com.logpm.distribution.entity.DistributionUnpackingDetailsEntity;
 import com.logpm.distribution.excel.DistributionStockListExcel;
 import com.logpm.distribution.mapper.DistributionStockListMapper;
+import com.logpm.distribution.service.IDistributionReservationStocklistService;
 import com.logpm.distribution.service.IDistributionStockListInfoService;
 import com.logpm.distribution.service.IDistributionStockListService;
 import com.logpm.distribution.service.IDistributionUnpackingDetailsService;
@@ -74,6 +76,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 
 	private final IDistributionStockListInfoService distributionStockListInfoService;
 
+	private final IDistributionReservationStocklistService reservationStocklistService;
+
 
 
 	@Override
@@ -372,4 +376,15 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		return baseMapper.selectStockListInfoSelf(reservationId,stockListId);
 	}
 
+//	@Override
+//	public R selectInventoryDetail(Map<String, Object> params, IPage<Object> page) {
+//		String reservationId = (String) params.get("reservationId");
+//		String inventoryId = (String) params.get("inventoryId");
+//		//查询预约库存品中间表
+//		reservationStocklistService.getOne(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
+//			.eq(DistributionReservationStocklistEntity::getReservationId,reservationId)
+//			.eq());
+//		return null;
+//	}
+
 }

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

@@ -925,8 +925,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 							}
 						} else {
-							//不存在
+							List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getOrderPackageCode, packetBarCode));
+							if (list.size()>0){
+								return 5;
+							}
+						//不存在
 							return 3;
+
 						}
 					case 2:
 						//库存品