From dd6b1f12c37f302525abbed0bafa6661c2c62ecf Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 21 May 2024 19:22:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95BUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseWarehousingEntryServiceImpl.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index e4614eedd..38cb4ccc5 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -357,6 +357,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			BeanUtil.copyProperties(entity, distributionStockListInfo);
 			distributionStockListInfo.setSourceType("2");//导入
 			distributionStockListInfo.setQuantityStock(num);
+			distributionStockListInfo.setId(null);
 			return distributionStockListInfoClient.addStockListInfoEntity(distributionStockListInfo);
 		}
 

From 112110f92471b894c05beef2150aaa1069abb139 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Wed, 22 May 2024 09:36:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E4=BD=93=E7=B3=BB=E6=97=B6=E9=97=B4=E8=BE=B9=E7=95=8C?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasicdataPriceServiceImpl.java       | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
index f8111857b..84da64314 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
@@ -217,7 +217,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 	public Boolean deletePrice(String id) {
 		BasicdataPriceEntity entity = this.getById(id);
 		if (ObjectUtil.isNotEmpty(entity)) {
-			if (new Date().before(entity.getEffectiveTime())) {
+			if (DateUtil.beginOfDay(new Date()).before(entity.getEffectiveTime())) {
 				this.removeById(id);
 				return Boolean.TRUE;
 			} else {
@@ -234,6 +234,9 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		if (DateUtil.compare(vo.getEffectiveTime(), vo.getExpiryTime()) > 0) {
 			throw new ServiceException("生效时间大于到期时间，请检查。");
 		}
+		if (DateUtil.beginOfDay(new Date()).isAfter(vo.getExpiryTime())) {
+			throw new ServiceException("到期时间不能小于当前时间，请检查。");
+		}
 		// 只能维护当前时间的版本，时间范围必须包含当前时间
 		Long clientId1 = vo.getClientId();
 		Long brandId1 = vo.getBrandId();
@@ -293,24 +296,6 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			entity.setClientId(vo.getClientId());
 			entity.setBrandId(vo.getBrandId());
 		}
-//		if (ObjectUtil.isNotEmpty(vo.getId())) {
-//			entity = this.getById(vo.getId());
-//			if (ObjectUtil.isNotEmpty(entity)) {
-//				Long templateId = entity.getTemplateId();
-//				if (!ObjectUtil.equal(templateId, vo.getTemplateId())) {
-//					// 删除数据
-//					deleteByPriceId(vo.getId());
-//					entity.setDispatchStairsCarryingCharge(0);
-//					entity.setDispatchUpwardJudgment(0d);
-//					entity.setDispatchUpwardJudgmentCost(0d);
-//					log.info("价格体系：{} 切换模版删除数据", vo.getId());
-//				}
-//			}
-//		} else {
-//			entity = new BasicdataPriceEntity();
-//			entity.setClientId(vo.getClientId());
-//			entity.setBrandId(vo.getBrandId());
-//		}
 		entity.setTemplateId(vo.getTemplateId());
 		entity.setEffectiveTime(vo.getEffectiveTime());
 		entity.setExpiryTime(vo.getExpiryTime());
@@ -438,8 +423,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				.le(BasicdataPriceEntity::getEffectiveTime, DateUtil.parse(param.getTime(), "yyyy-MM-dd"))
 			;
 		} else {
-			wrapper.ge(BasicdataPriceEntity::getExpiryTime, new Date())
-				.le(BasicdataPriceEntity::getEffectiveTime, new Date())
+			wrapper.ge(BasicdataPriceEntity::getExpiryTime, DateUtil.beginOfDay(new Date()))
+				.le(BasicdataPriceEntity::getEffectiveTime, DateUtil.beginOfDay(new Date()))
 			;
 		}
 		List<BasicdataPriceEntity> priceEntities = this.list(wrapper);