司机增加warehouse_id字段、增值服务列表接口

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java

@@ -209,4 +209,16 @@ public class BasicdataDriverArteryEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String warehouseId;
+
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String warehouseName;
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java

@@ -20,10 +20,12 @@ import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.vo.DistributionDeliveryListVO;
 import com.logpm.distribution.vo.DistributionDeliverySelfVO;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -61,4 +63,13 @@ public interface IDistributionDeliveryListClient {
     @GetMapping(TOP+"/getDeliveryDriverInfo")
 	DistributionDeliveryListVO getDeliveryDriverInfo(@RequestParam("current") Long deliveryId);
 
+
+//    /**
+//	 * 根据配送任务ID查询配送司机信息
+//	 * @param distributionRetentionScanVo
+//	 * @return
+//	 */
+//    @GetMapping(TOP+"/retentionCancelDeliveryPack")
+//	void retentionCancelDeliveryPack(@RequestBody DistributionRetentionScanVo distributionRetentionScanVo);
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java

@@ -17,10 +17,12 @@
 package com.logpm.distribution.feign;
 
 import com.logpm.distribution.entity.DistributionReservationEntity;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -47,4 +49,12 @@ public interface IDistributionReservationClient {
     @GetMapping(TOP)
     BladePage<DistributionReservationEntity> reservationTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+	/**
+	 * 根据配送任务ID查询配送司机信息
+	 * @param distributionRetentionScanVo
+	 * @return
+	 */
+	@GetMapping(TOP+"/retentionCancelReservationPack")
+	boolean retentionCancelReservationPack(@RequestBody DistributionRetentionScanVo distributionRetentionScanVo);
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java

@@ -42,4 +42,45 @@ public class DistributionAddvaluePackageVO extends DistributionAddvaluePackageEn
 	 */
 	private Integer planQuantity;
 
+	/**
+	 * 总数量
+	 */
+	private Integer totalQuantity;
+
+	/**
+	 * 总数量
+	 */
+	private String firsts;
+
+	/**
+	 * 总数量
+	 */
+	private String second;
+
+	/**
+	 * 总数量
+	 */
+	private String thirdProduct;
+
+
+	/**
+	 * 总数量
+	 */
+	private Long reservationId;
+
+	/**
+	 * 总数量
+	 */
+	private String packageType;
+
+	/**
+	 * 总数量
+	 */
+	private String materialNumber;
+
+	/**
+	 * 总数量
+	 */
+	private String sku;
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionRecordEntity.java

@@ -150,4 +150,24 @@ public class WarehouseRetentionRecordEntity extends TenantEntity {
 	@ApiModelProperty(value = "滞留数量")
 	private Integer retentionQuantity;
 
+	/**
+	 * 滞留任务创建人
+	 */
+	@ApiModelProperty(value = "滞留任务创建人")
+	private Long retentionCreateUserId;
+
+	/**
+	 * 滞留任务创建人
+	 */
+	@ApiModelProperty(value = "滞留任务创建人")
+	private String retentionCreateUserName;
+
+	/**
+	 * 滞留备注
+	 */
+	@ApiModelProperty(value = "滞留备注")
+	private String retentionRemarks;
+
+
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -144,7 +144,6 @@ public class BasicdataDriverArteryController extends BladeController {
 		if(list.size() > 0){
 			return R.fail("绑定的用户已存在！不要重复绑定！！！");
 		}
-
 		String phone = basicdataDriverArtery.getPhone();
 		R<User> userR = userClient
 			.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -289,15 +289,12 @@ public class BasicdataWarehouseController extends BladeController {
 	@GetMapping("/getMyWarehouseList")
 	@ApiOperationSupport(order = 3)
 	public R<List<BasicdataWarehouseEntity>> getMyWarehouseList() {
-
 		BladeUser user = AuthUtil.getUser();
 		List<BasicdataWarehouseEntity>  basicdataGoodsShelfVOList = CacheUtil.get(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(), user.getUserId(),List.class);
-
 		if(ObjectUtils.isNull(basicdataGoodsShelfVOList)){
 			basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList();
 			CacheUtil.put(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId(),basicdataGoodsShelfVOList);
 		}
-
 		return R.data(basicdataGoodsShelfVOList);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

@@ -46,6 +46,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 司机信息表 服务实现类
@@ -118,8 +119,9 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 		}
 		ArrayList<BasicdataDriverArteryVO> basicdataDriverArteryVOS = new ArrayList<>();
 		List<BasicdataDriverArteryEntity> list = this.list();
-		if (Func.isNotEmpty(list)){
-			list.forEach(l->{
+		Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
+		if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){
+			basicdataDriverArteryEntityStream.forEach(l->{
 				BasicdataDriverArteryVO driverArteryVO = Func.copy(l, BasicdataDriverArteryVO.class);
 				List<Long> vehicleIds = basicdataDrivermiddleService.list(Wrappers.<BasicdataDrivermiddleEntity>query().lambda()
 					.eq(BasicdataDrivermiddleEntity::getDriverId, l.getId())).stream().filter(f -> Func.isNotEmpty(f.getBrandId())).map(BasicdataDrivermiddleEntity::getBrandId).collect(Collectors.toList());

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

@@ -162,7 +162,7 @@ public class DistributionSignforAppController {
 	@PostMapping("/positioning")
 	@ApiOperationSupport(order = 2)
 	public Resp positioning(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
-		Resp msg	= distributionSignforService.positioning(distributionSignfor);
+		Resp msg = distributionSignforService.positioning(distributionSignfor);
 		return msg;
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -317,6 +317,23 @@ public class DistributionSignforController extends BladeController {
 	}
 
 
+
+	/**
+	 * 签收管理进行增值服务操作
+	 */
+	@GetMapping("/checkAddValuePackageList")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "PC查看增值服务列表", notes = "传入ids")
+	public IPage<DistributionAddvaluePackageVO> checkAddValuePackageList(@RequestParam Map<String, Object> addValueDTO, Query query) {
+		return distributionSignforService.checkAddValuePackageList(Condition.getPage(query),addValueDTO);
+	}
+
+
+
+
+
+
+
 //	/**
 //	 * 签收管理 修改签收照片信息
 //	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java

@@ -36,4 +36,6 @@ public class DistributionAddvalueDTO extends DistributionAddvalueEntity {
 	 */
 	private Long signforId;
 
+	private Long reservationId;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java

@@ -33,4 +33,6 @@ public class DistributionAddvaluePackageDTO extends DistributionAddvaluePackageE
 
 	private Integer zeroQuantity;
 
+	private Integer maxQuantity;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java

@@ -21,6 +21,7 @@ import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
 import com.logpm.distribution.vo.DistributionDeliveryListVO;
 import com.logpm.distribution.vo.DistributionDeliverySelfVO;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -59,4 +60,9 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
 		return distributionDeliveryListService.getDeliveryList(deliveryId);
 	}
 
+//	@Override
+//	public void retentionCancelDeliveryPack(DistributionRetentionScanVo distributionRetentionScanVo) {
+//		distributionDeliveryListService.retentionCancelDeliveryPack(distributionRetentionScanVo);
+//	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java

@@ -19,6 +19,7 @@ package com.logpm.distribution.feign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.service.IDistributionReservationService;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -50,4 +51,9 @@ public class DistributionReservationClient implements IDistributionReservationCl
         return BladePage.of(page);
     }
 
+	@Override
+	public boolean retentionCancelReservationPack(DistributionRetentionScanVo distributionRetentionScanVo) {
+		return reservationService.retentionCancelReservationPack(distributionRetentionScanVo);
+	}
+
 }

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

@@ -23,9 +23,11 @@ import com.logpm.distribution.dto.DistributionAddvalueDTO;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.entity.DistributionAddvaluePackageEntity;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
+import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import com.logpm.distribution.vo.DistributionAddvalueVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配送增值服务表 Mapper 接口
@@ -81,6 +83,46 @@ public interface DistributionAddvalueMapper extends BaseMapper<DistributionAddva
 	 */
 	DistributionAddvalueVO getAddvalueBySignfor(@Param("par")DistributionAddvalueDTO distributionAddvalueDTO);
 
+	/**
+	 * 查询增值服务包件详情
+	 * @param packageId
+	 * @param addvalueId
+	 * @return
+	 */
+    DistributionAddvaluePackageVO selectAddvaluePackageDetail(@Param("packageId") Long packageId,@Param("addvalueId") String addvalueId,@Param("reservationId")Long reservationId);
+
+
+	/**
+	 * 查询零担增值服务包件详情
+	 * @param packageId
+	 * @param addvalueId
+	 * @param reservationId
+	 * @return
+	 */
+	DistributionAddvaluePackageVO selectAddvalueZeroPackageDetail(@Param("packageId") Long packageId,@Param("addvalueId") String addvalueId,@Param("reservationId")Long reservationId);
+
+	/**
+	 * 查询零担增值服务详情
+	 * @param packageId
+	 * @param addvalueId
+	 * @param reservationId
+	 * @return
+	 */
+	DistributionAddvaluePackageVO selectAddvalueInventoryPackageDetail(Long packageId, String addvalueId, Long reservationId);
+
+	/**
+	 * 查询订制品增值服务包件列表
+	 * @param reservationId
+	 * @param stockArticleId
+	 * @return
+	 */
+	List<DistributionAddvaluePackageVO> selectAddvaluePackageVO(@Param("reservationId") Long reservationId, @Param("stockArticleId") Long stockArticleId,@Param("obj") Map<String, Object> addValueDTO);
+
+
+	List<DistributionAddvaluePackageVO> selectAddvalueZeroPackageVO(@Param("reservationId")Long reservationId,@Param("stockArticleId")Long stockArticleId,@Param("obj")Map<String, Object> addValueDTO);
+
+	List<DistributionAddvaluePackageVO> selectAddvalueInventoryPackageVO(@Param("reservationId")Long reservationId,@Param("stockListId")Long stockListId,@Param("obj")Map<String, Object> addValueDTO);
+
 //	/**
 //	 * 删除增值服务
 //	 * @param reservationId

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

@@ -92,5 +92,150 @@
             GROUP BY
                 lda.id
     </select>
+    <select id="selectAddvaluePackageDetail"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+         SELECT
+            ldpl.firsts AS firsts,
+            ldpl.second AS second,
+            ldpl.third_product AS third_product,
+            ldap.order_package_code AS order_package_code,
+            ldap.order_code AS order_code,
+            ldpl.quantity AS quantity,
+            ldap.id AS id,
+            ldap.stock_article_id AS  stockArticleId,
+            ldap.package_id AS packageId,
+            lda.ref_id AS reservationId,
+            ldap.conditions AS conditions,
+            CASE
+            WHEN ldap.conditions =1 THEN    '订制品'
+            WHEN ldap.conditions =2 THEN   '库存品'
+            WHEN ldap.conditions =3 THEN    '零担'
+            END AS packageType
+        FROM
+            logpm_distribution_addvalue AS lda
+            INNER JOIN logpm_distribution_addvalue_detail AS ldad ON ldad.addvalue_id = lda.id
+            INNER JOIN logpm_distribution_addvalue_package AS ldap ON ldap.addvalue_detail_id = ldad.id AND ldap.conditions = 1
+            INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldap.package_id = ldpl.id
+        WHERE
+            lda.addvalue_id = #{addvalueId} AND ldap.package_id = #{packageId} AND lda.ref_id = #{reservationId} AND ref_type = 1
+    </select>
+    <select id="selectAddvalueZeroPackageDetail"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+		  SELECT
+            ldpl.firsts AS firsts,
+            ldpl.second AS second,
+            ldpl.third_product AS third_product,
+            ldap.order_package_code AS order_package_code,
+            ldap.order_code AS order_code,
+            ldpl.quantity AS quantity,
+            ldrzp.quantity AS maxQuantity,
+            ldap.id AS id,
+            ldap.stock_article_id AS  stockArticleId,
+            ldap.package_id AS packageId,
+            lda.ref_id AS reservationId,
+            ldap.conditions AS conditions,
+            CASE
+            WHEN ldap.conditions =1 THEN    '订制品'
+            WHEN ldap.conditions =2 THEN   '库存品'
+            WHEN ldap.conditions =3 THEN    '零担'
+            END AS packageType
+        FROM
+            logpm_distribution_addvalue AS lda
+            INNER JOIN logpm_distribution_addvalue_detail AS ldad ON ldad.addvalue_id = lda.id
+            INNER JOIN logpm_distribution_addvalue_package AS ldap ON ldap.addvalue_detail_id = ldad.id AND ldap.conditions = 3
+            INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldap.package_id = ldpl.id
+            INNER JOIN logpm_distribution_reservation_zero_package AS ldrzp ON ldrzp.parcel_list_id = ldap.package_id AND ldap.reservation_id=ldrzp.reservation_id
+        WHERE
+            lda.addvalue_id = #{addvalueId} AND ldap.package_id = #{packageId} AND lda.ref_id = #{reservationId} AND ref_type = 1
+    </select>
+    <select id="selectAddvalueInventoryPackageDetail"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        	         SELECT
+            ldap.stock_article_id AS inventoryId,
+            ldap.material_name AS materialName,
+            ldap.order_package_code AS orderPackageCode,
+            ldap.package_id AS packageId,
+            ldap.reservation_id AS reservationId,
+            ldsld.num AS quantity,
+            ldsl.sku AS sku,
+            ldsl.cargo_number AS materialNumber,
+            ldap.conditions AS conditions,
+            CASE
+            WHEN ldap.conditions =1 THEN   '订制品'
+            WHEN ldap.conditions =2 THEN   '库存品'
+            WHEN ldap.conditions =3 THEN   '零担'
+            END AS packageType
+        FROM
+            logpm_distribution_addvalue AS lda
+            INNER JOIN logpm_distribution_addvalue_detail AS ldad ON ldad.addvalue_id = lda.id
+            INNER JOIN logpm_distribution_addvalue_package AS ldap ON ldap.addvalue_detail_id = ldad.id AND ldap.conditions = 2
+            INNER JOIN logpm_dis_stock_list_detail AS ldsld ON ldsld.id = ldap.package_id
+						INNER JOIN logpm_distribution_stock_list AS ldsl ON ldsld.stock_list_id = ldsl.id
+        WHERE
+            lda.addvalue_id = #{addvalueId} AND ldap.package_id = #{packageId} AND lda.ref_id = #{reservationId} AND ref_type = 1
+    </select>
+    <select id="selectAddvaluePackageVO" resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        SELECT
+            ldpl.id,
+            ldpl.firsts,
+            ldpl.second,
+            ldpl.third_product,
+            ldpl.order_package_code,
+            ldpl.order_code,
+            ldpl.stock_article_id,
+            ldpl.quantity,
+            ldrp.reservation_id,
+            1 AS conditions,
+            '订制品' AS packageType
+        FROM
+        logpm_distribution_reservation_package AS ldrp
+        INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+	    WHERE
+	        ldrp.reservation_id = #{reservationId} and ldrp.stock_article_id = #{stockArticleId} and ldrp.packet_bar_status in ('1','3')
+	        <if test="obj.orderPackageCode != null and obj.orderPackageCode != ''">
+                and ldpl.opder_package_code =#{obj.orderPackageCode}
+            </if>
+    </select>
+    <select id="selectAddvalueZeroPackageVO"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        	SELECT
+                ldpl.id,
+                ldpl.firsts,
+                ldpl.`second`,
+                ldpl.third_product,
+                ldpl.order_package_code,
+                ldpl.order_code,
+                ldpl.stock_article_id,
+                ldpl.quantity,
+                ldrzp.reservation_id,
+                ldrzp.quantity AS maxQuantity,
+                3 AS conditions,
+                '零担' AS packageType
+            FROM
+                logpm_distribution_reservation_zero_package AS ldrzp
+                INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrzp.parcel_list_id = ldpl.id
+    </select>
+    <select id="selectAddvalueInventoryPackageVO"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        SELECT
+            ldsld.sku,
+            ldsld.stock_package_code,
+            ldsld.reservation_id,
+            ldsld.stock_list_id,
+            ldsld.id AS packageId,
+            ldsld.num AS quantity,
+            ldsl.description_goods,
+            ldsl.cargo_number,
+            2 AS conditions,
+            '库存品' AS packageType
+        FROM
+            logpm_dis_stock_list_detail AS ldsld
+            INNER JOIN logpm_distribution_stock_list AS ldsl ON ldsld.stock_list_id = ldsl.id
+        WHERE
+            ldsld.reservation_id = #{reservationId} AND ldsld.stock_package_status in ('1','3') AND ldsld.stock_list_id =#{stockListId}
+            <if test="obj.orderPackageCode != null and obj.orderPackageCode != ''">
+                AND ldsld.stock_package_code like concat ('%',#{obj.orderPackageCode},'%')
+            </if>
+    </select>
 
 </mapper>

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

@@ -1603,6 +1603,7 @@
             ldsld.num AS reservationQuantity,
             ldsl.cargo_number AS  materialNumber,
             ldsl.description_goods AS materialName,
+            2 AS conditions,
             ldsl.incoming_batch AS 入库批次
          FROM
             logpm_distribution_delivery_list AS lddl
@@ -1648,7 +1649,7 @@
 			ldrs.reservation_num AS maxRetention,
 			ldrzp.parcel_list_id AS orderPackageId,
 			ldpl.firsts AS materialName,
-            2 AS conditions
+            3 AS conditions
 	 FROM
 			logpm_distribution_delivery_list AS lddl
 			LEFT JOIN logpm_distribution_signfor AS lds ON lds.delivery_id = lddl.id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java

@@ -316,4 +316,10 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @return
 	 */
 	List<DistributionDeliverySelfVO> getDriverInfo(Long deliveryId);
+
+//	/**
+//	 * 滞留取消配送
+//	 * @param distributionRetentionScanVo
+//	 */
+//	void retentionCancelDeliveryPack(DistributionRetentionScanVo distributionRetentionScanVo);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -225,4 +225,11 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @return
 	 */
 	R getReservationPackageListByOrderId(Long orderId, Long reservationId,IPage<DistributionReservationOrderPackageVO> page);
+
+	/**
+	 * 滞留扫描取消包件
+	 * @param distributionRetentionScanVo
+	 * @return
+	 */
+    boolean retentionCancelReservationPack(DistributionRetentionScanVo distributionRetentionScanVo);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@@ -203,4 +203,6 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	R zeroSignfor(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO);
 
 	R updateSign(DistributionSignforDTO distributionSignfor);
+
+	IPage<DistributionAddvaluePackageVO> checkAddValuePackageList(IPage<DistributionAddvaluePackageVO> page, Map<String, Object> addValueDTO);
 }

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

@@ -242,7 +242,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 				if (Func.isEmpty(distributionAppAddvalueDTO.getNum())) {
 					return Resp.scanFail("添加失败", "请输入件数");
 				} else {
-					distributionAddvalueDetailEntity.setNum(packageEntityList.stream().mapToInt(DistributionAddvaluePackageEntity::getQuantity).sum());
+					distributionAddvalueDetailEntity.setNum(packageEntityList.stream().mapToInt(DistributionAddvaluePackageDTO::getQuantity).sum());
 				}
 				break;
 			case "6":
@@ -270,7 +270,10 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 		}
 		distributionAddvalueDetailService.save(distributionAddvalueDetailEntity);
 		List<DistributionAddvaluePackageEntity> addvaluePackageEntities = new ArrayList<>();
-		packageEntityList.stream().forEach(p->{p.setAddvalueDetailId(distributionAddvalueDetailEntity.getId());p.setQuantity(p.getZeroQuantity());addvaluePackageEntities.add(Func.copy(p,DistributionAddvaluePackageEntity.class));});
+		packageDTOList.stream().forEach(p->{
+			p.setAddvalueDetailId(distributionAddvalueDetailEntity.getId());
+			addvaluePackageEntities.add(Func.copy(p,DistributionAddvaluePackageEntity.class));
+		});
 		distributionAddvaluePackageService.saveBatch(addvaluePackageEntities);
 		return Resp.scanSuccess("添加成功","添加成功");
 	}

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

@@ -88,6 +88,8 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.connection.ReactiveListCommands;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -153,8 +155,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final IDistributionReservationZeroPackageService distributionReservationZeroPackageService;
 	private final IDistributionParcelNumberService distributionParcelNumberService;
 	private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
-	private final IWarehouseRetentionScanClient warehouseRetentionScanClient;
-//	private final DistributionStockMapper distributionStockMapper;
+//	private final IWarehouseRetentionScanClient warehouseRetentionScanClient;
+
+//	@Lazy
+//	@Autowired
+//	private  IDistributionReservationService distributionReservationService;
 //	private final BladeRedis redis;
 
 
@@ -1321,56 +1326,63 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					v.forEach(ord -> {
 						List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(distrilbutionloadingscanDTO.getReservationId(), ord.getStockArticleId());
 						for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
-							DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
-							BladeUser user = AuthUtil.getUser();
-							loadscanEntity.setScanUser(user.getUserName());
-							loadscanEntity.setDriverName(finalDistributionDeliverySelfEntity.getDriverName());
-							loadscanEntity.setVehicleName(finalDistributionDeliverySelfEntity.getVehicleNub());
-							loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
-							loadscanEntity.setOneClick(2);
-							loadscanEntity.setScanUser(user.getUserName());
-							loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
-							loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
-							loadscanEntity.setPackageNub(parcelListEntity.getQuantity());
-							loadscanEntity.setLoadedNub(parcelListEntity.getQuantity());
-							loadscanEntity.setScanTime(new Date());
-							if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverPhone())) {
-								loadscanEntity.setDriverPhone(finalDistributionDeliverySelfEntity.getDriverPhone());
-							}
-							if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getVehicleId())) {
-								loadscanEntity.setVehicleId(finalDistributionDeliverySelfEntity.getVehicleId());
-							}
-							if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverId())) {
-								loadscanEntity.setDriverId(finalDistributionDeliverySelfEntity.getDriverId());
-							}
-							if (Func.isNotEmpty(finalDistributionDeliverySelfEntity.getId())) {
-								loadscanEntity.setLoadingId(finalDistributionDeliverySelfEntity.getId().toString());
-							}
-							if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverId())) {
-								loadscanEntity.setDriverId(finalDistributionDeliverySelfEntity.getDriverId());
-							}
-							if (Func.isNotEmpty(parcelListEntity.getOrderPackageCode())) {
-								loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
-							}
-							if (Func.isNotEmpty(parcelListEntity.getId())) {
-								loadscanEntity.setPackageId(parcelListEntity.getId());
-							}
-							if (Func.isNotEmpty(parcelListEntity.getId())) {
-								loadscanEntity.setPackageId(parcelListEntity.getId());
-							}
-							if (Func.isNotEmpty(parcelListEntity.getStockArticleId())) {
-								loadscanEntity.setOrderId(parcelListEntity.getStockArticleId());
-							}
-							if (Func.isNotEmpty(distrilbutionloadingscanDTO.getDeliveryId())) {
-								loadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
-							}
+							DistributionLoadscanEntity packageLoadingScan = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
+								.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
+								.eq(DistributionLoadscanEntity::getOrderId, ord.getStockArticleId())
+								.eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId())
+								.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+							if (Func.isEmpty(packageLoadingScan)){
+								DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
+								BladeUser user = AuthUtil.getUser();
+								loadscanEntity.setScanUser(user.getUserName());
+								loadscanEntity.setDriverName(finalDistributionDeliverySelfEntity.getDriverName());
+								loadscanEntity.setVehicleName(finalDistributionDeliverySelfEntity.getVehicleNub());
+								loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
+								loadscanEntity.setOneClick(2);
+								loadscanEntity.setScanUser(user.getUserName());
+								loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
+								loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
+								loadscanEntity.setPackageNub(parcelListEntity.getQuantity());
+								loadscanEntity.setLoadedNub(parcelListEntity.getQuantity());
+								loadscanEntity.setScanTime(new Date());
+								if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverPhone())) {
+									loadscanEntity.setDriverPhone(finalDistributionDeliverySelfEntity.getDriverPhone());
+								}
+								if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getVehicleId())) {
+									loadscanEntity.setVehicleId(finalDistributionDeliverySelfEntity.getVehicleId());
+								}
+								if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverId())) {
+									loadscanEntity.setDriverId(finalDistributionDeliverySelfEntity.getDriverId());
+								}
+								if (Func.isNotEmpty(finalDistributionDeliverySelfEntity.getId())) {
+									loadscanEntity.setLoadingId(finalDistributionDeliverySelfEntity.getId().toString());
+								}
+								if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverId())) {
+									loadscanEntity.setDriverId(finalDistributionDeliverySelfEntity.getDriverId());
+								}
+								if (Func.isNotEmpty(parcelListEntity.getOrderPackageCode())) {
+									loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
+								}
+								if (Func.isNotEmpty(parcelListEntity.getId())) {
+									loadscanEntity.setPackageId(parcelListEntity.getId());
+								}
+								if (Func.isNotEmpty(parcelListEntity.getId())) {
+									loadscanEntity.setPackageId(parcelListEntity.getId());
+								}
+								if (Func.isNotEmpty(parcelListEntity.getStockArticleId())) {
+									loadscanEntity.setOrderId(parcelListEntity.getStockArticleId());
+								}
+								if (Func.isNotEmpty(distrilbutionloadingscanDTO.getDeliveryId())) {
+									loadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
+								}
 //							parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 //							distributionParcelListService.updateById(parcelListEntity);
