From 06450d2dff6d46f3f684486b96d9ba3488717175 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Mon, 16 Oct 2023 11:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E6=9E=B6=E7=BC=96=E8=BE=91=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E7=BB=B4=E6=8A=A4qrcode=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasicdataGoodsShelfServiceImpl.java  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
index fc7de565c..ec33fb0bd 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
@@ -93,6 +93,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 
 	private IBasicdataWarehouseService basicdataWarehouseService;
 
+
+
 	private static Long ids;
 
 
@@ -331,7 +333,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	@Transactional(rollbackFor = Exception.class)
 	public R insertallocation(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
 		//这里需要根据货架的列数和层数进行货位信息的生成
-		Integer rowNum = basicdataGoodsShelfDTO.getRowNum();//列
+			Integer rowNum = basicdataGoodsShelfDTO.getRowNum();//列
 		log.info("列>>>>>>>>>>{}", rowNum);
 		Integer storeyNum = basicdataGoodsShelfDTO.getStoreyNum();//行
 		log.info("行>>>>>>>>>>{}", storeyNum);
@@ -349,6 +351,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			.eq(BasicdataGoodsAllocationEntity::getIsDeleted, 0)
 			.eq(BasicdataGoodsAllocationEntity::getGoodsShelfId, basicdataGoodsShelfDTO.getId())
 		);
+
 		if (basicdataGoodsAllocationEntities.size() <= 0) {
 			ArrayList<BasicdataGoodsAllocationEntity> arrayList = new ArrayList<>();
 			for (Integer i = 0; i < rowNum; i++) {
@@ -366,6 +369,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 					basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 					basicdataGoodsAllocationEntity.setGoodsAllocationName(layer + "-" + row);
 					basicdataGoodsAllocationEntity.setWarehouseId(ck);
+					String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
+					String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+					basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 //				basicdataGoodsAllocationEntity.setAllocationStatuc("1");
 //				basicdataGoodsAllocationEntity.setEnableStatus("1");
 					arrayList.add(basicdataGoodsAllocationEntity);
@@ -433,6 +439,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
+//							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
+							String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
 					}
@@ -475,6 +484,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(i + "-" + k);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
+//							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
+							String allocationCode =  basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
 					}
@@ -523,6 +535,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
+//							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
+							String allocationCode =  basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
 					}
@@ -619,6 +634,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
+//							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
+							String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}