码表值调整

blade-biz-common/src/main/java/org/springblade/common/constant/DistributionTypeConstant.java

@@ -7,8 +7,8 @@ package org.springblade.common.constant;
  */
 public enum DistributionTypeConstant {
 
-	shipie("市配","1"),
+	shangpei("商配","1"),
-	shangpei("商配","2"),
+	shipie("市配","2"),
 	ziti("自提","3");
 
 

blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationDeliveryTypeConstant.java

@@ -0,0 +1,48 @@
+package org.springblade.common.constant.reservation;
+
+/**
+ * 预约单状态枚举
+ * 对应码表
+ * resvervation_status
+ * @author pref
+ */
+public enum ReservationDeliveryTypeConstant {
+
+	songhuo("送货","10"),
+	songhuoshanglou("送货上楼","20"),
+	songzhuangyiti("送装一体","30"),
+	zhuang("装","40");
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private ReservationDeliveryTypeConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

blade-biz-common/src/main/java/org/springblade/common/constant/reservation/ReservationStockupStatusConstant.java

@@ -9,8 +9,8 @@ package org.springblade.common.constant.reservation;
 public enum ReservationStockupStatusConstant {
 
 	weibeihuo("未备货","10"),
-	daibeihuo("待备货","10"),
+	daibeihuo("待备货","20"),
-	yibeihuo("已备货","10");
+	yibeihuo("已备货","30");
 
 
 

blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java

@@ -253,6 +253,15 @@ public interface ServiceConstant {
 //	//已预约
 //	String ORDER_RESERVATION_STATE_RESERVED="30";
 
+	/**
+	 * 包件预约状态
+	 */
+	//待预约
+	String PACKAGE_RESERVATION_STATE_NOT="10";
+
+	//已预约
+	String PACKAGE_RESERVATION_STATE_RESERVED="20";
+
 
 
 

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

@@ -1296,9 +1296,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									//统计包件的数量
 									packageTotal.getAndAdd(p.getQuantity());
 									//TODO 这里还需要对包件状态进行修改
-
 								});
-
 							}
 							reservationStockarticleEntity.setReservationNum(packageTotal.get());
 							distributionReservationStockarticleService.save(reservationStockarticleEntity);

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

@@ -27,6 +27,19 @@ import com.logpm.distribution.excel.DistributionReservationExcel;
 import com.logpm.distribution.mapper.*;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
+import org.springblade.common.constant.DistributionTypeConstant;
+import org.springblade.common.constant.delivery.DeliveryStatusConstant;
+import org.springblade.common.constant.order.OrderReservationStatusConstant;
+import org.springblade.common.constant.order.OrderStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
+import org.springblade.common.constant.reservation.ReservationDeliveryTypeConstant;
+import org.springblade.common.constant.reservation.ReservationStatusConstant;
+import org.springblade.common.constant.reservation.ReservationStockupStatusConstant;
+import org.springblade.common.constant.signing.SignforStatusConstant;
+import org.springblade.common.constant.stockup.StockAssignStatusConstant;
+import org.springblade.common.constant.stockup.StockupStatusConstant;
+import org.springblade.common.serviceConstant.ServiceConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
@@ -149,7 +162,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		} else {
 			log.error("sql执行错误+{" + result + "}");
 			return null;
-
 		}
 	}
 
@@ -195,9 +207,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
 		Func.copy(distributionReservationDTO, reservationEntity);
 		//新建预约单为待确认状态
-		reservationEntity.setReservationStatus(ServiceConstant.RESERVATION_STATE_WAIT_CONFIRM);
+		reservationEntity.setReservationStatus(ReservationStatusConstant.daiqueren.getValue());
 		//新建预约单订单处于未备货状态
-		reservationEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
+		reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 		this.save(reservationEntity);
 		//获取新增预约信息的编号
 		Long reservationId = reservationEntity.getId();
@@ -240,11 +252,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							packageNum.getAndAdd(p.getQuantity());
 							//修改订单下的包件状态
 //							p.setOrderPackageReservationStatus();
-							p.setOrderPackageStatus(ServiceConstant.PACKAGE_STATUS_RESERVATION);
+							p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 							distributionParcelListService.updateById(p);
-							stockArticleEntity.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED);
+//							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 						});
-						s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED);
+						s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 					s.setAvailableQuantity(0);
 				} else {
 					//维护选中的包件信息
@@ -255,11 +267,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
 						distributionReservationPackageMapper.insert(distributionReservationPackageEntity);
 						packageNum.getAndAdd(p.getQuantity());
-						p.setOrderPackageStatus(ServiceConstant.PACKAGE_STATUS_RESERVATION);
+						p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 //						p.setBrandId(p.getBrandId());
 						distributionParcelListService.updateById(p);
 					});