-							distributionLoadscanService.save(loadscanEntity);
-							Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
+								distributionLoadscanService.save(loadscanEntity);
+								Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 
-							Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
-							warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+								Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+								warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+							}
 							//异步修改包件状态
 //							distributionAsyncService.changeMarketDeliveryListStatus(loadscanEntity.getOrderPackageCode(), loadscanEntity.getDeliveryId());
 						}
@@ -5279,6 +5291,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 
+
 	public Map<String, String> getDriverCar(String kind, Long deliveryListEntityId) {
 		Map<String, String> map = new HashMap<>();
 		String dirverName = null;

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

@@ -34,6 +34,7 @@ import com.logpm.distribution.vo.*;
 import com.logpm.distribution.wrapper.*;
 import com.logpm.oldproject.entity.WayBillEntity;
 import com.logpm.oldproject.feign.IWayBillClient;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
@@ -185,6 +186,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	@Autowired
 	private IDistributionParcelNumberService distributionParcelNumberService;
 
+//	@Autowired
+//	private IWarehouseWaybillClient warehouseWaybillClient;
+
 //	@Autowired
 //	private DistributionParcelNumberMapper distributionParcelNumberMapper;
 
@@ -1845,14 +1849,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //					consigneeAddress.add(warehouseWaybillEntity.getConsigneeMobile());
 //				}
 
-				WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(s.getWaybillNumber());
+				WarehouseWaybillEntity wayBillEntity = warehouseWaybillClient.findByWaybillNo(s.getWaybillNumber());
 				if (Func.isNotEmpty(wayBillEntity)) {
 					waybillId.add(wayBillEntity.getId().toString());
-					if (Func.isNotEmpty(wayBillEntity.getTakePhone())) {
-						marketPhone.add(wayBillEntity.getTakePhone());
+					if (Func.isNotEmpty(wayBillEntity.getConsigneeMobile())) {
+						marketPhone.add(wayBillEntity.getConsigneeMobile());
 					}
-					if (Func.isNotEmpty(wayBillEntity.getTakeAddress())) {
-						consigneeAddress.add(wayBillEntity.getTakeAddress());
+					if (Func.isNotEmpty(wayBillEntity.getConsigneeAddress())) {
+						consigneeAddress.add(wayBillEntity.getConsigneeAddress());
 					}
 				}
 				//预约单数据填充
@@ -2780,11 +2784,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				}
 				DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class);
 				if (s.getIsZero().equals("0")) {
-					WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(s.getWaybillNumber());
+
+					WarehouseWaybillEntity wayBillEntity = warehouseWaybillClient.findByWaybillNo(s.getWaybillNumber());
+
 					if (Func.isNotEmpty(wayBillEntity)) {
 						waybillId.add(wayBillEntity.getId().toString());
-						if (Func.isNotEmpty(wayBillEntity.getTakePhone())) {
-							marketPhone.add(wayBillEntity.getTakePhone());
+						if (Func.isNotEmpty(wayBillEntity.getConsigneeMobile())) {
+							marketPhone.add(wayBillEntity.getConsigneeMobile());
 						}
 					}
 
@@ -3158,4 +3164,102 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		reservationOrderPackageVO.setPackageList(allPackageList);
 		return R.data(reservationOrderPackageVO);
 	}
+
+	@Override
+	public boolean retentionCancelReservationPack(DistributionRetentionScanVo distributionRetentionScanVo) {
+		//滞留取消配送任务
+		Integer conditions = distributionRetentionScanVo.getConditions();
+		DistributionReservationEntity reservationEntity = this.getById(distributionRetentionScanVo.getReservationId());
+		if (Func.isEmpty(reservationEntity)){
+			log.error("###########查询预约计划错误,reservationId:{}",distributionRetentionScanVo.getReservationId());
+			return false;
+		}
+		switch (conditions){
+			// 1 定制  2-零担  3-库存品
+			case 1:
+				if (reservationEntity.getReservationNum() == distributionRetentionScanVo.getRetentionQuantity() && reservationEntity.getReservationStockListNum() == 0){
+					//该预约订单只存在该包件并且没有库存品
+					this.cancelReservation(Func.copy(reservationEntity,DistributionReservationDTO.class));
+				}else {
+					DistributionReservationPackageEntity reservationPackageEntity = distributionReservationPackageMapper.selectOne(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+						.eq(DistributionReservationPackageEntity::getReservationId, distributionRetentionScanVo.getReservationId())
+						.eq(DistributionReservationPackageEntity::getStockArticleId, distributionRetentionScanVo.getOrderId())
+						.eq(DistributionReservationPackageEntity::getParceListId, distributionRetentionScanVo.getOrderPackageId())
+						.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue()));
+					reservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue());
+					distributionReservationPackageMapper.updateById(reservationPackageEntity);
+					DistributionReservationStockarticleEntity reservationStockarticleEntity = distributionReservationStockarticleMapper.selectOne(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
+						.eq(DistributionReservationStockarticleEntity::getReservationId, distributionRetentionScanVo.getReservationId())
+						.eq(DistributionReservationStockarticleEntity::getStockArticleId, distributionRetentionScanVo.getOrderId())
+						.eq(DistributionReservationStockarticleEntity::getIsZero, IsOrNoConstant.no.getValue())
+						.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
+					Integer reservationNum = reservationStockarticleEntity.getReservationNum();
+					Integer retentionQuantity = distributionRetentionScanVo.getRetentionQuantity();
+					if ((reservationNum - retentionQuantity) == 0){
+						reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue());
+					}
+					reservationStockarticleEntity.setReservationNum(reservationNum - retentionQuantity);
+					distributionReservationStockarticleMapper.updateById(reservationStockarticleEntity);
+					reservationEntity.setReservationNum(reservationEntity.getReservationNum() - retentionQuantity);
+					this.updateById(reservationEntity);
+				}
+				break;
+			case 2:
+				if (reservationEntity.getReservationStockListNum() == distributionRetentionScanVo.getRetentionQuantity() && reservationEntity.getReservationNum() == 0){
+					this.cancelReservation(Func.copy(reservationEntity,DistributionReservationDTO.class));
+				}else {
+					DisStockListDetailEntity disStockListDetailEntity = disStockListDetailMapper.selectOne(Wrappers.<DisStockListDetailEntity>query().lambda()
+						.eq(DisStockListDetailEntity::getReservationId, distributionRetentionScanVo.getReservationId())
+						.eq(DisStockListDetailEntity::getStockListId, distributionRetentionScanVo.getInventoryId())
+						.eq(DisStockListDetailEntity::getId, distributionRetentionScanVo.getOrderPackageId())
+					);
+					disStockListDetailEntity.setStockPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
+					disStockListDetailMapper.updateById(disStockListDetailEntity);
+					DistributionReservationStocklistEntity reservationStocklistEntity = distributionReservationStocklistMapper.selectOne(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
+						.eq(DistributionReservationStocklistEntity::getReservationId, distributionRetentionScanVo.getReservationId())
+						.eq(DistributionReservationStocklistEntity::getStocklistId, distributionRetentionScanVo.getInventoryId())
+						.ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationOrderStatusConstant.quxiao.getValue())
+					);
+					Integer reservationNum = reservationStocklistEntity.getReservationNum();
+
+				}
+
+
+
+				break;
+			case 3:
+				if (reservationEntity.getReservationNum() == distributionRetentionScanVo.getRetentionQuantity() && reservationEntity.getReservationStockListNum() == 0){
+					//该预约订单只存在该包件并且没有库存品
+					this.cancelReservation(Func.copy(reservationEntity,DistributionReservationDTO.class));
+				}else {
+					DistributionReservationZeroPackageEntity reservationZeroPackageEntity = distributionReservationZeroPackageMapper.selectOne(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+						.eq(DistributionReservationZeroPackageEntity::getReservationId, distributionRetentionScanVo.getReservationId())
+						.eq(DistributionReservationZeroPackageEntity::getStockArticleId, distributionRetentionScanVo.getOrderId())
+						.eq(DistributionReservationZeroPackageEntity::getParcelListId, distributionRetentionScanVo.getOrderPackageId())
+						.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()));
+					if (reservationZeroPackageEntity.getQuantity() == distributionRetentionScanVo.getRetentionQuantity()){
+						reservationZeroPackageEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
+					}
+					reservationZeroPackageEntity.setQuantity(reservationZeroPackageEntity.getQuantity() -distributionRetentionScanVo.getRetentionQuantity());
+					distributionReservationZeroPackageMapper.updateById(reservationZeroPackageEntity);
+					DistributionReservationStockarticleEntity reservationStockarticleEntity = distributionReservationStockarticleMapper.selectOne(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
+						.eq(DistributionReservationStockarticleEntity::getReservationId, distributionRetentionScanVo.getReservationId())
+						.eq(DistributionReservationStockarticleEntity::getStockArticleId, distributionRetentionScanVo.getOrderId())
+						.eq(DistributionReservationStockarticleEntity::getIsZero, IsOrNoConstant.no.getValue())
+						.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
+					Integer reservationNum = reservationStockarticleEntity.getReservationNum();
+					Integer retentionQuantity = distributionRetentionScanVo.getRetentionQuantity();
+					if ((reservationNum - retentionQuantity) == 0){
+						reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue());
+					}
+					reservationStockarticleEntity.setReservationNum(reservationNum - retentionQuantity);
+					distributionReservationStockarticleMapper.updateById(reservationStockarticleEntity);
+					reservationEntity.setReservationNum(reservationEntity.getReservationNum() - retentionQuantity);
+					this.updateById(reservationEntity);
+				}
+				break;
+
+		}
+		return false;
+	}
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -157,7 +158,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	public List<DistributionSignforExcel> exportDistributionSignfor(Map<String, Object> distributionSignfor) {
 
 		Object o = distributionSignfor.get("ids");
-		if(ObjectUtils.isNotNull(o)){
+		if (ObjectUtils.isNotNull(o)) {
 			distributionSignfor.remove("ids");
 		}
 //		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
@@ -468,21 +469,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionSignforVO distributionSignforVO = baseMapper.selectOneCustom(id);
 		//查询客户下的订单列表信息
 		DistributionSignforEntity signforEntity = this.getById(id);
-		if (Func.isEmpty(signforEntity)){
-			log.error("###########查询签收信息异常，id:{}",id);
+		if (Func.isEmpty(signforEntity)) {
+			log.error("###########查询签收信息异常，id:{}", id);
 			return null;
 		}
 		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()).ne(
 			DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
-		if (Func.isEmpty(reservationStockarticleEntityList)){
-			log.error("#####################预约查询无订单信息，reservationId:{}",signforEntity.getReservationId());
+		if (Func.isEmpty(reservationStockarticleEntityList)) {
+			log.error("#####################预约查询无订单信息，reservationId:{}", signforEntity.getReservationId());
 			return null;
 		}
 		List<Long> orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
 		List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
-		List<DistributionSignPrintVO> printEntities =  baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
+		List<DistributionSignPrintVO> printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
 		distributionSignforVO.setPrintVOList(printEntities);
-		if (Func.isNotEmpty(stockArticleEntities)){
+		if (Func.isNotEmpty(stockArticleEntities)) {
 			distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
 		}
 //		List<DistributionStockArticleVO> stockArticleEntityList = baseMapper.selectOrderList(id);
@@ -564,7 +565,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
 				.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
-			if (Func.isNotEmpty(loadscanEntity)){
+			if (Func.isNotEmpty(loadscanEntity)) {
 				if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
 					return Resp.scanFail("重复操作!!", "重复操作");
 				}
@@ -854,10 +855,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			List<DistributionLoadscaninvnEntity> inventoryScanList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
 				.eq(DistributionLoadscaninvnEntity::getReservationId, distributionAppReservationVO.getId())
 				.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
-			if (Func.isNotEmpty(packageScanList)){
+			if (Func.isNotEmpty(packageScanList)) {
 				loadingNum.getAndAdd(packageScanList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum());
 			}
-			if (Func.isNotEmpty(inventoryScanList)){
+			if (Func.isNotEmpty(inventoryScanList)) {
 				loadingNum.getAndAdd(inventoryScanList.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum());
 			}
 			distributionAppReservationVO.setLoadedNumber(loadingNum.get());
@@ -1179,7 +1180,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			);
 			AtomicInteger signNum = new AtomicInteger();
 			AtomicInteger loadNum = new AtomicInteger();
-			if (Func.isNotEmpty(loadscanEntities)){
+			if (Func.isNotEmpty(loadscanEntities)) {
 				//统计库存品配送数和签收数
 				loadNum.getAndAdd(loadscanEntities.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum());
 				signNum.getAndAdd(loadscanEntities.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum());
@@ -1190,12 +1191,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionAppDeliveryListVO.setInventoryNub(0);
 			distributionAppDeliveryListVO.setDeliveryNumber(0);
 			AtomicInteger deliveryNub = new AtomicInteger();
-			if (Func.isNotEmpty(inventory)){
+			if (Func.isNotEmpty(inventory)) {
 				int inventoryNub = inventory.stream().mapToInt(DisStockListDetailEntity::getNum).sum();
 				distributionAppDeliveryListVO.setInventoryNub(inventoryNub);
 				deliveryNub.getAndAdd(inventoryNub);
 			}
-			if (Func.isNotEmpty(parcelListEntities)){
+			if (Func.isNotEmpty(parcelListEntities)) {
 				deliveryNub.getAndAdd(parcelListEntities.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum());
 				distributionAppDeliveryListVO.setDeliveryNumber(deliveryNub.get());
 			}
@@ -1210,7 +1211,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionAppDeliveryListVO.getId())
 				.eq(DistributionLoadscaninvnEntity::getSignforState, 2)
 			);
-			if (Func.isNotEmpty(distributionLoadscaninvnEntities)){
+			if (Func.isNotEmpty(distributionLoadscaninvnEntities)) {
 				//统计库存品配送数和签收数
 				loadNum.getAndAdd(distributionLoadscaninvnEntities.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum());
 				signNum.getAndAdd(distributionLoadscaninvnEntities.stream().mapToInt(DistributionLoadscaninvnEntity::getReceivedQuantity).sum());
@@ -1475,7 +1476,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							loadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date()));
 							distributionLoadscaninvnService.updateById(loadscaninvnEntity);
 							Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
-							Integer j = distributionSignforMapper.updateSignforNum(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
+							Integer j = distributionSignforMapper.updatesignforByinvn(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
 						} else {
 							log.error("################库存品未进行备货操作+{}" + list);
 							//此时说明在同一配送任务下，同一客户出现了相同的库存品包件码
@@ -1935,9 +1936,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId())
 			.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
 		List<DistributionParcelListVO> parcelListVOS = new ArrayList<>();
-		if (Func.isNotEmpty(reservationStockarticleEntityList)){
-			reservationStockarticleEntityList.forEach(rs->{
-				if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){
+		if (Func.isNotEmpty(reservationStockarticleEntityList)) {
+			reservationStockarticleEntityList.forEach(rs -> {
+				if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) {
 					List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId());
 					List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 					parcelListVOList.forEach(p -> {
@@ -1976,9 +1977,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 					});
 					parcelListVOS.addAll(parcelListVOList);
-				}else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())){
+				} else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
 					List<DistributionParcelNumberDTO> distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(rs.getReservationId());
-					distributionParcelNumberDTOS.forEach(zp->{
+					distributionParcelNumberDTOS.forEach(zp -> {
 						DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(zp.getParcelListId());
 						DistributionParcelListVO parcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity);
 //						DistributionParcelListVO parcelListVO = Func.copy(parcelListEntity, DistributionParcelListVO.class);
@@ -1988,7 +1989,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						parcelListVO.setSigningNub(0);
 						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
 							.eq(DistributionLoadscanEntity::getPackageId, zp.getParcelListId())
-							.eq(DistributionLoadscanEntity::getReservationId,rs.getReservationId()));
+							.eq(DistributionLoadscanEntity::getReservationId, rs.getReservationId()));
 						if (Func.isNotEmpty(distributionLoadscanEntity)) {
 							//该包件存在扫描记录
 							String scanStatus = distributionLoadscanEntity.getScanStatus();
@@ -2078,7 +2079,34 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					.in(DistributionAddvaluePackageEntity::getPackageId, longs)
 					.eq(DistributionAddvaluePackageEntity::getAddvalueDetailId, addvalueBySignfor.getAddvalueDetailId()));
 				List<DistributionAddvaluePackageVO> addvaluePackageVOS = new ArrayList<>();
-				distributionAddvaluePackageEntities.forEach(p->{addvaluePackageVOS.add(Func.copy(p,DistributionAddvaluePackageVO.class));});
+				distributionAddvaluePackageEntities.forEach(p -> {
+					Integer conditions = p.getConditions();
+//					DistributionAddvaluePackageVO addvaluePackageVO = Func.copy(p, DistributionAddvaluePackageVO.class);
+					switch (conditions) {
+						case 1:
+							//订制品
+							DistributionAddvaluePackageVO addvaluePackageVO = distributionAddvalueMapper.selectAddvaluePackageDetail(p.getPackageId(),distributionAddvalueDTO.getAddvalueId(),distributionAddvalueDTO.getReservationId());
+							if (Func.isNotEmpty(addvaluePackageVO)){
+								addvaluePackageVOS.add(addvaluePackageVO);
+							}
+							break;
+						case 2:
+							DistributionAddvaluePackageVO addvalueinventoryPackageVO = distributionAddvalueMapper.selectAddvalueInventoryPackageDetail(p.getPackageId(),distributionAddvalueDTO.getAddvalueId(),distributionAddvalueDTO.getReservationId());
+							//库存品
+							if (Func.isNotEmpty(addvalueinventoryPackageVO)){
+								addvaluePackageVOS.add(addvalueinventoryPackageVO);
+							}
+							break;
+						case 3:
+							DistributionAddvaluePackageVO addvalueZeroPackageVO = distributionAddvalueMapper.selectAddvalueZeroPackageDetail(p.getPackageId(),distributionAddvalueDTO.getAddvalueId(),distributionAddvalueDTO.getReservationId());
+							//库存品
+							if (Func.isNotEmpty(addvalueZeroPackageVO)){
+								addvaluePackageVOS.add(addvalueZeroPackageVO);
+							}
+							break;
+					}
+
+				});
 				addvalueBySignfor.setPackageEntityList(addvaluePackageVOS);
 			}
 		}
@@ -2367,7 +2395,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (signingTotalNum.get() > 0) {
 			str.append("已签收" + signingTotalNum.get() + "件");
 		}
-		return Resp.scanSuccess("", str.toString());
+		return Resp.scanSuccess(str.toString(), str.toString());
 	}
 
 	@Override
@@ -2576,4 +2604,57 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		this.updateById(distributionSignfor);
 		return R.status(true);
 	}
+
+	@Override
+	public IPage<DistributionAddvaluePackageVO> checkAddValuePackageList(IPage<DistributionAddvaluePackageVO> page,Map<String, Object> addValueDTO) {
+		String reservationId = (String) addValueDTO.get("reservationId");
+		if (Func.isEmpty(reservationId)){
+			log.error("##################无reservationId");
+			return null;
+		}
+		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationMapper.selectStockArticleByReservationId(Long.parseLong(reservationId));
+		List<DistributionAddvaluePackageVO> addvaluePackageVOS = new ArrayList<>();
+		if (Func.isNotEmpty(reservationStockarticleEntityList)){
+			List<Long> orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
+			LambdaQueryWrapper<DistributionStockArticleEntity> orderQW = Wrappers.<DistributionStockArticleEntity>query().lambda().in(DistributionStockArticleEntity::getId, orderIds);
+			if (Func.isNotEmpty(addValueDTO.get("orderCode"))){
+				orderQW.like(DistributionStockArticleEntity::getOrderCode, addValueDTO.get("orderCode"));
+			}
+			List<DistributionStockArticleEntity> orderList = distributionStockArticleService.list(orderQW);
+			orderList.forEach(rs->{
+				if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){
+					List<DistributionAddvaluePackageVO> addvaluepackageVO = distributionAddvalueMapper.selectAddvaluePackageVO(Long.parseLong(reservationId),rs.getId(),addValueDTO);
+					if (Func.isNotEmpty(addvaluepackageVO)){
+						addvaluePackageVOS.addAll(addvaluepackageVO);
+					}
+				}else {
+					List<DistributionAddvaluePackageVO> addvalueZeroPackageVO = distributionAddvalueMapper.selectAddvalueZeroPackageVO(Long.parseLong(reservationId),rs.getId(),addValueDTO);
+					if (Func.isNotEmpty(addvalueZeroPackageVO)){
+						addvaluePackageVOS.addAll(addvalueZeroPackageVO);
+					}
+				}
+			});
+		}
+		List<DistributionReservationStocklistEntity> distributionReservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(Long.parseLong(reservationId));
+
+		if (Func.isNotEmpty(distributionReservationStocklistEntities)){
+			List<Long> inventoryIds = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList());
+			LambdaQueryWrapper<DistributionStockListEntity> inventoryQW = Wrappers.<DistributionStockListEntity>query().lambda().in(DistributionStockListEntity::getId, inventoryIds);
+			if (Func.isNotEmpty(addValueDTO.get("materialName"))){
+				inventoryQW.like(DistributionStockListEntity::getDescriptionGoods,(String)addValueDTO.get("materialName"));
+			}
+			if (Func.isNotEmpty(addValueDTO.get("materialCode"))){
+				inventoryQW.like(DistributionStockListEntity::getCargoNumber,(String)addValueDTO.get("materialCode"));
+			}
+			List<DistributionStockListEntity> stockListEntityList = distributionStockListService.list(inventoryQW);
+			stockListEntityList.forEach(inven->{
+				List<DistributionAddvaluePackageVO> addvalueinventoryPackageVO = distributionAddvalueMapper.selectAddvalueInventoryPackageVO(Long.parseLong(reservationId),inven.getId(),addValueDTO);
+				if (Func.isNotEmpty(addvalueinventoryPackageVO)){
+					addvaluePackageVOS.addAll(addvalueinventoryPackageVO);
+				}
+			});
+		}
+
+		return page.setRecords(addvaluePackageVOS);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseRetentionApiController.java

@@ -79,8 +79,8 @@ public class WarehouseRetentionApiController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "保存滞留扫描列表", notes = "传入trayTypeDTO")
 	public R saveRetentionList(@RequestBody WarehouseRetentionRecordDTO warehouseRetentionScanDTOS) {
-//		R r = warehouseRetentionRecordService.saveRetentionList(warehouseRetentionScanDTOS);
-		R r = warehouseRetentionScanService.saveRetentionList(warehouseRetentionScanDTOS);
+//		R r = warehouseRetentionScanService.saveRetentionList(warehouseRetentionScanDTOS);
+		R r = warehouseRetentionRecordService.saveRetentionList(warehouseRetentionScanDTOS);
 		return r;
 	}
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java

@@ -19,6 +19,7 @@ package com.logpm.warehouse.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.warehouse.dto.RetentionDTO;
+import com.logpm.warehouse.dto.WarehouseRetentionRecordDTO;
 import com.logpm.warehouse.dto.WarehouseRetentionScanDTO;
 import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
 import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
@@ -71,4 +72,11 @@ public interface IWarehouseRetentionRecordService extends BaseService<WarehouseR
 	 */
     WarehouseRetentionRecordVO initRetentionList(Long deliveryId);
 
+	/**
+	 * 滞留列表提交  创建滞留任务
+	 * @param warehouseRetentionScanDTOS
+	 * @return
+	 */
+	R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionScanDTOS);
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionScanService.java

@@ -55,6 +55,6 @@ public interface IWarehouseRetentionScanService extends IService<WarehouseRetent
 	 */
 	List<WarehouseRetentionScanExcel> exportWarehouseRetentionRecord(Wrapper<WarehouseRetentionScanEntity> queryWrapper);
 
-    R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordEntity);
+//    R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordEntity);
 
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

@@ -29,6 +29,7 @@ import com.logpm.distribution.entity.DistributionParcelNumberEntity;
 import com.logpm.distribution.feign.IDistributionDeliveryListClient;
 import com.logpm.distribution.feign.IDistributionLoadscanClient;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
+import com.logpm.distribution.feign.IDistributionReservationClient;
 import com.logpm.distribution.vo.DistributionDeliveryListVO;
 import com.logpm.distribution.vo.DistributionDeliverySelfVO;
 import com.logpm.oldproject.feign.IWarehouseClient;
@@ -49,10 +50,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.retention.RetentionTypeConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -74,6 +78,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 	private final IWarehouseRetentionScanService warehouseRetentionScanService;
 	private final IDistributionDeliveryListClient deliveryListClient;
 	private final IBasicdataWarehouseClient warehouseClient;
+	private final IDistributionReservationClient reservationClient;
 
 	@Override
 	public IPage<WarehouseRetentionRecordVO> selectWarehouseRetentionRecordPage(IPage<WarehouseRetentionRecordVO> page, WarehouseRetentionRecordVO warehouseRetentionRecord) {
@@ -159,4 +164,41 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 		return warehouseRetentionRecordVO;
 	}
 
+	@Override
+	public R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordDTO) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			return null;
+		}
+		List<WarehouseRetentionScanDTO> warehouseRetentionScanDTOS = warehouseRetentionRecordDTO.getWarehouseRetentionScanDTOS();
+		if (Func.isEmpty(warehouseRetentionScanDTOS)){
+			log.error("############用户提交空滞留列表");
+			return Resp.scanFail("操作失败","无滞留包件信息");
+		}
+		BladeUser user = AuthUtil.getUser();
+		//TODO 保存车次数据还需要处理
+		WarehouseRetentionRecordEntity warehouseRetentionRecordEntity = new WarehouseRetentionRecordEntity();
+		warehouseRetentionRecordEntity.setTaskId(warehouseRetentionRecordDTO.getDeliveryId());
+		warehouseRetentionRecordEntity.setRemark(warehouseRetentionRecordDTO.getRemark());
+		warehouseRetentionRecordEntity.setRetentionCarNo(warehouseRetentionRecordDTO.getTrainNumber());
+		warehouseRetentionRecordEntity.setRetentionCarId(warehouseRetentionRecordDTO.getLoadingId());
+		warehouseRetentionRecordEntity.setRetentionWarehouseId(myCurrentWarehouse.getId());
+		warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName());
+		warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName());
+		warehouseRetentionRecordEntity.setRetentionCreateUserId(user.getUserId());
+		warehouseRetentionRecordEntity.setRetentionCreateUserName(user.getUserName());
+		this.save(warehouseRetentionRecordEntity);
+		warehouseRetentionScanDTOS.forEach(r->{
+			r.setRetentionScanTime(new Date());
+			r.setRetentionScanUserId(user.getUserId());
+			r.setRetentionScanUsername(user.getUserName());
+			r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId());
+			r.setRefId(warehouseRetentionRecordEntity.getId());
+			warehouseRetentionScanService.save(Func.copy(r,WarehouseRetentionScanEntity.class));
+			//进行滞留操作的包件需要和原来订单  预约进行绑定解除
+			//TODO  需要一个取消配送包件的方法
+		});
+		return Resp.scanSuccess("操作成功","操作成功");
+	}
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java

