Merge branch 'dev' into pre-production

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

@@ -293,4 +293,11 @@ public class DistributionStockListInfoEntity extends TenantEntity {
 	@ApiModelProperty(value = " 上架时间")
 	private Date groundingTime;
 
+	@ApiModelProperty(value = "物流公司")
+	private String logisticsCompany;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+
 }

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

@@ -369,7 +369,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 					basicdataGoodsAllocationEntity.setWarehouseId(ck);
 					//String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
 					//	String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
-					String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName() + "排-" + basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+//					String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName() + "排-" + basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+
+					String allocationCode = basicdataGoodsShelfDTO.getGoodsAreaName()+basicdataGoodsShelfDTO.getGoodsShelfName() + basicdataGoodsAllocationEntity.getLayerNum() + "层" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+
 					basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 //				basicdataGoodsAllocationEntity.setAllocationStatuc("1");
 //				basicdataGoodsAllocationEntity.setEnableStatus("1");
@@ -853,7 +856,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 			basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 			basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
-			String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName() + "排-" + basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+			String allocationCode = basicdataGoodsShelfDTO.getGoodsAreaName()+basicdataGoodsShelfDTO.getGoodsShelfName() + basicdataGoodsAllocationEntity.getLayerNum() + "层" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
 			basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 			basicdataGoodsAllocationEntity.setWarehouseId(ck);
 			arrayList.add(basicdataGoodsAllocationEntity);

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java

@@ -162,7 +162,7 @@ public class SyncWarehouseData {
 							entity.setAllocationStatus("1");
 							entity.setLayerNum(floor);
 							entity.setColumnNum(row);
-							entity.setQrCode(shelfEntity.getTitle()+"排"+floor+"层"+row+"列");
+							entity.setQrCode(goodsAreaEntity.getHeadline()+"区"+shelfEntity.getTitle()+"排"+floor+"层"+row+"列");
 							entity.setOldId(locationId);
 							Long newLocationId = basicdataGoodsAllocationClient.addLocation(entity);
 							if(Objects.isNull(newLocationId)){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -429,6 +429,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			distributionStockListInfo.setQuantityStock(num);
 			distributionStockListInfo.setStorageLocation(warehousingDetail.getAllocationName() == null || Func.isEmpty(warehousingDetail.getAllocationName()) ? warehousingDetail.getTrayName() : warehousingDetail.getAllocationName());
 			distributionStockListInfo.setId(null);
+			distributionStockListInfo.setLogisticsCompany(warehousingEntryDTO.getLogisticsCompany());
+			distributionStockListInfo.setRemark(warehousingEntryDTO.getRemark());
 			return distributionStockListInfoClient.addStockListInfoEntity(distributionStockListInfo);
 		}
 	}