预约修改

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java

@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface IBasicdataGoodsAreaClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "goodsArea/client";
     String TOP = API_PREFIX + "/top";
 
     /**

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

@@ -119,11 +119,11 @@ public class DistributionReservationEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "备注")
 	private String remarks;
-	/**
-	 * 预约单编号，系统构建生成
-	 */
-	@ApiModelProperty(value = "预约单编号")
-	private String reservationId;
+//	/**
+//	 * 预约单编号，系统构建生成
+//	 */
+//	@ApiModelProperty(value = "预约单编号")
+//	private String reservationId;
 	/**
 	 * 时段
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -30,6 +30,7 @@ import javax.validation.Valid;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -84,6 +85,7 @@ public class BasicdataWarehouseController extends BladeController {
 		qw
 			.apply(startDate != null,"date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')",startDate)
 			.apply(endDate != null,"date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')",endDate);
+		qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId());
 		IPage<BasicdataWarehouseEntity> page = warehouseService.page(Condition.getPage(query), qw);
 //		IPage<BasicdataWarehouseEntity> pages = warehouseService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class));
 		return R.data(page);
@@ -97,7 +99,6 @@ public class BasicdataWarehouseController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入warehouseWarehouse")
 	public R<List<BasicdataWarehouseEntity>> listName(String name) {
 		List<BasicdataWarehouseEntity> pages = warehouseService.pageListName(name);
-
 		return R.data(pages);
 	}
 

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

@@ -100,7 +100,6 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入distrbutionReservation")
 	public R save(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) {
-
 		boolean result = reservationService.insertReservation(distributionReservationDTO);
 		return R.status(result);
 	}

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

@@ -28,7 +28,7 @@
         <result column="order_source" property="orderSource"/>
         <result column="stockup_status" property="stockupStatus"/>
         <result column="goods_shelf_id" property="goodsAreaId"/>
-        <result column="reservation_id" property="reservationId"/>
+<!--        <result column="reservation_id" property="reservationId"/>-->
         <result column="period_of_time" property="periodOfTime"/>
         <result column="reserve1" property="reserve1"/>
         <result column="reserve2" property="reserve2"/>

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

@@ -205,6 +205,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				}
 				//修改预约备货状态
 				reservationEntity.setStockupStatus("2");
+				reservationEntity.setGoodsAreaId(goddsAreaId);
 				result = SqlHelper.retBool(distributionReservationMapper.updateById(reservationEntity));
 				//构建中间表信息
 				DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity();