From 230e9595063dac5e221d51fef80723f6bc989a8e Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Sat, 19 Aug 2023 16:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/stockup/StockupTypeConstant.java          | 4 ----
 .../service/impl/DistributionReservationServiceImpl.java      | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/stockup/StockupTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/stockup/StockupTypeConstant.java
index 6927f8b68..ecffcfc69 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/stockup/StockupTypeConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/stockup/StockupTypeConstant.java
@@ -4,8 +4,6 @@ package org.springblade.common.constant.stockup;
  * 备货任务指派状态枚举
  * 对应码表
  * stock_assign_status
- * 备货任务类型
- * 对应码表
  * stockup_status
  * @author pref
  */
@@ -13,8 +11,6 @@ public enum StockupTypeConstant {
 
 	shangpei("商配","1"),
 	shipei("市配","2"),
-	shipei("市配","1"),
-	shangpei("商配","2"),
 	ziti("自提","3");
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 236bb3917..62ac88b0f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -35,6 +35,7 @@ import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionReservationWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import com.logpm.distribution.wrapper.DistributionStockListWrapper;
+import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.delivery.DeliveryStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
@@ -768,7 +769,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionDeliveryListEntity.setOrderNumber(orderNum.get());
 		distributionDeliveryListEntity.setType(DistributionTypeConstant.shipie.getValue());
 		distributionDeliveryListEntity.setOrderCode(String.join(",", hashSet));
-		distributionDeliveryListEntity.setTaskTime(allocationDTO.getTaskTime());
+//		distributionDeliveryListEntity.setTaskTime(allocationDTO.getTaskTime());
 		distributionDeliveryListEntity.setNoteNumber(Func.random(13, RandomType.INT));
 		String taskTime = allocationDTO.getTaskTime();
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");