零担外协PC签收、在托详情增加包件商场信息

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java

@@ -104,6 +104,11 @@ public class WarehouseParcelListVO extends WarehouseParcelListEntity {
 	 */
 	private String positionCode;
 
+	/**
+	 * 所在库位
+	 */
+	private String mallName;
+
 
 	/**
 	 * 是否窜货 0否 1是

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -117,10 +117,12 @@
         lwga.layer_num layerNum,
         lwtg.create_time operateTime,
         lwtg.create_user operateUser,
-        lwtg.is_fleeing isFleeing
+        lwtg.is_fleeing isFleeing,
+        ldsa.mall_name
         FROM
         logpm_warehouse_tray_goods lwtg
         JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id
+        JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id  = ldsa.id
         left join ( logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id = lwga.id ) on lwug.association_id = ldpl.id
         <where>
             ldpl.is_deleted = 0  and lwtg.is_deleted = 0 and  lwtg.association_type = 3 and  lwtg.tray_id = #{param.id}

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

@@ -1320,6 +1320,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					loadingId = collect.get(0);
 				} else if ("2".equals(deliveryListEntity.getKind())) {
 					//外协
+					DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user, false);
+					if (!Objects.isNull(deliverySelfEntity)){
+						driverPhone = deliverySelfEntity.getDriverPhone();
+						driverName = deliverySelfEntity.getDriverName();
+						vehicleNub = deliverySelfEntity.getVehicleNub();
+					}
 				} else {
 					log.error(method + "配送司机异常:{}", distrilbutionloadingscanDTO.getDeliveryId());
 					return R.fail("请联系管理员");