-					s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_PART);
+//					s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_PART);
 					//设置订单可用数量为
 					s.setAvailableQuantity(s.getHandQuantity() - s.getReservationNum());
 					//这里查询到当前订单下的包件信息和选中包件进行比对，如果数量一致那么说明该订单是已预约状态、否则为部分预约状态
@@ -267,7 +279,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw);
 					if (packageList.size() == parcelListEntities.size()){
 						//这里就是表示进行了包件选取的操作，但是选取的包件数量为全部
-						s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED);
+						s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+					}else {
+						s.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+
 					}
 				}
 				distributionReservationStockarticleEntity.setReservationNum(packageNum.get());
@@ -341,7 +356,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		String random = Func.random(13, RandomType.ALL);
 		reservationEntity.setReservationCode(random);
 		//设置预约为市配
-		reservationEntity.setDeliveryType(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
+		reservationEntity.setDeliveryType(DistributionTypeConstant.shipie.getValue());
 		//设置预约配送方式为送货
 		reservationEntity.setDeliveryWay(ServiceConstant.DELIVERY_GOODS_WAY);
 		reservationEntity.setServiceNumber(String.join(",", serviceNumber));
@@ -375,11 +390,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			stockupEntity.setStockupArea(stockupAreaName);
 			stockupEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
 			//设置备货任务指派状态---未指派
-			stockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE);
+			stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
 			//设置备货任务状态---未备货
-			stockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
+			stockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
 			//设置订单类型提交给备货任务
-			stockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
+			stockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
 			//设置备货任务备货时间
 			stockupEntity.setStockupDate(date);
 			//保存备货任务数据获取备货数据ID
@@ -393,7 +408,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					return R.fail("预约信息状态异常!!!");
 				}
 				//修改预约备货状态
-				reservationEntity.setStockupStatus(ServiceConstant.STOCKUP_STATE_WAIT_EXECUTION);
+				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 //				reservationEntity.setGoodsAreaName(stockupAreaName);
 //				reservationEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
 				result = SqlHelper.retBool(distributionReservationMapper.updateById(reservationEntity));
@@ -456,15 +471,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		if (!flag){
 			BladeUser user = AuthUtil.getUser();
 			distributionStockupEntity.setStockupUser(user.getUserName());
-			distributionStockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ALREADY);
+			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.yizhipai.getValue());
 			distributionStockupEntity.setAssignTime(new Date());
 			distributionStockupEntity.setStockupUser(user.getUserName());
 			distributionStockupEntity.setStockupUserId(user.getUserId());
 			distributionStockupEntity.setForkliftId(stockup.getForkliftId());
 			distributionStockupEntity.setForkliftName(stockup.getForkliftName());
 			distributionStockupEntity.setStockupUser(AuthUtil.getUserId().toString());
