商配计划编辑回显调整

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -247,11 +247,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@ApiModelProperty(value = "定位打卡地址")
 	private String positioningAdr;
 
-	/**
-	 * 定位打卡地址
-	 */
-	@ApiModelProperty(value = "定位打卡地址")
-	private String deliveryState;
+//	/**
+//	 * 定位打卡地址
+//	 */
+//	@ApiModelProperty(value = "定位打卡地址")
+//	private String deliveryState;
 
 
 

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

@@ -111,8 +111,7 @@
             ldpl.material_code,
             ldpl.material_unit,
             ldpl.brand_id,
-            ldpl.brand_name,
-            ldpl.delivery_state
+            ldpl.brand_name
         FROM
              ( SELECT reservation_id FROM logpm_distribution_signfor
              <where>

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

@@ -124,7 +124,7 @@
             ldsa.customer_telephone,
             ldsa.customer_address,
             ldsa.genre,
-            ldsa.state,
+            ldsa.order_status,
             ldsa.notification,
             ldsa.fee,
             ldsa.rate,

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

@@ -1303,7 +1303,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								//订单发生修改包件的操作，先对该预约下的订单进行解绑
 								Integer i = distributionReservationPackageMapper.deletePackageByRidAndSid(reservationEntity.getId(),o.getId());
 								//构建新的
-								if (o.getPackageList().size()==0){
+								if (!Func.isEmpty(o.getPackageList())){
 									//订单全选
 									LambdaQueryWrapper<DistributionParcelListEntity> qw = new QueryWrapper<DistributionParcelListEntity>().lambda().eq(DistributionParcelListEntity::getStockArticleId, o.getId());
 									List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw);

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

@@ -221,7 +221,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				//预约订单数量
 				AtomicInteger packageNum = new AtomicInteger();
 				List<DistributionParcelListEntity> packageList = s.getPackageList();
-				if (packageList.size() == 0) {
+				if (Func.isEmpty(packageList)) {
 						Map<String, Object> map = new HashMap<>();
 						map.put("stockArticleId", s.getId());
 						QueryWrapper<DistributionParcelListEntity> qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class);
@@ -1019,7 +1019,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //			tripartiteEntity.setReservationIds(reservationIds);
 			tripartiteEntity.setDeliveryId(distributionDeliveryListEntity.getId());
 			distributionDeliveryTripartiteService.save(tripartiteEntity);
-			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_TRIPARTITE);
+			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_SELF);
 			distributionDeliveryListEntity.setDriverName(tripartiteEntity.getDriverName());
 			distributionDeliveryListEntity.setVehicleName(tripartiteEntity.getVehicleNum());
 			distributionDeliveryListEntity.setDistributionCompany(tripartite.getDistributionCompany());