仓库调整

blade-biz-common/pom.xml

@@ -34,6 +34,27 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.16</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <!--redis-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -65,4 +65,6 @@ public class CommonUtil {
 		return null;
 	}
 
+
+
 }

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java

@@ -35,7 +35,7 @@ import java.util.List;
  * @since 2023-05-08
  */
 @FeignClient(
-	value = ModuleNameConstant.APPLICATION_BASIC_NAME
+	value = ModuleNameConstant.APPLICATION_BASIC_NAME+"-tjj"
 )
 public interface IBasicTenantCodeClient {
 
@@ -43,7 +43,7 @@ public interface IBasicTenantCodeClient {
 	String TOP = API_PREFIX + "/top";
 
 	/**
-	 * 获取pda信息列表
+	 * 获取租户编码规则列表
 	 *
 	 * @param current   页号
 	 * @param size      页数
@@ -56,4 +56,13 @@ public interface IBasicTenantCodeClient {
 	@GetMapping(TOP+"/list")
 	List<BasicTenantCodeEntity> list(@ApiIgnore  BasicTenantCodeEntity basicTenantCodeEntity) throws IllegalAccessException;
 
+	/**
+	 * 获取指定用户编码规则
+	 * @param tenantId 用户编号
+	 * @return
+	 * @throws IllegalAccessException
+	 */
+	@GetMapping(TOP+"/shelfCode")
+	String shelfCode(@RequestParam String tenantId,@RequestParam String codeType);
+
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java

@@ -82,10 +82,10 @@ public class BasicdataGoodsAllocationEntity extends TenantEntity {
 	@ApiModelProperty(value = "货架编号")
 	private String goodsShelfId;
 	/**
-	 * 列编码
+	 * 所在列
 	 */
-	@ApiModelProperty(value = "列编码")
-	private String rowNum;
+	@ApiModelProperty(value = "所在列")
+	private String columnNum;
 	/**
 	 * 启用状态;1-启用；2-禁用
 	 */
@@ -97,10 +97,10 @@ public class BasicdataGoodsAllocationEntity extends TenantEntity {
 	@ApiModelProperty(value = "货位状态;1-空闲；2-有货；3-满货")
 	private String allocationStatuc;
 	/**
-	 * 层编码
+	 * 所在层
 	 */
-	@ApiModelProperty(value = "层编码")
-	private String storeyNum;
+	@ApiModelProperty(value = "所在层")
+	private String layerNum;
 
 	/**
 	 * 层编码

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java

@@ -97,4 +97,28 @@ public class BasicdataGoodsShelfEntity extends TenantEntity {
 	@ApiModelProperty(value = "备注")
 	private String remarks;
 
+	/**
+	 * 列数
+	 */
+	@ApiModelProperty(value = "列数")
+	private Integer rowNum;
+
+	/**
+	 * 层数
+	 */
+	@ApiModelProperty(value = "层数")
+	private Integer storeyNum;
+
+	/**
+	 * 货架二维码
+	 */
+	@ApiModelProperty(value = "货架二维码")
+	private String qrCode;
+
+	/**
+	 * 货架二维码
+	 */
+	@ApiModelProperty(value = "货架二维码地址")
+	private String qrCodeUrl;
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPrintTemplateController.java

@@ -18,6 +18,7 @@ package com.logpm.basic.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basic.dto.BasicPrintTemplateDTO;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.excel.BasicPrintTemplateExcel;
 import com.logpm.basic.service.IBasicPrintTemplateService;
@@ -97,8 +98,9 @@ public class BasicPrintTemplateController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicPrintTemplate")
-	public R save(@Valid @RequestBody BasicPrintTemplateEntity basicPrintTemplate) {
-		return R.status(basicPrintTemplateService.save(basicPrintTemplate));
+	public R save(@Valid @RequestBody BasicPrintTemplateDTO basicPrintTemplateDTO) {
+		boolean result = basicPrintTemplateService.insertPrintTemplate(basicPrintTemplateDTO);
+		return R.status(result);
 	}
 
 	/**

blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicPrintTemplateDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basic.dto;
+
+import com.logpm.basic.entity.BasicPrintTemplateEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 打印模板信息 数据传输对象实体类
+ *
+ * @author tjj
+ * @since 2023-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicPrintTemplateDTO extends BasicPrintTemplateEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java

@@ -39,7 +39,7 @@ import java.util.List;
 @ApiIgnore()
 @RestController
 @AllArgsConstructor
-public class BasicBasicTenantCodeClient implements IBasicTenantCodeClient {
+public class BasicTenantCodeClient implements IBasicTenantCodeClient {
 
 	private final IBasicTenantCodeService basicTenantCodeService;
 
@@ -54,10 +54,18 @@ public class BasicBasicTenantCodeClient implements IBasicTenantCodeClient {
 	}
 
 	@Override
-	@GetMapping(TOP+"/list")
-	public List<BasicTenantCodeEntity> list(BasicTenantCodeEntity basicTenantCodeEntity) throws IllegalAccessException {
+	@GetMapping(TOP + "/list")
+	public List<BasicTenantCodeEntity> list(BasicTenantCodeEntity basicTenantCodeEntity) {
 		List<BasicTenantCodeEntity> list = basicTenantCodeService.list(Condition.getQueryWrapper(basicTenantCodeEntity));
 		return list;
 	}
 
+	@Override
+	@GetMapping(TOP + "/shelfCode")
+	public String shelfCode(String tenantId,String codeType) {
+		String shelfCode = basicTenantCodeService.shelfCode(tenantId,codeType);
+		return shelfCode;
+	}
+
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPrintTemplateMapper.xml

@@ -35,4 +35,5 @@
         SELECT * FROM logpm_basic_print_template ${ew.customSqlSegment}
     </select>
 
+
 </mapper>

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.java

@@ -60,5 +60,8 @@ public interface BasicTenantCodeMapper extends BaseMapper<BasicTenantCodeEntity>
 	 */
     IPage<BasicTenantCodeEntity> selectTenantCodeList(IPage<BasicTenantCodeEntity> page,@Param("po") Map<String, Object> basicTenantCode);
 
+
 	BasicTenantCodeEntity selectTenantCodeDetail(Long id);
+
+	String shelfCode(@Param("po")Map<String, String> map);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml

@@ -40,10 +40,10 @@
         <where>
             is_deleted = 0
             <if test="po.codeType!=null and po.codeType!=''">
-                and code_type = #{po.input}
+                and code_type = #{po.codeType}
             </if>
             <if test="po.showType!=null and po.showType!=''">
-               and show_type = #{po.type}
+               and show_type = #{po.showType}
             </if>
         </where>
     </select>
@@ -75,5 +75,17 @@
             </if>
         </where>
     </select>
+    <select id="shelfCode" resultType="java.lang.String">
+        SELECT code AS shelfCode FROM logpm_basic_tenant_code
+        <where>
+            is_deleted = 0
+            <if test="po.tenantId != null and po.tenantId != ''">
+               and tenant_id = #{po.tenantId}
+            </if>
+            <if test="po.codeType != null and po.codeType != ''">
+               and code_type = #{po.codeType}
+            </if>
+        </where>
+    </select>
 
 </mapper>

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPrintTemplateService.java

@@ -19,6 +19,7 @@ package com.logpm.basic.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basic.dto.BasicPrintTemplateDTO;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.excel.BasicPrintTemplateExcel;
 import com.logpm.basic.vo.BasicPrintTemplateVO;
@@ -51,4 +52,6 @@ public interface IBasicPrintTemplateService extends BaseService<BasicPrintTempla
 	 */
 	List<BasicPrintTemplateExcel> exportBasicPrintTemplate(Wrapper<BasicPrintTemplateEntity> queryWrapper);
 
+    boolean insertPrintTemplate(BasicPrintTemplateDTO basicPrintTemplateDTO);
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java

@@ -70,4 +70,5 @@ public interface IBasicTenantCodeService extends BaseService<BasicTenantCodeEnti
 	 */
 	BasicTenantCodeEntity gerOne(Long id);
 
+    String shelfCode(String tenantId,String codeType);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java

@@ -18,18 +18,23 @@ package com.logpm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.logpm.basic.dto.BasicPrintTemplateDTO;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.excel.BasicPrintTemplateExcel;
 import com.logpm.basic.mapper.BasicPrintTemplateMapper;
 import com.logpm.basic.service.IBasicPrintTemplateService;
 import com.logpm.basic.vo.BasicPrintTemplateVO;
+import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 
@@ -40,8 +45,12 @@ import java.util.List;
  * @since 2023-05-15
  */
 @Service
+@AllArgsConstructor
 public class BasicPrintTemplateServiceImpl extends BaseServiceImpl<BasicPrintTemplateMapper, BasicPrintTemplateEntity> implements IBasicPrintTemplateService {
 
+	private BasicPrintTemplateMapper printTemplateMapper;
+
+
 	@Override
 	public IPage<BasicPrintTemplateVO> selectBasicPrintTemplatePage(IPage<BasicPrintTemplateVO> page, BasicPrintTemplateVO basicPrintTemplate) {
 		return page.setRecords(baseMapper.selectBasicPrintTemplatePage(page, basicPrintTemplate));
@@ -57,6 +66,30 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl<BasicPrintTem
 		return basicPrintTemplateList;
 	}
 
+	@Override
+	public boolean insertPrintTemplate(BasicPrintTemplateDTO basicPrintTemplateDTO) {
+		boolean result = false;
+		if (Func.isEmpty(basicPrintTemplateDTO)){
+			log.error("参数异常:{}"+basicPrintTemplateDTO);
+			return result;
+		}
+		BasicPrintTemplateEntity basicPrintTemplateEntity = new BasicPrintTemplateEntity();
+		BeanUtils.copyProperties(basicPrintTemplateDTO,basicPrintTemplateEntity);
+		BladeUser user = AuthUtil.getUser();
+		Date date = new Date();
+		basicPrintTemplateEntity.setTenantId(user.getTenantId());
+		basicPrintTemplateEntity.setCreateUser(user.getUserId());
+		basicPrintTemplateEntity.setFounder(user.getUserId().toString());
+		basicPrintTemplateEntity.setCreateDept(Long.valueOf(user.getDeptId()));
+		basicPrintTemplateEntity.setCreateTime(date);
+		basicPrintTemplateEntity.setIsDeleted(0);
+		basicPrintTemplateEntity.setStatus(1);
+
+		result = SqlHelper.retBool(printTemplateMapper.insert(basicPrintTemplateEntity));
+
+		return result;
+	}
+
 	@Override
 	public boolean save(BasicPrintTemplateEntity entity) {
 		if (Func.isEmpty(entity)){

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicTenantCodeServiceImpl.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.util.StringUtils;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -48,7 +49,6 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl<BasicTenantCodeM
 
 	private BasicTenantCodeMapper basicTenantCodeMapper;
 
-
 	@Override
 	public IPage<BasicTenantCodeEntity> list(Map<String, Object> basicTenantCode, IPage<BasicTenantCodeEntity> page) {
 		IPage<BasicTenantCodeEntity> basicTenantCodeEntityIPage = basicTenantCodeMapper.selectTenantCodeList(page,basicTenantCode);
@@ -64,6 +64,15 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl<BasicTenantCodeM
 		return basicTenantCodeEntity;
 	}
 
+	@Override
+	public String shelfCode(String tenantId,String codeType) {
+		Map<String,String> map = new HashMap<>();
+		map.put("tenantId",tenantId);
+		map.put("codeType",codeType);
+		String shelfCode = basicTenantCodeMapper.shelfCode(map);
+		return shelfCode;
+	}
+
 	@Override
 	public IPage<BasicTenantCodeVO> selectBasicTenantCodePage(IPage<BasicTenantCodeVO> page, BasicTenantCodeVO basicTenantCode) {
 		return page.setRecords(baseMapper.selectBasicTenantCodePage(page, basicTenantCode));

blade-service/logpm-basicdata/pom.xml

@@ -49,6 +49,11 @@
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-basic-api</artifactId>
+            <version>3.1.0.RELEASE</version>
+        </dependency>
     </dependencies>
 
 

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

@@ -27,6 +27,9 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 import org.springblade.core.secure.BladeUser;
@@ -42,6 +45,10 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
 import java.util.Map;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -162,4 +169,16 @@ public class BasicdataGoodsAllocationController extends BladeController {
 		return R.data(pages);
 	}
 
+
+	/**
+	 * 货位 自定义分页
+	 */
+	@GetMapping("/qrCode")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "二维码生成", notes = "传入构建好的二维码值")
+	public R<?> qrCode(@ApiIgnore @RequestParam String qrCode,HttpServletResponse response) {
+		boolean result = basicdataGoodsAllocationService.getQrCodeImg(qrCode,response);
+		return R.status(result);
+	}
+
 }

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

@@ -76,25 +76,13 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入warehouseGoodsArea")
-	public R<IPage<BasicdataGoodsAreaEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, Query query) {
+	public R<IPage<BasicdataGoodsAreaVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, Query query) {
 		IPage<Object> page = Condition.getPage(query);
-//		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
-		IPage<BasicdataGoodsAreaEntity> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
-		return R.data(pages);
+		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
+//		IPage<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
+		return R.data(list);
 	}
 
-//	/**
-//	 * 货区 分页
-//	 */
-//	@GetMapping("/list")
-//	@ApiOperationSupport(order = 2)
-//	@ApiOperation(value = "分页", notes = "传入warehouseGoodsArea")
-//	public R<IPage<BasicdataGoodsAreaEntity>> listInfo(@ApiIgnore Query query) {
-//		IPage<Object> page = Condition.getPage(query);
-////		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
-//		IPage<BasicdataGoodsAreaEntity> pages = basicdataGoodsAreaService.page(Condition.getPage(query));
-//		return R.data(pages);
-//	}
 
 	/**
 	 * 货区 自定义分页

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

@@ -26,8 +26,12 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -42,6 +46,10 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
 import java.util.Map;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -101,7 +109,6 @@ public class BasicdataGoodsShelfController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入BasicdataGoodsShelf")
 	public R save(@Valid @RequestBody BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
-
 		return R.status(basicdataGoodsShelfService.insertGoodsshelf(basicdataGoodsShelfDTO));
 	}
 
@@ -155,5 +162,22 @@ public class BasicdataGoodsShelfController extends BladeController {
 	}
 
 
+	/**
+	 * 货架 分页
+	 */
+	@GetMapping("/qrCode")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "生成二维码图片返回前端渲染", notes = "传入BasicdataGoodsShelf")
+	public R<?> qrCode(@ApiIgnore @RequestParam String qrCode,HttpServletResponse response) {
+		boolean result =  basicdataGoodsShelfService.getQRCode(qrCode,response);
+		if (result){
+			return R.status(result);
+		}else {
+			return R.fail("操作失败");
+		}
+	}
+
+
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java

@@ -33,6 +33,6 @@ import java.util.List;
 public class BasicdataGoodsAllocationDTO extends BasicdataGoodsAllocationEntity {
 	private static final long serialVersionUID = 1L;
 
-	private List<String> nodeInfo;
+//	private List<String> nodeInfo;
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@@ -22,10 +22,10 @@
         <result column="goods_allocation_name" property="goodsAllocationName"/>
         <result column="warehouse_id" property="warehouseId"/>
         <result column="goods_shelf_id" property="goodsShelfId"/>
-        <result column="row_num" property="rowNum"/>
         <result column="enable_status" property="enableStatus"/>
+        <result column="column_num" property="columnNum"/>
+        <result column="layer_num" property="layerNum"/>
         <result column="allocation_statuc" property="allocationStatuc"/>
-        <result column="storey_num" property="storeyNum"/>
     </resultMap>
 
 
@@ -78,10 +78,10 @@
             goods_allocation.goods_allocation_name,
             goods_allocation.warehouse_id,
             goods_allocation.goods_shelf_id,
-            goods_allocation.row_num,
+            goods_allocation.column_num,
             goods_allocation.enable_status,
             goods_allocation.allocation_statuc,
-            goods_allocation.storey_num,
+            goods_allocation.layer_num,
             goods_allocation.qr_code,
             goods_allocation.qr_code_url,
             goods_shelf.goods_shelf_name AS goodsShelfName,

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml

@@ -25,6 +25,10 @@
         <result column="enable_status" property="enableStatus"/>
         <result column="goods_allcation_id" property="goodsAllcationId"/>
         <result column="remarks" property="remarks"/>
+        <result column="row_num" property="rowNum"/>
+        <result column="storey_num" property="storeyNum"/>
+        <result column="qr_code" property="qrCode"/>
+        <result column="qr_code_url" property="qrCodeUrl"/>
     </resultMap>
     <update id="removeGoodsShelf">
         UPDATE logpm_warehouse_goods_shelf
@@ -68,6 +72,10 @@
             goods_shelf.enable_status,
             goods_shelf.goods_allcation_id,
             goods_shelf.remarks,
+            goods_shelf.row_num,
+            goods_shelf.storey_num,
+            goods_shelf.qr_code,
+            goods_shelf.qr_code_url,
             warehouse.name AS warehouseName,
             goods_area.headline AS goodsAreaName
         FROM
@@ -113,6 +121,9 @@
              goods_shelf.enable_status,
              goods_shelf.goods_allcation_id,
              goods_shelf.remarks,
+             goods_shelf.row_num,
+             goods_shelf.storey_num,
+             goods_shelf.qr_code,
              goods_area.headline AS goodsAreaName
         FROM
 	        logpm_warehouse_goods_shelf AS goods_shelf

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java

@@ -26,6 +26,7 @@ import com.logpm.basicdata.vo.BasicdataNodeVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -77,4 +78,7 @@ public interface IBasicdataGoodsAllocationService extends BaseService<BasicdataG
 
 
 	boolean updateGoodsAllocation(BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto);
+
+	boolean getQrCodeImg(String qrCode, HttpServletResponse response);
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java

@@ -23,6 +23,9 @@ import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsShelfExcel;
 import com.logpm.basicdata.vo.BasicdataGoodsShelfVO;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -88,4 +91,13 @@ public interface IBasicdataGoodsShelfService extends BaseService<BasicdataGoodsS
 	 * @return
 	 */
 	boolean removeGoodsShelf(List<String> ids);
+
+	/**
+	 * 二维码生成
+	 * @param qrCode
+	 * @param response
+	 * @return
+	 */
+	boolean getQRCode(String qrCode, HttpServletResponse response);
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java

@@ -73,6 +73,11 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	 */
 	boolean removeWarehouse(List<String> ids);
 
+	/**
+	 *
+	 * @param name
+	 * @return
+	 */
     List<BasicdataWarehouseEntity> pageListName(String name);
 	/**
 	 * 查询仓库字典

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.service.impl;
 
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO;
 import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
@@ -27,6 +28,7 @@ import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -37,7 +39,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +60,8 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 
 	private BasicdataGoodsAreaMapper goodsAreaMapper;
 
+	private IBasicTenantCodeClient tenantCodeClient;
+
 	@Override
 	public IPage<BasicdataGoodsAllocationVO> selectBasicdataGoodsAllocationPage(IPage<BasicdataGoodsAllocationVO> page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) {
 		return page.setRecords(baseMapper.selectBasicdataGoodsAllocationPage(page, BasicdataGoodsAllocation));
@@ -99,6 +105,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 	}
 
 	@Override
+	@Transactional
 	public boolean insertGoodsAllocation( BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) {
 		BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
 		if (Func.isEmpty(basicdataGoodsAllocationDto)){
@@ -118,10 +125,13 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 		basicdataGoodsAllocationEntity.setUpdateTime(new Date());
 		basicdataGoodsAllocationEntity.setUpdateUser(userId);
 		basicdataGoodsAllocationEntity.setTenantId(user.getTenantId());
+		//货位二维码值
+		//获取租户二维码规则
+		String code = tenantCodeClient.shelfCode(user.getTenantId(), "5");
+		String allocationCode = code+"-"+basicdataGoodsAllocationEntity.getColumnNum()+"-"+basicdataGoodsAllocationEntity.getLayerNum()+"-"+basicdataGoodsAllocationEntity.getGoodsAllocationName();
+		basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 		boolean result = SqlHelper.retBool(goodsAllocationMapper.insert(basicdataGoodsAllocationEntity));
 
-
-
 		return result;
 	}
 
@@ -138,12 +148,26 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 	public boolean updateGoodsAllocation(BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) {
 		boolean result = false;
 		if (Func.isEmpty(basicdataGoodsAllocationDto)){
+			log.error("参数不合法：{}"+basicdataGoodsAllocationDto);
 			return result;
 		}
 			BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
 			BeanUtils.copyProperties(basicdataGoodsAllocationDto,basicdataGoodsAllocationEntity);
 			 result = SqlHelper.retBool(goodsAllocationMapper.updateById(basicdataGoodsAllocationEntity));
-		return result;
+			return result;
+	}
+
+	@Override
+	public boolean getQrCodeImg(String qrCode, HttpServletResponse response) {
+		if (Func.isBlank(qrCode)){
+			return false;
+		}
+		try {
+			QRCodeUtil.createCodeToOutputStream(qrCode,response);
+		}catch (Exception e){
+			log.error("二维码生成失败{"+e.getMessage()+"}");
+		}
+		return true;
 	}
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Collections;
 import java.util.List;
@@ -108,7 +109,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		for (String id : ids) {
 			result = SqlHelper.retBool(basicdataGoodsAreaMapper.removeGoodsArea(id));
 			if (!result){
-				throw new RuntimeException("选中货区还存在待删货架!!!");
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				return false;
 			}
 		}
 		return result;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -19,7 +19,13 @@ package com.logpm.basicdata.service.impl;
 
 
 
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+//import com.logpm.basic.entity.BasicPrintTemplateEntity;
+//import com.logpm.basic.mapper.BasicPrintTemplateMapper;
+import com.google.zxing.WriterException;
+import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.basicdata.dto.BasicdataGoodsShelfDTO;
 import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsShelfExcel;
@@ -27,17 +33,28 @@ import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper;
 import com.logpm.basicdata.service.IBasicdataGoodsShelfService;
 import com.logpm.basicdata.vo.BasicdataGoodsShelfVO;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.QRCodeUtil;
+import org.springblade.common.utils.RedisUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 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.utils.Func;
+import org.springblade.core.tool.utils.IoUtil;
+import org.springblade.core.tool.utils.WebUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.StringUtils;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -54,6 +71,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 
 	private BasicdataGoodsShelfMapper basicdataGoodsShelfMapper;
 
+	private IBasicTenantCodeClient basicTenantCodeClient;
+
+	private RedisUtil redisUtil;
+
 	@Override
 	public IPage<BasicdataGoodsShelfVO> selectBasicdataGoodsShelfPage(IPage<BasicdataGoodsShelfVO> page, BasicdataGoodsShelfVO basicdataGoodsShelfVO) {
 		return page.setRecords(baseMapper.selectBasicdataGoodsShelfPage(page, basicdataGoodsShelfVO));
@@ -70,31 +91,35 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	}
 
 	@Override
-	public IPage<BasicdataGoodsShelfVO> getGoodsShelfList(IPage<Object> page, Map<String, Object> basicdataGoodsShelf) {
+	public IPage<BasicdataGoodsShelfVO> getGoodsShelfList(IPage<Object> page, Map<String, Object> basicdataGoodsShelf)  {
 		IPage<BasicdataGoodsShelfVO> basicdataGoodsShelfVOIPage=basicdataGoodsShelfMapper.getGoodsShelfList(page,basicdataGoodsShelf);
-
+//		redisUtil.set("aaa","aaa");
+//		WebUtil.getResponseEncodedHtmlEscape()
 		return basicdataGoodsShelfVOIPage;
 	}
 
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean insertGoodsshelf(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
 		//维护仓库、货区数据
 		boolean result = false;
-		//这里新增货架必须有仓库和货区的信息
+		//这里新增货架必须有仓库和货区的信息否则视为信息不合法
 		if (Func.isEmpty(basicdataGoodsShelfDTO) ){
 			return result;
+		}
+		if (Func.isBlank(basicdataGoodsShelfDTO.getWarehouseId())&Func.isBlank(basicdataGoodsShelfDTO.getGoodsAreaId())){
+			log.error("仓库货区信息不合法");
+			throw new RuntimeException("请完善货区信息!!!");
 		}
 			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
 			BeanUtils.copyProperties(basicdataGoodsShelfDTO,basicdataGoodsShelfEntity);
 
 			BladeUser user = AuthUtil.getUser();
+			Long userId = user.getUserId();
 			basicdataGoodsShelfEntity.setCreateTime(new Date());
 			basicdataGoodsShelfEntity.setCreateDept( Long.valueOf(user.getDeptId()));
-			basicdataGoodsShelfEntity.setCreateUser(user.getUserId());
-			basicdataGoodsShelfEntity.setUpdateTime(new Date());
-			basicdataGoodsShelfEntity.setUpdateUser(user.getUserId());
-			basicdataGoodsShelfEntity.setCreateUser(user.getUserId());
+			basicdataGoodsShelfEntity.setCreateUser(userId);
 			//数据状态默认正常
 			basicdataGoodsShelfEntity.setStatus(1);
 			//货架添加删除状态为正常
@@ -103,8 +128,15 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			basicdataGoodsShelfEntity.setGoodsShelfStatus(1);
 			//货架添加默认启用
 			basicdataGoodsShelfEntity.setEnableStatus(1);
+
+			//获取租户编码规则
+			String code = basicTenantCodeClient.shelfCode(user.getTenantId(),"8");
+			//远程feign调用获取租户的货架码编码规则
+			String shelfCode = code + "--"+basicdataGoodsShelfEntity.getGoodsShelfName();
+			basicdataGoodsShelfEntity.setQrCode(shelfCode);
 			result = SqlHelper.retBool(basicdataGoodsShelfMapper.insert(basicdataGoodsShelfEntity));
-		return result;
+
+			return result;
 	}
 
 	@Override
@@ -112,6 +144,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	public boolean updateGoodsShelfInfo(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
 		boolean result = false;
 		if (Func.isEmpty(basicdataGoodsShelfDTO) ){
+			log.error("参数异常:["+basicdataGoodsShelfDTO+"]");
 			return result;
 		}
 			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
@@ -136,10 +169,22 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		for (String id : ids) {
 			result = SqlHelper.retBool(basicdataGoodsShelfMapper.removeGoodsShelf(id));
 			if (!result){
-				throw new RuntimeException("选中货架存在待删货位!!!");
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				return false;
 			}
 		}
 		return result;
 	}
 
+	@Override
+	public boolean getQRCode(String qrCode, HttpServletResponse response) {
+		try {
+			QRCodeUtil.createCodeToOutputStream(qrCode,response);
+		}catch (Exception e){
+			log.error("二维码生成失败{"+e.getMessage()+"}");
+			return false;
+		}
+		return true;
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java

@@ -51,6 +51,7 @@ import java.util.Map;
 public class BasicdataZonePriceServiceImpl extends BaseServiceImpl<BasicdataZonePriceMapper, BasicdataZonePriceEntity> implements IBasicdataZonePriceService {
 
 	IBasicdataCostCorrelationService basicdataCostCorrelationService;
+
 	BasicdataCostCorrelationMapper basicdataCostCorrelationMapper;