-			distributionStockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
+			distributionStockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
-			distributionStockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
+			distributionStockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
 			distributionStockupService.save(distributionStockupEntity);
 		}else {
 			//这里就是未填写备货信息
@@ -514,7 +529,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					Long stockupId = distributionStockupInfoEntity.getStockupId();
 					DistributionStockupEntity stockupEntity = distributionStockupService.getById(stockupId);
 					//2、预约单存在备货任务还未指派
-					if (Func.equals(stockupEntity.getAssignStatus(), ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE)) {
+					if (Func.equals(stockupEntity.getAssignStatus(), StockAssignStatusConstant.weizhipai.getValue())) {
 						//备货任务只存在一个,对该备货任务进行删除
 						//查询备货任务下是否具有
 						Long id = distributionStockupInfoEntity.getStockupId();
@@ -535,11 +550,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionSignforEntity.setTrainNumber(random);
 			distributionSignforEntity.setReservationId(reservationEntity.getId());
 			distributionSignforEntity.setDeliveryId(distributionDeliveryListEntity.getId());
-			distributionSignforEntity.setSigningStatus(ServiceConstant.CLERK_SIGNING_STATUS_NOT);
+			distributionSignforEntity.setSigningStatus(SignforStatusConstant.daiqianshou.getValue());
-			distributionSignforEntity.setDriverSigning(ServiceConstant.DRIVER_SIGNING_STATUS_NOT);
+			distributionSignforEntity.setDriverSigning(SignforStatusConstant.daiqianshou.getValue());
 			distributionSignforService.save(distributionSignforEntity);
 			//修改预约信息为待配送
-			reservationEntity.setReservationStatus(ServiceConstant.RESERVATION_STATE_WAIT_DELIVERY);
+			reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
 			//预约订单数量
 			orderNum.getAndAdd(reservationEntity.getStockArticleId().split(",").length);
 			//统计包件数量
@@ -569,7 +584,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					if (stockArticleEntity.getHandQuantity() > r.getReservationNum()) {
 						//这里表示订单下的包件没有进行全部配送
 						//修改订单状态为部分配送
-						stockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_FOUR);
+//						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
 						//修改订单的在库数量
 						stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - r.getReservationNum());
 						//对订单进行修改
@@ -645,7 +660,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionDeliveryListEntity.setVehicleName(vehicleNubs.deleteCharAt(vehicleNubs.length() - 1).toString());
 		}
 		//对配送信息进行修改
-		distributionDeliveryListEntity.setState(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
+		distributionDeliveryListEntity.setDeliveryState(DeliveryStatusConstant.daipeisong.getValue());
 //			distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
 //			distributionDeliveryListEntity.setForkliftName(stockup.getForkliftName());
 //			distributionDeliveryListEntity.setForkliftId(stockup.getForkliftId().toString());
@@ -654,14 +669,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //			distributionDeliveryListEntity.setLoadingTeamType(stockup.getLoadAndUnload());
 		distributionDeliveryListEntity.setCustomersNumber(reservationIds.split(",").length);
 		distributionDeliveryListEntity.setOrderNumber(orderNum.get());
-		distributionDeliveryListEntity.setType(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
+		distributionDeliveryListEntity.setType(DistributionTypeConstant.shipie.getValue());
 		distributionDeliveryListEntity.setOrderCode(String.join(",", hashSet));
 		if (orderIds.length() > 1) {
 			distributionDeliveryListEntity.setOrderId(orderIds.deleteCharAt(orderIds.length() - 1).toString());
 		}
 		distributionDeliveryListEntity.setReservationId(reservationIds);
 		distributionDeliveryListEntity.setDeliveryNumber(packageNum.get());
-		distributionDeliveryListEntity.setType(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
+//		distributionDeliveryListEntity.setType(DistributionTypeConstant.shipie.getValue());
 
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		return R.status(true);
@@ -753,6 +768,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		if (!Func.isEmpty(reservationPackageEntityList)) {
 			//对已有预约信息的订单包件数量进行清理
 			reservationPackageEntityList.forEach(p1 -> {
+				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p1.getParceListId());
+				//todo 这里需要将包件状态设置成未预约；备货信息设置为未备货
+//				parcelListEntity.setOrderPackageReservationStatus();
+
 				//这里对原表进行物理删除
 				distributionReservationPackageMapper.deleteReservationPackage(distributionReservationDTO.getId());
 			});
@@ -784,6 +803,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
 						//维护订单下包件信息
 						distributionReservationPackageService.save(distributionReservationPackageEntity);
+						// todo 改变包件的预约信息为已预约
+//						p.setOrderPackageReservationStatus();
 					});
 					//设置订单可用数为0
 					s.setAvailableQuantity(0);
@@ -797,8 +818,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
 						distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
 						distributionReservationPackageService.save(distributionReservationPackageEntity);
+						// todo 改变包件的预约信息为已预约
+//						p.setOrderPackageReservationStatus();
 					});
 					s.setAvailableQuantity(s.getAvailableQuantity() - s.getReservationNum());
+					// todo 这里进行选取的包件和订单的包件进行比对，如果选取的包件数量和订单本身的数量一致，那么订单的状态为已预约，如果选取的和订单下的包件长度少那么订单的状态为部分预约
 				}
 				DistributionReservationStockarticleEntity distributionReservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 				//构建预约订单中间表信息
@@ -858,22 +882,20 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		if (!Func.isBlank(stockup.getForkliftName())){
 			stockupEntity.setForkliftId(stockupEntity.getForkliftId());
 			stockupEntity.setForkliftName(stockupEntity.getForkliftName());
-			stockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ALREADY);
+			stockupEntity.setAssignStatus(StockAssignStatusConstant.yizhipai.getValue());
-			stockupEntity.setStockupStatus(ServiceConstant.STOCKUP_STATE_WAIT_EXECUTION);
 		}else {
-			stockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE);
+			stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
-			stockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
 		}
+		stockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
 		BladeUser user = AuthUtil.getUser();
 		stockupEntity.setStockupUser(user.getUserName());
 		stockupEntity.setStockupUserId(user.getUserId());
-		//TODO 这里需要获取具体的哪一个人进行备货操作
 		stockupEntity.setStockupUser(user.getUserName());
 		stockupEntity.setLoaderId(stockup.getLoaderId());
 		stockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
 		stockupEntity.setStockupDate(stockup.getStockupDate());
 		//设置类型为商配
-		stockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_BUSINESS);
+		stockupEntity.setTypeService(DistributionTypeConstant.shangpei.getValue());
 		stockupEntity.setAssignTime(new Date());
 		//2、添加备货任务
 		distributionStockupService.save(stockupEntity);
@@ -882,8 +904,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		String str = Func.random(7, RandomType.ALL) + DateUtil.today();
 
 		distributionDeliveryListEntity.setTrainNumber(str);
