添加自提部分接口

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

@@ -76,26 +76,26 @@ public interface ServiceConstant {
 	/**
 	 * 订单状态 -- 未预约
 	 */
-	Integer ORDER_STATE_NOT_RESERVATION =1;
+	String ORDER_STATE_NOT_RESERVATION ="1";
 	/**
 	 * 订单状态 -- 已预约
 	 */
-	Integer ORDER_STATE_ALREADY_RESERVATION =2;
+	String ORDER_STATE_ALREADY_RESERVATION ="2";
 
 	/**
 	 * 订单状态 -- 待配送
 	 */
-	Integer ORDER_STATE_WAIT_DELIVERY =3;
+	String ORDER_STATE_WAIT_DELIVERY ="3";
 
 	/**
 	 * 订单状态 -- 配送中
 	 */
-	Integer ORDER_STATE_EXECUTION_DELIVERY =4;
+	String ORDER_STATE_EXECUTION_DELIVERY ="4";
 
 	/**
 	 * 订单状态 -- 完成配送
 	 */
-	Integer ORDER_STATE_COMPLETE_DELIVERY =5;
+	String ORDER_STATE_COMPLETE_DELIVERY ="5";
 
 	/**
 	 * 订单数据 -- 无数据源

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java

@@ -98,7 +98,7 @@ public class DistributionBillLadingAppController extends BladeController {
 	}
 
 	@ApiOperation(value = "自提订单列表库存品详细包件",notes = "自提订单列表库存品详细包件")
-	@GetMapping("/getInventory")
+	@GetMapping("/getInventoryNum")
 	@ApiOperationSupport(order = 1)
 	public R<IPage<DistrilbutionBillLadingAppVO>> getInventoryNum(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query){
 		IPage<DistrilbutionBillLadingAppVO> ladingAppVOIPage = distrilbutionBillLadingService.getInventoryNum(Condition.getPage(query),distrilbutionBillLading);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -244,7 +244,7 @@ public class DistributionStockupAppController extends BladeController {
 			entity.setCoding(packetBarCode);
 			entity.setStockupArea(stockupArea);
 			entity.setReservationId(reservationId);
-			entity.setConditions(0);
+			entity.setConditions("0");
 			entity.setType(2);
 			distributionStockService.save(entity);
 
@@ -289,7 +289,7 @@ public class DistributionStockupAppController extends BladeController {
 			entity.setStockupArea(stockupArea);
 			entity.setReservationId(reservationId);
 			entity.setStockListId(stockListId);
-			entity.setConditions(0);
+			entity.setConditions("0");
 			entity.setType(2);
 			distributionStockService.save(entity);
 

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

@@ -139,8 +139,8 @@
         select ldsa.id,ldsa.order_self_numbering orderSelfNumbering,ldsa.description_goods descriptionGoods,ldsa.total_number totalNumber,
                ldbl.stockup_status stockupStatus,ldbl.stockip_allocation stockipAllocation,
                 ( select count(*)
-                 from logpm_distribution_stockup_scan ldss
-                 where ldss.parcel_list_id in (
+                 from logpm_distribution_stock lds
+                 where lds.parcel_list_id in (
                     select ldpi.id
                     from logpm_distribution_parcel_list ldpi
                     where ldpi.stock_article_id in (

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

@@ -7,6 +7,7 @@ import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.mapper.DistributionLoadscanMapper;
 import com.logpm.distribution.mapper.DistributionParcelListMapper;
+import com.logpm.distribution.mapper.DistributionStockMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.DistributionStockupVO;
 import com.logpm.distribution.vo.DistrilbutionBillStockVO;
@@ -30,7 +31,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	private final DistributionLoadscanMapper distributionLoadscanMapper;
 	private final IDistributionStockArticleService distributionStockArticleService;
-	private final IDistributionStockService distributionStockService;
+	private final DistributionStockMapper distributionStockService;
 	private final IDistrilbutionBillStockService distrilbutionBillStockService;
 	private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService;
 
@@ -101,7 +102,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		DistributionStockEntity distributionStock = new DistributionStockEntity();
 		distributionStock.setId(id);
 		distributionStock.setConditions("3");
-		return distributionStockService.updateById(distributionStock);
+		int i = distributionStockService.updateById(distributionStock);
+		return  i > 0 ? true : false;
 	}
 
 	@Override

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

@@ -536,9 +536,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					if (stockArticleEntity.getHandQuantity() > r.getReservationNum()) {
 						//这里表示订单下的包件没有进行全部配送
 						//修改订单状态为部分配送
-						stockArticleEntity.setState(4);
+						stockArticleEntity.setState("4");
 						//修改订单的在库数量
-						stockArticleEntity.setState(stockArticleEntity.getHandQuantity() - r.getReservationNum());
+						stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - r.getReservationNum());
 						//对订单进行修改
 						distributionStockArticleService.updateById(stockArticleEntity);
 					}

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

@@ -98,7 +98,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 			distributionStockEntity.setParcelListId(parcelListEntity.getId());
 			distributionStockEntity.setReservationCode(reservationEntity.getReservationCode());
 		}
-		distributionStockEntity.setConditions(1);
+		distributionStockEntity.setConditions("1");
 		baseMapper.updateById(distributionStockEntity);
 		log.info("#############repairPackageScanInfo: 补全包件扫码信息完成 coding={}",coding);
 	}
@@ -120,7 +120,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 			distributionStockEntity.setUnit(stockListEntity.getCargoUnit());
 			distributionStockEntity.setReservationCode(reservationEntity.getReservationCode());
 		}
-		distributionStockEntity.setConditions(1);
+		distributionStockEntity.setConditions("1");
 		baseMapper.updateById(distributionStockEntity);
 
 		//扣减

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

@@ -80,7 +80,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	private final IDistributionStockListService  distributionStockListService;
 	private final IDistributionAsyncService  distributionAsyncService;
-	private final IDistrilbutionBillLadingService  distrilbutionBillLadingService;
 	private final IDistributionStockService  distributionStockService;
 
 
@@ -102,7 +101,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean ownSaveOrUpdate(DistrilbutionBillLadingDTO distrilbutionBillLading) {
-
 		if (ObjectUtils.isNotNull(distrilbutionBillLading.getId())) {
 			//修改
 			this.updateById(distrilbutionBillLading);
@@ -196,11 +194,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
 				distrilbutionBillStock.setBillLadingId(distrilbutionBillLading.getId());
 				distrilbutionBillStock.setStockArticleId(Long.parseLong(s));
+				distrilbutionBillStock.setConditions("1");
 				distrilbutionBillStockService.save(distrilbutionBillStock);
 			}
 
-
-
 			//操作图片
 			if(distrilbutionBillLading.getPrintList().size() > 0){
 				addPrint(distrilbutionBillLading);
@@ -217,6 +214,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				details.setBillLadingId(distrilbutionBillLading.getId());
 				details.setStockListId(i.getId());
 				details.setQuantity(i.getInventoryQuantity());
+				details.setConditions("1");
 				detailsEntities.add(details);
 			});
 			distributionDeliveryDetailsService.saveBatch(detailsEntities);
@@ -787,7 +785,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
 				billLadingEntity.setId((Long) billLadingId);
 				billLadingEntity.setConsignee("2");
-				distrilbutionBillLadingService.updateById(billLadingEntity);
+				baseMapper.updateById(billLadingEntity);
 			}
 			return R.fail(200,"签收成功");
 		}