From 08a3065189b9a19c17e03651e56fbdbf72307572 Mon Sep 17 00:00:00 2001 From: kilo Date: Sun, 15 Oct 2023 17:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=B1=95=E7=A4=BA=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5=E5=92=8CID=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/vo/WarehouseAllocationInfoVO.java | 3 +++ .../controller/BasicdataDriverArteryController.java | 12 ++++++++++++ .../mapper/BasicdataGoodsAllocationMapper.xml | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseAllocationInfoVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseAllocationInfoVO.java index 69ebeecc8..dfc95006a 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseAllocationInfoVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseAllocationInfoVO.java @@ -24,6 +24,9 @@ public class WarehouseAllocationInfoVO { @ApiModelProperty(value = "区域名称") private String areaName; + @ApiModelProperty(value = "区域名称") + private String allocationId; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 45035cc5d..cf0fbbb15 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -36,11 +36,15 @@ import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.system.entity.User; +import org.springblade.system.feign.IUserClient; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.handler.UserRoleAuthorizationInterceptor; import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; @@ -65,6 +69,8 @@ public class BasicdataDriverArteryController extends BladeController { private final IBasicdataVehicleService basicdataVehicleService; + private final IUserClient userClient; + /** * 司机信息表 详情 */ @@ -122,6 +128,12 @@ public class BasicdataDriverArteryController extends BladeController { if(list.size() > 0){ return R.fail("绑定的用户已存在！不要重复绑定！！！"); } + + R userR = userClient.userInfoByPhone(AuthUtil.getUser().getTenantId(), basicdataDriverArtery.getPhone()); + if (Func.isNotEmpty(userR.getData())){ + User user = userR.getData(); + basicdataDriverArtery.setUserId(user.getId()); + } boolean save = basicdataDriverArteryService.save(basicdataDriverArtery); //加入关联表 if (null !=basicdataDriverArtery.getBindVehicles()&& save){ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml index c6e236721..d5b48dff3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml @@ -139,7 +139,8 @@ lwga.qr_code as allocationCode, CONCAT(lwgs.goods_shelf_name,'-',lwga.goods_allocation_name) as allocationName, lww.`name` as warehouseName, - lwga1.headline as areaName + lwga1.headline as areaName, + lwga.id as allocationId from logpm_warehouse_goods_allocation lwga LEFT JOIN logpm_warehouse_goods_area lwga1 ON lwga1.id=lwga.goods_area_id LEFT JOIN logpm_warehouse_goods_shelf lwgs ON lwgs.id = lwga.goods_shelf_id