-		distributionDeliveryListEntity.setType(ServiceConstant.DELIVERY_TYPE_BUSINESS);
+		distributionDeliveryListEntity.setType(DistributionTypeConstant.shangpei.getValue());
-		distributionDeliveryListEntity.setState(ServiceConstant.DELIVERLIST_STATE_WAIT);
+		distributionDeliveryListEntity.setDeliveryState(DeliveryStatusConstant.daipeisong.getValue());
 		distributionDeliveryListService.save(distributionDeliveryListEntity);
 		//获取所有订单
 		List<DistributionStockArticleDTO> stockArticle = allocationDTO.getStockArticle();
@@ -919,9 +941,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				reservationEntity.setConsignee(k);
 				reservationEntity.setDeliveryAddress(v.get(0).getCustomerAddress());
 				reservationEntity.setDeliveryPhone(v.get(0).getCustomerTelephone());
-				reservationEntity.setDeliveryType(ServiceConstant.DELIVERY_TYPE_BUSINESS);
+				reservationEntity.setDeliveryType(ReservationDeliveryTypeConstant.songhuo.getValue());
-				reservationEntity.setReservationStatus(ServiceConstant.RESERVATION_STATE_WAIT_DELIVERY);
+				reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
-				reservationEntity.setStockupStatus(ServiceConstant.STOCKUP_STATE_WAIT_EXECUTION);
+				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 				reservationEntity.setGoodsAreaId(stockupEntity.getGoodsAreaId());
 				//默认配送时间为全天
 				reservationEntity.setPeriodOfTime(ServiceConstant.RESERVATION_PERIOED_TIME_DAY);
@@ -947,8 +969,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						stockArticleEntity.setStoreId(null);
 					}
 					//维护订单数据，订单状态直接变更未待配送
-					stockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_WAIT_DELIVERY);
+//					stockArticleEntity.setOrderStatus();
-					distributionStockArticleService.updateById(stockArticleEntity);
+//					distributionStockArticleService.updateById(stockArticleEntity);
 					orderSelfNumbering.append(stockArticleEntity.getOrderCode()).append(",");
 					//订单数量累加
 					AtomicInteger packageCount = new AtomicInteger();
@@ -999,14 +1021,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				reservationEntity.setStockArticleId(orderSelfNumbering.deleteCharAt(orderSelfNumbering.length() - 1).toString());
 				//预约添加订单数量
 				reservationEntity.setReservationNum(packageNum.get());
-				reservationEntity.setReservationCode(ServiceConstant.RESERVATION_STATE_WAIT_DELIVERY);
+//				reservationEntity.setReservationCode(ServiceConstant.RESERVATION_STATE_WAIT_DELIVERY);
 				this.updateById(reservationEntity);
 				DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
 				distributionSignforEntity.setReservationId(reservationEntity.getId());
 				distributionSignforEntity.setTrainNumber(str);
 				distributionSignforEntity.setDeliveryId(distributionDeliveryListEntity.getId());
-				distributionSignforEntity.setSigningStatus(ServiceConstant.CLERK_SIGNING_STATUS_NOT);
+				distributionSignforEntity.setSigningStatus(SignforStatusConstant.daiqianshou.getValue());
-				distributionSignforEntity.setDriverSigning(ServiceConstant.DRIVER_SIGNING_STATUS_NOT);
+				distributionSignforEntity.setDriverSigning(SignforStatusConstant.daiqianshou.getValue());
 				distributionSignforService.save(distributionSignforEntity);
 			}
 		});

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

@@ -393,7 +393,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			Integer aLong2 = 0;
 			distributionAppDeliveryListVO.setVehicleStatus_name("已配车");
 			distributionAppDeliveryListVO.setDeliStatus_name("配送中");
-			if (distributionAppDeliveryListVO.getState().equals("4")){distributionAppDeliveryListVO.setDeliStatus_name("完成");}
+			if (distributionAppDeliveryListVO.getDeliveryState().equals("4")){distributionAppDeliveryListVO.setDeliStatus_name("完成");}
 			if (distributionAppDeliveryListVO.getKind().equals("1")){
 				aLong = distributionDeliverySelfMapper.selectCount(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
 					.eq(DistributionDeliverySelfEntity::getDeliveryId, distributionAppDeliveryListVO.getId())

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

@@ -202,7 +202,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			for (String s : split) {
 				DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity();
 				distributionStockArticle.setId(Long.parseLong(s));
-				distributionStockArticle.setOrderStatus(ServiceConstant.ORDER_STATE_TWO);
+//				distributionStockArticle.setOrderStatus(ServiceConstant.ORDER_STATE_TWO);
 				distributionStockArticleService.updateById(distributionStockArticle);
 				//添加订单和提货单关联
 				DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
@@ -249,9 +249,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			});
 			distributionDeliveryChargeService.saveBatch(listEntity);
 		}
-
-
-
 		return true;
 	}