Merge branch 'dev' into pre-production

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

@@ -158,7 +158,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 		String content = "";
 		if (Objects.isNull(basicdataStoreContact.getId())){
 			//新增
-			content = "新增品牌-->["+basicdataStoreContact.getLinkman()+"]";
+			content = "新增联系人-->["+basicdataStoreContact.getLinkman()+"]";
 		}else {
 			//修改
 			BasicdataStoreContactEntity contactEntity = this.getById(basicdataStoreContact.getId());

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

@@ -118,7 +118,7 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		basicdataClientLogEntity.setOperator(AuthUtil.getNickName());
 		String content = "";
 		if (Objects.isNull(basicdataTripartiteMall.getId())) {
-			String str = basicdataTripartiteMall.getTripartiteCoding().isEmpty() ? "空" : basicdataTripartiteMall.getTripartiteCoding();
+			String str = Func.isEmpty(basicdataTripartiteMall.getTripartiteCoding()) ? "空" : basicdataTripartiteMall.getTripartiteCoding();
 			//新增
 			content = "新增三方商场-->[名称:" + basicdataTripartiteMall.getTripartiteMall() + ",编码:" + str + ",品牌:" + basicdataTripartiteMall.getBrandName() + "]";
 			basicdataClientLogEntity.setContent(content);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -172,6 +172,12 @@
             <if test="param.pickupBatch != null and param.pickupBatch != ''">and dbl.pickup_batch like
                 concat('%',#{param.pickupBatch},'%')
             </if>
+            <if test="param.pickUpTime != null and param.pickUpTime != ''">and
+                DATE_FORMAT(pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
+            </if>
+            <if test="param.pickUpTimeStart != null and param.pickUpTimeStart != ''">and
+                AND DATE_FORMAT(pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
+            </if>
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
                 and dbl.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java

@@ -53,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -254,6 +255,7 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 			.ne(DistrilbutionBillStockEntity::getOrderStatus, "2")
 		);
 		List<Long> ids = new ArrayList<>();
+		List<Long> completeIds = new ArrayList<>();
 		if (Func.isNotEmpty(entityList)){
 			for (DistrilbutionBillStockEntity distrilbutionBillStockEntity : entityList) {
 				List<DistrilbutionBillPackageEntity> packageEntities = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
@@ -266,9 +268,13 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 					ids.add(distrilbutionBillStockEntity.getId());
 				}else {
 					int sum = packageEntities.stream().mapToInt(DistrilbutionBillPackageEntity::getPacketNumber).sum();
+					int planNum = packageEntities.stream().mapToInt(DistrilbutionBillPackageEntity::getPacketNumber).sum();
 					if (sum == 0){
 						ids.add(distrilbutionBillStockEntity.getId());
 					}
+					if (Objects.equals(sum,planNum)){
+						completeIds.add(distrilbutionBillStockEntity.getId());
+					}
 				}
 			}
 		}
@@ -278,6 +284,12 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 				.in(DistrilbutionBillStockEntity::getId, ids)
 			);
 		}
+		if (Func.isNotEmpty(completeIds)){
+			this.update(new UpdateWrapper<DistrilbutionBillStockEntity>().lambda()
+				.set(DistrilbutionBillStockEntity::getConditions, "30")
+				.in(DistrilbutionBillStockEntity::getId, completeIds)
+			);
+		}
 	}
 
 	@Override