货位二维码二维码展示二维码字段和ID信息

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;
+
 
 
 }

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<User> 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){

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