增加修改报错

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");
 
 

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");