1.干线bug修复

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

@@ -104,5 +104,5 @@ public interface IWarehouseWaybillClient {
 	List<WarehouseWaybillVO> findWaybillVOByWaybillNoSet(@RequestBody Set<String> allWaybillNoSet);
 
 	@GetMapping(API_PREFIX+"/updateWaybillCondigneeId")
-	void updateWaybillCondigneeId(@RequestParam Long waybillId, @RequestParam Long newConsigneeId);
+	void updateWaybillCondigneeIdToNull(@RequestParam Long waybillId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -5459,7 +5459,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			waybillEntity.setConsigneeId(newConsigneeId);
 			if(Objects.isNull(newConsigneeId)){
 				waybillEntity.setServiceType(1);
-				warehouseWaybillClient.updateWaybillCondigneeId(waybillId,newConsigneeId);
+				warehouseWaybillClient.updateWaybillCondigneeIdToNull(waybillId);
 			}else{
 				BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(newConsigneeId);
 				if(!Objects.isNull(basicdataClient)){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java

@@ -131,7 +131,7 @@ public class WarehouseWaybillClient implements IWarehouseWaybillClient {
 	}
 
 	@Override
-	public void updateWaybillCondigneeId(Long waybillId, Long newConsigneeId) {
-		warehouseWaybillService.updateWaybillCondigneeId(waybillId,newConsigneeId);
+	public void updateWaybillCondigneeIdToNull(Long waybillId) {
+		warehouseWaybillService.updateWaybillCondigneeIdToNull(waybillId);
 	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java

@@ -80,5 +80,5 @@ public interface WarehouseWaybillMapper extends BaseMapper<WarehouseWaybillEntit
 
 	List<WarehouseWaybillVO> findWaybillVOByWaybillNoSet(@Param("waybillNos") Set<String> allWaybillNoSet);
 
-    void updateWaybillCondigneeId(@Param("waybillId") Long waybillId, @Param("newConsigneeId") Long newConsigneeId);
+    void updateWaybillCondigneeIdToNull(@Param("waybillId") Long waybillId);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -1276,8 +1276,8 @@
         group by lww.id
     </select>
 
-    <update id="updateWaybillCondigneeId">
-        update logpm_warehouse_waybill set consignee_id = #{newConsigneeId} where id = #{waybillId}
+    <update id="updateWaybillCondigneeIdToNull">
+        update logpm_warehouse_waybill set consignee_id = null where id = #{waybillId}
     </update>
 
 </mapper>

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

@@ -92,5 +92,5 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
 
 	List<WarehouseWaybillVO> findWaybillVOByWaybillNoSet(Set<String> allWaybillNoSet);
 
-    void updateWaybillCondigneeId(Long waybillId, Long newConsigneeId);
+    void updateWaybillCondigneeIdToNull(Long waybillId);
 }

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

@@ -1226,7 +1226,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	}
 
 	@Override
-	public void updateWaybillCondigneeId(Long waybillId, Long newConsigneeId) {
-		baseMapper.updateWaybillCondigneeId(waybillId,newConsigneeId);
+	public void updateWaybillCondigneeIdToNull(Long waybillId) {
+		baseMapper.updateWaybillCondigneeIdToNull(waybillId);
 	}
 }