Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0

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

@@ -1181,7 +1181,6 @@
         lddl.task_time AS taskTime,
         lddl.loading_time AS loadingTime,
         lds.signee_name AS signeeName,
-        <!--        ldr.warehouse_id AS warehouseId,-->
         ldr.consignee AS consigne,
         ldr.delivery_phone AS driverPhone,
         ldr.delivery_address AS deliveryAddress,

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

@@ -1438,7 +1438,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 		boolean update = this.updateById(parcelListEntity);
 		//维护订单
-		distributionStockArticleService.maintenanceOrderMall(parcelListEntity.getStockArticleId()+"");
+		distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getStockArticleId()+"",myCurrentWarehouse.getId());
 		String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"扫描回库,回库任务号:"+taskCode;
 		//进行日志添加
 		List<JSONObject> logList = new ArrayList<>();