@@ -25,16 +25,22 @@ import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
 import com.logpm.warehouse.entity.WarehouseRetentionScanEntity;
 import com.logpm.warehouse.excel.WarehouseRetentionScanExcel;
 import com.logpm.warehouse.mapper.WarehouseRetentionScanMapper;
+import com.logpm.warehouse.service.IWarehouseRetentionRecordService;
 import com.logpm.warehouse.service.IWarehouseRetentionScanService;
 import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
 import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
 import com.logpm.warehouse.vo.WarehouseRetentionScanVO;
+import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -44,11 +50,14 @@ import java.util.List;
  * @since 2023-11-03
  */
 @Service
+@AllArgsConstructor
 public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl<WarehouseRetentionScanMapper, WarehouseRetentionScanEntity> implements IWarehouseRetentionScanService {
 
 
 	private IBasicdataWarehouseClient warehouseClient;
 
+//	private IWarehouseRetentionRecordService retentionRecordService;
+
 	@Override
 	public IPage<WarehouseRetentionScanVO> selectWarehouseRetentionRecordPage(IPage<WarehouseRetentionScanVO> page, WarehouseRetentionScanVO warehouseRetentionScanVO) {
 		return page.setRecords(baseMapper.selectWarehouseRetentionRecordPage(page, warehouseRetentionScanVO));
@@ -64,28 +73,38 @@ public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl<Warehouse
 		return warehouseRetentionRecordList;
 	}
 
-	@Override
-	public R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordDTO) {
-		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-		if (Func.isEmpty(myCurrentWarehouse)){
-			return null;
-		}
-		List<WarehouseRetentionScanDTO> warehouseRetentionScanDTOS = warehouseRetentionRecordDTO.getWarehouseRetentionScanDTOS();
-		if (Func.isEmpty(warehouseRetentionScanDTOS)){
-			log.error("############用户提交空滞留列表");
-			return Resp.scanFail("操作失败","无滞留包件信息");
-		}
-		//TODO 保存车次数据还需要处理
-		WarehouseRetentionRecordEntity warehouseRetentionRecordEntity = new WarehouseRetentionRecordEntity();
-		warehouseRetentionRecordEntity.setTaskId(warehouseRetentionRecordDTO.getDeliveryId());
-		warehouseRetentionRecordEntity.setRemark(warehouseRetentionRecordDTO.getRemark());
-		warehouseRetentionRecordEntity.setRetentionCarNo(warehouseRetentionRecordDTO.getTrainNumber());
-		warehouseRetentionRecordEntity.setRetentionCarId(warehouseRetentionRecordDTO.getLoadingId());
-		warehouseRetentionRecordEntity.setRetentionWarehouseId(myCurrentWarehouse.getId());
-		warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName());
-		warehouseRetentionScanDTOS.forEach(r->{
-			this.save(Func.copy(r,WarehouseRetentionScanEntity.class));
-		});
-		return Resp.scanSuccess("操作成功","操作成功");
-	}
+//	@Override
+//	public R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordDTO) {
+//		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+//		if (Func.isEmpty(myCurrentWarehouse)){
+//			return null;
+//		}
+//		List<WarehouseRetentionScanDTO> warehouseRetentionScanDTOS = warehouseRetentionRecordDTO.getWarehouseRetentionScanDTOS();
+//		if (Func.isEmpty(warehouseRetentionScanDTOS)){
+//			log.error("############用户提交空滞留列表");
+//			return Resp.scanFail("操作失败","无滞留包件信息");
+//		}
+//		BladeUser user = AuthUtil.getUser();
+//		//TODO 保存车次数据还需要处理
+//		WarehouseRetentionRecordEntity warehouseRetentionRecordEntity = new WarehouseRetentionRecordEntity();
+//		warehouseRetentionRecordEntity.setTaskId(warehouseRetentionRecordDTO.getDeliveryId());
+//		warehouseRetentionRecordEntity.setRemark(warehouseRetentionRecordDTO.getRemark());
+//		warehouseRetentionRecordEntity.setRetentionCarNo(warehouseRetentionRecordDTO.getTrainNumber());
+//		warehouseRetentionRecordEntity.setRetentionCarId(warehouseRetentionRecordDTO.getLoadingId());
+//		warehouseRetentionRecordEntity.setRetentionWarehouseId(myCurrentWarehouse.getId());
+//		warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName());
+//		warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName());
+//		warehouseRetentionRecordEntity.setRetentionCreatedUserId(user.getUserId());
+//		warehouseRetentionRecordEntity.setRetentionCreatedUserName(user.getUserName());
+//		retentionRecordService.save(warehouseRetentionRecordEntity);
+//		warehouseRetentionScanDTOS.forEach(r->{
+//			r.setRetentionScanTime(new Date());
+//			r.setRetentionScanUserId(user.getUserId());
+//			r.setRetentionScanUsername(user.getUserName());
+//			r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId());
+//			r.setRefId(warehouseRetentionRecordEntity.getId());
+//			this.save(Func.copy(r,WarehouseRetentionScanEntity.class));
+//		});
+//		return Resp.scanSuccess("操作成功","操作成功");
+//	}
 }