修改品牌选择

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

@@ -77,7 +77,7 @@ public class BasicdataStoreBrandEntity extends TenantEntity {
 	/**
 	 * 客户名称
 	 */
-	@ApiModelProperty(value = "品牌ID")
+	@ApiModelProperty(value = "客户ID")
 	private Long clientId;
 
 

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

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
@@ -61,8 +62,8 @@ public interface BasicdataStoreBrandMapper extends BaseMapper<BasicdataStoreBran
 
 	/**
 	 * 查询品牌名称
-	 * @param name
+	 * @param queryWrapper
 	 * @return
 	 */
-    List<BasicdataStoreBrandVO> listNameBrand(String name);
+    List<BasicdataStoreBrandVO> listNameBrand(@Param("ew") QueryWrapper<BasicdataStoreBrandEntity> queryWrapper);
 }

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

@@ -15,11 +15,12 @@
         WHERE  concat(lbs.store_name,lbb.brand_name) like concat('%',#{name},'%')
     </select>
     <select id="listNameBrand" resultType="com.logpm.basicdata.vo.BasicdataStoreBrandVO">
-        select lbsb.tenant_id, lbsb.create_user, lbsb.create_time, lbsb.update_user, lbsb.update_time, lbsb.status, lbsb.is_deleted, lbsb.create_dept, lbsb.id, lbsb.reserve1,
+        select lbsb.tenant_id tenantId, lbsb.create_user createUser, lbsb.create_time createTime, lbsb.update_user updateUser,
-               lbsb.reserve2,lbsb.reserve3, lbsb.reserve4, lbsb.reserve5, lbsb.shop_id, lbsb.brand_id, lbb.brand_name brandName,lbsb.client_id
+        lbsb.update_time updateTime, lbsb.status, lbsb.is_deleted isDeleted, lbsb.create_dept createDept, lbsb.id, lbsb.reserve1,
+               lbsb.reserve2,lbsb.reserve3, lbsb.reserve4, lbsb.reserve5, lbsb.shop_id shopId, lbsb.brand_id brandId, lbb.brand_name brandName,lbsb.client_id clientId
         from logpm_basicdata_store_brand lbsb
                  LEFT JOIN logpm_basicdata_brand lbb on lbsb.brand_id = lbb.id
-        WHERE  lbb.brand_name like concat('%',#{name},'%')
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectBasicdataStoreBrandPage" resultMap="basicdataStoreBrandResultMap">

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

@@ -17,7 +17,9 @@
 package com.logpm.basicdata.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
 import com.logpm.basicdata.excel.BasicdataStoreBrandExcel;
@@ -93,15 +95,29 @@ public class BasicdataStoreBrandServiceImpl extends BaseServiceImpl<BasicdataSto
 		log.info("接收的参数为=》》{}",basicdataStoreBrand);
 		Object o1 = basicdataStoreBrand.get("brandName");//品牌名称
 		Object o = basicdataStoreBrand.get("ids"); // 客户id
+		Object type = basicdataStoreBrand.get("type"); // 客户id
 		List<BasicdataStoreBrandVO> voList = new ArrayList<>();
-		if(Func.isNotEmpty(o1) && Func.isNotEmpty(o)){
+		if(Func.isNotEmpty(o)){
 			String o2 = (String) o;
 			List<String> l = Arrays.asList(o2.split(","));
-			List<BasicdataStoreBrandVO> listAll =  new ArrayList<>();
+//			List<BasicdataStoreBrandVO> listAll =  new ArrayList<>();
-			List<BasicdataStoreBrandVO> basicdataStoreBrandVOS = baseMapper.listNameBrand(o1.toString()); // 查询相关品牌信息
+
 			//查询客户相关的品牌
 			l.forEach(i ->{
-				List<BasicdataStoreBrandEntity> basicdataStoreBrandEntities = baseMapper.selectList(Wrappers.<BasicdataStoreBrandEntity>query().lambda()
+				QueryWrapper<BasicdataStoreBrandEntity> queryWrapper = new QueryWrapper<>();
+				if(type.equals("1")){
+					//客户
+					queryWrapper.apply(ObjectUtils.isNotNull(o1),"lbb.brand_name like concat('%',{0},'%') ",o1);
+					queryWrapper.apply("lbsb.client_id ={0} ",i);
+				}else{
+					//门店
+					//客户
+					queryWrapper.apply(ObjectUtils.isNotNull(o1),"lbb.brand_name like concat('%',{0},'%') ",o1);
+					queryWrapper.apply("lbsb.shop_id ={0} ", i);
+				}
+				List<BasicdataStoreBrandVO> basicdataStoreBrandVOS = baseMapper.listNameBrand(queryWrapper ); // 查询相关品牌信息
+				voList.addAll(basicdataStoreBrandVOS);
+			/*	List<BasicdataStoreBrandEntity> basicdataStoreBrandEntities = baseMapper.selectList(Wrappers.<BasicdataStoreBrandEntity>query().lambda()
 					.eq(BasicdataStoreBrandEntity::getClientId, i)
 				);
 				if(basicdataStoreBrandEntities.size() > 0){
@@ -111,9 +127,9 @@ public class BasicdataStoreBrandServiceImpl extends BaseServiceImpl<BasicdataSto
 						return b;
 					}).collect(Collectors.toList());
 					listAll.addAll(collect);
-				}
+				}*/
 			});
-			Map<String, Long> collect = listAll.stream().collect(Collectors.groupingBy(p -> p.getBrandId(), Collectors.counting()));
+		/*	Map<String, Long> collect = listAll.stream().collect(Collectors.groupingBy(p -> p.getBrandId(), Collectors.counting()));
 			collect.forEach((k, v) -> System.out.println(k + ":" + v));
 
 			collect.forEach((k,v) ->{
@@ -128,7 +144,7 @@ public class BasicdataStoreBrandServiceImpl extends BaseServiceImpl<BasicdataSto
 					voList.addAll(coll);
 				}
 
-			});
+			});*/
 
 		}
 		return voList;

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

@@ -156,6 +156,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			WarehouseWarehousingEntryEntity warehouseWarehousingEntry = new WarehouseWarehousingEntryEntity();
 			BeanUtil.copyProperties(warehouseWarehousingEntryDTO,warehouseWarehousingEntry);
 			WarehouseWarehousingEntryEntity entryEntity = new WarehouseWarehousingEntryEntity();
+			BeanUtil.copyProperties(warehouseWarehousingEntryDTO,entryEntity);
 			//入库批次号
 			if(ObjectUtils.isNull( warehouseWarehousingEntry.getReceiptBatch() )){
 				long time = new Date().getTime();
@@ -185,10 +186,10 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 									WarehouseWarehousingDetailEntity detailEntity = new WarehouseWarehousingDetailEntity();
 									detailEntity.setId(i.getId());
 									detailEntity.setActualReceipt(next.getActualReceipt()); //实际
-									if(next.getActualReceipt().equals(i.getCreateInventory())){
+									if(next.getActualReceipt().equals(i.getCreateInventory()) ||  next.getActualReceipt() > i.getCreateInventory()){
 										detailEntity.setConditions("3");
 										num.updateAndGet(v -> v + 1);
-									}else{
+									}else if(next.getActualReceipt() > 0 ){
 										detailEntity.setConditions("2");
 										entryEntity.setConditions("2");
 										warehouseWarehousingEntry.setConditions("2");
@@ -203,9 +204,12 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 							}
 
 						}else{
+							if(i.getConditions().equals("1")){
 								//删除
 								detailEntityList.add(i.getId());
 							}
+
+						}
 					});
 					Integer teger = num.get();
 					if(list1.size() == teger){
@@ -282,7 +286,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 			distributionStockListEntity.setUnpack(false);
 //			distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID
-			distributionStockListEntity.setOrderCode(warehousingEntryDTO.getOrderNumber()); //订单自编号
+			distributionStockListEntity.setOrderCode(Optional.ofNullable(warehousingEntryDTO.getOrderNumber()).orElse(null)); //订单自编号
 			distributionStockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch()); //入库批次号
 //			distributionStockListEntity.setServiceNumber("服务号"); //服务号
 			distributionStockListEntity.setDescriptionGoods(warehousingDetail.getProductName()); //货物名称
@@ -290,6 +294,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			distributionStockListEntity.setWarehouseId(warehousingEntryDTO.getWarehouseId()); //仓库ID
 			distributionStockListEntity.setMarketId(warehousingEntryDTO.getClientId()); //商场及客户
 			distributionStockListEntity.setCargoUnit(warehousingDetail.getProductUnit()); //货物单位
+			distributionStockListEntity.setWarehousingTime(warehousingEntryDTO.getReceiptDate()); //入库时间
+			distributionStockListEntity.setLicensePlate(Optional.ofNullable(warehousingEntryDTO.getLicensePlate()).orElse(null)); //车牌
 			if(Func.isNotEmpty(warehousingEntryDTO.getStoreId())){
 				distributionStockListEntity.setStoreId(warehousingEntryDTO.getStoreId()); //门店
 			}